From ede61d8cb2bad7a0b39fa90253314e5dd5e703be Mon Sep 17 00:00:00 2001 From: Chayse Ramsay Date: Mon, 22 Jul 2019 00:55:41 +0100 Subject: [PATCH 1/3] Changes the Warden's shotgun to instead be foldable, with greatly increased recoil and spread while folded. --- .../projectiles/guns/ballistic/shotgun.dm | 39 ++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index bb6a144c93..31efec3b36 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -212,15 +212,44 @@ ) /obj/item/gun/ballistic/shotgun/automatic/combat/compact - name = "compact combat shotgun" - desc = "A compact version of the semi automatic combat shotgun. For close encounters." + name = "warden's combat shotgun" + desc = "A modified version of the semi automatic combat shotgun with a collapsible stock. For close encounters." icon_state = "cshotgunc" - mag_type = /obj/item/ammo_box/magazine/internal/shot/com/compact + mag_type = /obj/item/ammo_box/magazine/internal/shot/com w_class = WEIGHT_CLASS_NORMAL - unique_reskin = list("Tatical" = "cshotgunc", - "Slick" = "cshotgunc_slick" + var/stock = FALSE + recoil = 5 + spread = 2 + unique_reskin = list("Unfolded" = "cshotgun", + "Folded" = "cshotgunc" ) +/obj/item/gun/ballistic/shotgun/automatic/combat/compact/AltClick(mob/living/user) + if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) + return + toggle_stock(user) + +/obj/item/gun/ballistic/shotgun/automatic/combat/compact/examine(mob/user) + ..() + to_chat(user, "Alt-click to toggle the stock.") + +/obj/item/gun/ballistic/shotgun/automatic/combat/compact/proc/toggle_stock(mob/living/user) + stock = !stock + if(stock) + current_skin = "Unfolded" + w_class = WEIGHT_CLASS_HUGE + to_chat(user, "You unfold the stock.") + recoil = 1 + spread = 0 + update_icon() + else + current_skin = "Folded" + w_class = WEIGHT_CLASS_NORMAL + to_chat(user, "You fold the stock.") + recoil = 5 + spread = 2 + update_icon() + //Dual Feed Shotgun /obj/item/gun/ballistic/shotgun/automatic/dual_tube From 1c8768afe4cdc897f9fd0eeda8308170cd27fc97 Mon Sep 17 00:00:00 2001 From: Chayse Ramsay Date: Mon, 22 Jul 2019 19:31:42 +0100 Subject: [PATCH 2/3] Redundant Redundancies made Redundant --- code/modules/projectiles/guns/ballistic/shotgun.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 31efec3b36..fb2fbc875c 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -228,6 +228,7 @@ if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return toggle_stock(user) + . = ..() /obj/item/gun/ballistic/shotgun/automatic/combat/compact/examine(mob/user) ..() @@ -241,14 +242,13 @@ to_chat(user, "You unfold the stock.") recoil = 1 spread = 0 - update_icon() else current_skin = "Folded" w_class = WEIGHT_CLASS_NORMAL to_chat(user, "You fold the stock.") recoil = 5 spread = 2 - update_icon() + update_icon() //Dual Feed Shotgun @@ -264,6 +264,7 @@ /obj/item/gun/ballistic/shotgun/automatic/dual_tube/examine(mob/user) ..() to_chat(user, "Alt-click to pump it.") + . = ..() /obj/item/gun/ballistic/shotgun/automatic/dual_tube/Initialize() . = ..() From 085251f5f78804e5ad3db1622abd85abc1d0b303 Mon Sep 17 00:00:00 2001 From: Chayse Ramsay Date: Tue, 30 Jul 2019 04:35:54 +0100 Subject: [PATCH 3/3] update_icon --- .../projectiles/guns/ballistic/shotgun.dm | 8 +++----- icons/obj/guns/projectile.dmi | Bin 36031 -> 36032 bytes 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index fb2fbc875c..856dfed78b 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -220,9 +220,6 @@ var/stock = FALSE recoil = 5 spread = 2 - unique_reskin = list("Unfolded" = "cshotgun", - "Folded" = "cshotgunc" - ) /obj/item/gun/ballistic/shotgun/automatic/combat/compact/AltClick(mob/living/user) if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) @@ -237,19 +234,20 @@ /obj/item/gun/ballistic/shotgun/automatic/combat/compact/proc/toggle_stock(mob/living/user) stock = !stock if(stock) - current_skin = "Unfolded" w_class = WEIGHT_CLASS_HUGE to_chat(user, "You unfold the stock.") recoil = 1 spread = 0 else - current_skin = "Folded" w_class = WEIGHT_CLASS_NORMAL to_chat(user, "You fold the stock.") recoil = 5 spread = 2 update_icon() +/obj/item/gun/ballistic/shotgun/automatic/combat/compact/update_icon() + icon_state = "[current_skin ? unique_reskin[current_skin] : "cshotgun"][stock ? "" : "c"]" + //Dual Feed Shotgun /obj/item/gun/ballistic/shotgun/automatic/dual_tube diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 7d44d35f55c7102e9dbabaeda15edd6c0f2d4385..0ac8ccf566669c7a2041957304545969a8527306 100644 GIT binary patch delta 59 zcmV-B0L1^lnF7F>0+1vDzOf~r11A$Ne+j*KKXjbWp&tcc(<9>lxqq&{|9q~Vf4pq} R0cF`Cfjo|PK(p!t)rb|z98mxO delta 36 ucmV+<0Nek-nF7C=0+1vDy|E>q0|bmqkiV130~-gnA%Tdf&_c881J#HX><{Ar