From 8aaf8a8ab84638444f69d36acd1c7131fc734704 Mon Sep 17 00:00:00 2001 From: Adrer Date: Mon, 23 Jan 2023 23:08:16 +0100 Subject: [PATCH] You can no longer push people into fireaxe cabinets. (#20279) * You can no longer push people into fireaxe cabinets * Or statues and critter crates * Or crates * Remove duplicate shove_impact * Silly newline Co-authored-by: adrermail@gmail.com --- .../game/objects/structures/crates_lockers/closets/fireaxe.dm | 4 ++++ code/game/objects/structures/crates_lockers/closets/statue.dm | 3 +++ code/game/objects/structures/crates_lockers/crittercrate.dm | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 73155a57a96..cd6834e1b64 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -123,6 +123,10 @@ return attack_hand(user) +/obj/structure/closet/fireaxecabinet/shove_impact(mob/living/target, mob/living/attacker) + // no, you can't shove people into a fireaxe cabinet either + return FALSE + /obj/structure/closet/fireaxecabinet/verb/toggle_openness() //nice name, huh? HUH?! -Erro //YEAH -Agouri set name = "Open/Close" set category = "Object" diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index a18dd3c2842..517dd7a808c 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -71,6 +71,9 @@ M.take_overall_damage((M.health - obj_integrity - 100),0) //any new damage the statue incurred is transfered to the mob ..() + +/obj/structure/closet/statue/shove_impact(mob/living/target, mob/living/attacker) + return FALSE /obj/structure/closet/statue/open() return diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm index 82c03111f10..930de9f5e31 100644 --- a/code/game/objects/structures/crates_lockers/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/crittercrate.dm @@ -36,6 +36,10 @@ ..() return TRUE + +/obj/structure/closet/critter/shove_impact(mob/living/target, mob/living/attacker) + return FALSE + /obj/structure/closet/critter/random name = "unmarked crate" desc = "A crate designed for safe transport of animals. The contents are a mystery."