From 0cd402faebee4301eda01846c3ff4266a0a33d9e Mon Sep 17 00:00:00 2001 From: cornercube <81207946+cornercube@users.noreply.github.com> Date: Mon, 10 Jan 2022 14:27:32 +0800 Subject: [PATCH 1/3] Update legion.dm --- code/modules/jobs/job_types/legion.dm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/code/modules/jobs/job_types/legion.dm b/code/modules/jobs/job_types/legion.dm index 08ec319256..9174372e62 100644 --- a/code/modules/jobs/job_types/legion.dm +++ b/code/modules/jobs/job_types/legion.dm @@ -142,28 +142,24 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al box = /obj/item/storage/box/legate -// ORATOR +// CONSUL /datum/job/CaesarsLegion/Legionnaire/f13orator - title = "Legion Orator" - flag = F13ORATOR + title = "Legion Consul" + flag = F13CONSUL supervisors = "Legate" selection_color = "#ffdddd" req_admin_notify = 1 total_positions = 0 spawn_positions = 0 - outfit = /datum/outfit/job/CaesarsLegion/Legionnaire/f13orator + outfit = /datum/outfit/job/CaesarsLegion/auxilia/consul display_order = JOB_DISPLAY_ORDER_ORATOR access = list(ACCESS_LEGION, ACCESS_CHANGE_IDS, ACCESS_LEGION_COMMAND) minimal_access = list(ACCESS_LEGION, ACCESS_CHANGE_IDS, ACCESS_LEGION_COMMAND) -/datum/outfit/job/CaesarsLegion/Legionnaire/f13orator // 10mm Revolver, Spatha - name = "Orator" +/datum/outfit/job/CaesarsLegion/auxilia/consul // 10mm Revolver, Spatha + name = "Consul" jobtype = /datum/job/CaesarsLegion/Legionnaire/f13orator - neck = /obj/item/storage/belt/holster - shoes = /obj/item/clothing/shoes/f13/military/legate - suit = /obj/item/clothing/suit/armor/f13/legion/legate - head = null id = /obj/item/card/id/dogtag/legcenturion gloves = null shoes = /obj/item/clothing/shoes/roman From ddd4d3cedb4c70b592a23e2c7ab7e795b4b6a242 Mon Sep 17 00:00:00 2001 From: cornercube <81207946+cornercube@users.noreply.github.com> Date: Sun, 16 Jan 2022 16:30:24 +0800 Subject: [PATCH 2/3] Update automatic.dm --- .../projectiles/guns/ballistic/automatic.dm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index f4f73ec4c1..76f240e8f2 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -669,8 +669,9 @@ suppressor_y_offset = 28 -//Police rifle Keywords: OASIS, 5.56mm, Semi-auto, 20 (10-50) round magazine -/obj/item/gun/ballistic/automatic/marksman/policerifle +//Police rifle Keywords: OASIS, 5mm, Semi-auto, 30 round magazine + +/obj/item/gun/ballistic/automatic/assault_carbine/policerifle name = "Police Rifle" desc = "A pre-war Rifle that has been constantly repaired and rebuilt by the Oasis Police Department. Held together by duct tape and prayers, it somehow still shoots." icon = 'icons/fallout/objects/guns/ballistic.dmi' @@ -678,14 +679,12 @@ righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi' icon_state = "rifle-police" item_state = "assault_carbine" - init_mag_type = /obj/item/ammo_box/magazine/m556/rifle - extra_damage = -1 + burst_size = 1 spread = 1.1 + extra_penetration = 0.15 + burst_shot_delay = 4.2 fire_delay = 4.2 - can_suppress = FALSE - can_scope = TRUE - zoomable = FALSE - + semi_auto = TRUE //Marksman carbine Keywords: 5.56mm, Semi-auto, 20 (10-50) round magazine, Small scope /obj/item/gun/ballistic/automatic/marksman From 76e750c247cf693f579a28a01c2a8a3c693d42c7 Mon Sep 17 00:00:00 2001 From: cornercube <81207946+cornercube@users.noreply.github.com> Date: Sun, 16 Jan 2022 16:32:30 +0800 Subject: [PATCH 3/3] Update oasis.dm --- code/modules/jobs/job_types/oasis.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/jobs/job_types/oasis.dm b/code/modules/jobs/job_types/oasis.dm index f5c9729777..dca0abdcda 100644 --- a/code/modules/jobs/job_types/oasis.dm +++ b/code/modules/jobs/job_types/oasis.dm @@ -328,10 +328,10 @@ Mayor suit = /obj/item/clothing/suit/armor/bulletproof head = /obj/item/clothing/head/helmet/alt neck = /obj/item/storage/belt/holster/legholster - l_hand = /obj/item/gun/ballistic/automatic/marksman/policerifle + l_hand = /obj/item/gun/ballistic/automatic/assault_carbine/policerifle shoes = /obj/item/clothing/shoes/jackboots backpack_contents = list( - /obj/item/ammo_box/magazine/m556/rifle = 2, + /obj/item/ammo_box/magazine/m5mm = 2, /obj/item/gun/ballistic/automatic/pistol/mk23=1, /obj/item/ammo_box/magazine/m45exp=2, /obj/item/flashlight/seclite = 1,