From 79119197cac4a03b7ec4a171e06c40a74cc865e4 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Mon, 24 Aug 2020 21:48:26 +0200 Subject: [PATCH 1/3] Makes the recycler immune to throwing damage --- code/game/machinery/recycler.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index e4e37ae1bcb..369ea19fb40 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -92,6 +92,12 @@ if(AM) Bumped(AM) +/obj/machinery/recycler/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) + // Makes the recycler temporarily indestructible so it doesn't take damage but all the other effects do happen + var/prev_flags = resistance_flags + resistance_flags |= INDESTRUCTIBLE + . = ..() + resistance_flags = prev_flags /obj/machinery/recycler/Bumped(atom/movable/AM) From 127853aedf4f256c610b6895a7035723055d9f5c Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Mon, 24 Aug 2020 21:48:57 +0200 Subject: [PATCH 2/3] just ..() --- code/game/machinery/recycler.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 369ea19fb40..55b0dcf668d 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -96,7 +96,7 @@ // Makes the recycler temporarily indestructible so it doesn't take damage but all the other effects do happen var/prev_flags = resistance_flags resistance_flags |= INDESTRUCTIBLE - . = ..() + ..() resistance_flags = prev_flags /obj/machinery/recycler/Bumped(atom/movable/AM) From 2efe73f5289228d5f1cd47fea8965a93b3ad19a2 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Tue, 25 Aug 2020 17:17:49 +0200 Subject: [PATCH 3/3] Gives the recycler higher damage deflection --- code/game/machinery/recycler.dm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 55b0dcf668d..56019d22f7c 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -8,7 +8,7 @@ layer = MOB_LAYER+1 // Overhead anchored = 1 density = 1 - damage_deflection = 10 + damage_deflection = 15 var/safety_mode = 0 // Temporarily stops machine if it detects a mob var/icon_name = "grinder-o" var/blood = 0 @@ -92,13 +92,6 @@ if(AM) Bumped(AM) -/obj/machinery/recycler/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) - // Makes the recycler temporarily indestructible so it doesn't take damage but all the other effects do happen - var/prev_flags = resistance_flags - resistance_flags |= INDESTRUCTIBLE - ..() - resistance_flags = prev_flags - /obj/machinery/recycler/Bumped(atom/movable/AM) if(stat & (BROKEN|NOPOWER))