From 7312577bd65bfbb358cea56546031903a59a2865 Mon Sep 17 00:00:00 2001 From: cornercube <81207946+cornercube@users.noreply.github.com> Date: Wed, 6 Apr 2022 13:08:26 +0800 Subject: [PATCH 1/4] Update automatic.dm --- code/modules/projectiles/guns/ballistic/automatic.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index e1c9790c2e..bf8042b8a3 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -607,10 +607,11 @@ //WT-550 4.7mm, 20 round magazine /obj/item/gun/ballistic/automatic/wt550 - name = "WT-550" - desc = "A compact PDW derived from the G11, firing the same 4.73mm rounds." + name = "4.73mm carbine" + desc = "A WT-550 personal defense weapon developed by West-Tek, fires 4.73mm caseless rounds." item_state = "WT550" mag_type = /obj/item/ammo_box/magazine/m473/small + slowdown = 0.45 burst_size = 1 is_automatic = TRUE automatic = TRUE From 378a109eb13cde4bb7da0dea32a68923a63986a0 Mon Sep 17 00:00:00 2001 From: cornercube <81207946+cornercube@users.noreply.github.com> Date: Wed, 6 Apr 2022 13:13:00 +0800 Subject: [PATCH 2/4] Update oasis.dm --- code/modules/jobs/job_types/oasis.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/jobs/job_types/oasis.dm b/code/modules/jobs/job_types/oasis.dm index c922c232f6..f11ce6e112 100644 --- a/code/modules/jobs/job_types/oasis.dm +++ b/code/modules/jobs/job_types/oasis.dm @@ -62,6 +62,7 @@ Mayor jobtype = /datum/job/oasis/f13mayor ears = /obj/item/radio/headset/headset_town id = /obj/item/card/id/silver/mayor + suit = /obj/item/gun/ballistic/automatic/wt550 backpack = /obj/item/storage/backpack/satchel/explorer satchel = /obj/item/storage/backpack/satchel/explorer l_pocket = /obj/item/storage/bag/money/small/oasis From 6e7775a6d5939a59eeead83cc0905b1d6a708cb5 Mon Sep 17 00:00:00 2001 From: cornercube <81207946+cornercube@users.noreply.github.com> Date: Wed, 6 Apr 2022 13:20:58 +0800 Subject: [PATCH 3/4] Update oasis.dm --- code/modules/jobs/job_types/oasis.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/jobs/job_types/oasis.dm b/code/modules/jobs/job_types/oasis.dm index f11ce6e112..cf72fdbaae 100644 --- a/code/modules/jobs/job_types/oasis.dm +++ b/code/modules/jobs/job_types/oasis.dm @@ -74,6 +74,7 @@ Mayor /obj/item/stack/f13Cash/caps/onezerozerozero = 1, /obj/item/storage/box/citizenship_permits = 1, \ /obj/item/pen/fountain/captain = 1, + /obj/item/ammo_box/magazine/m473/small = 2 ) From 9f23a6cd5d4e4d23c8a70dd41b622cd6a989ec92 Mon Sep 17 00:00:00 2001 From: cornercube <81207946+cornercube@users.noreply.github.com> Date: Wed, 6 Apr 2022 18:11:12 +0800 Subject: [PATCH 4/4] Update automatic.dm --- code/modules/projectiles/guns/ballistic/automatic.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index bf8042b8a3..8f1bfb30f1 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -616,11 +616,11 @@ is_automatic = TRUE automatic = TRUE extra_damage = 20 - autofire_shot_delay = 1.75 + autofire_shot_delay = 2.25 extra_penetration = 0.2 w_class = WEIGHT_CLASS_NORMAL weapon_weight = WEAPON_MEDIUM - spread = 0 + spread = 3 //foregrip fire_delay = 1 can_bayonet = TRUE knife_x_offset = 25