From 784cd2ca7d89e96ff4306c0f12a9f68b7ed7c161 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Fri, 24 Sep 2021 19:12:04 -0500 Subject: [PATCH] ballin --- .../mob/living/simple_animal/hostile/plaguerat.dm | 2 +- code/modules/projectiles/guns/ballistic/shotgun.dm | 12 ++++++++++-- code/modules/projectiles/guns/magic/motivation.dm | 8 ++++---- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm index 2b92894317..53b96a9376 100644 --- a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm +++ b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm @@ -136,7 +136,7 @@ GLOBAL_LIST_EMPTY(plague_rats) if(LAZYLEN(GLOB.plague_rats) >= cap) visible_message("[src] gnaws into its food, [cap] rats are now on the station!") return - var/mob/living/newmouse = new /mob/living/simple_animal/hostile/plaguerat(loc) +// var/mob/living/newmouse = new /mob/living/simple_animal/hostile/plaguerat(loc) visible_message("[src] gnaws into its food, attracting another rat!") /mob/living/simple_animal/hostile/plaguerat/proc/exit_vents() diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 3e7e2c9e9c..01502fe02e 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -240,7 +240,7 @@ /obj/item/gun/ballistic/shotgun/automatic/combat/compact name = "warden's combat shotgun" - desc = "A modified version of the semi automatic combat shotgun with a collapsible stock. For close encounters." + desc = "A modified version of the semi-automatic combat shotgun with a collapsible stock and a safety that prevents firing while folded. For close encounters." icon_state = "cshotgunc" mag_type = /obj/item/ammo_box/magazine/internal/shot/com w_class = WEIGHT_CLASS_NORMAL @@ -250,7 +250,7 @@ /obj/item/gun/ballistic/shotgun/automatic/combat/compact/AltClick(mob/living/user) . = ..() - if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) + if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)) || item_flags && IN_STORAGE) return toggle_stock(user) return TRUE @@ -276,6 +276,14 @@ /obj/item/gun/ballistic/shotgun/automatic/combat/compact/update_icon_state() icon_state = "[current_skin ? unique_reskin[current_skin] : "cshotgun"][stock ? "" : "c"]" +/obj/item/gun/ballistic/shotgun/automatic/combat/compact/afterattack(atom/target, mob/living/user, flag, params) + if(!stock) + shoot_with_empty_chamber(user) + to_chat(user, "[src] won't fire with a folded stock!") + else + . = ..() + update_icon() + //Dual Feed Shotgun /obj/item/gun/ballistic/shotgun/automatic/dual_tube diff --git a/code/modules/projectiles/guns/magic/motivation.dm b/code/modules/projectiles/guns/magic/motivation.dm index 0eaeea4418..59d412443c 100644 --- a/code/modules/projectiles/guns/magic/motivation.dm +++ b/code/modules/projectiles/guns/magic/motivation.dm @@ -21,15 +21,15 @@ recharge_rate = 5 var/datum/action/judgement_cut/judgementcut = new/datum/action/judgement_cut() block_parry_data = /datum/block_parry_data/motivation - + //to get this to toggle correctly /obj/item/gun/magic/staff/motivation/Initialize() . = ..() judgementcut = new(src) -//lets the user know that their judgment cuts are recharging +//lets the user know that their Judgement cuts are recharging /obj/item/gun/magic/staff/motivation/shoot_with_empty_chamber(mob/living/user as mob|obj) - to_chat(user, "Judgment Cut is recharging.") + to_chat(user, "Judgement Cut is recharging.") //action button to toggle judgement cuts on/off /datum/action/judgement_cut @@ -47,7 +47,7 @@ /obj/item/gun/magic/staff/motivation/can_trigger_gun(mob/living/user) . = ..() if(!judgementcut.judgement_toggled) - to_chat(user, " Judgment Cut is disabled.") + to_chat(user, "Judgement Cut is disabled.") return FALSE //adds/removes judgement cut and judgement cut end upon pickup/drop