From fed69ce0cac473c29579241c6696f7e508995948 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 3 May 2017 00:00:08 -0500 Subject: [PATCH 1/3] Fixes sleepers. --- code/game/machinery/Sleeper.dm.rej | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 code/game/machinery/Sleeper.dm.rej diff --git a/code/game/machinery/Sleeper.dm.rej b/code/game/machinery/Sleeper.dm.rej new file mode 100644 index 0000000000..079bec3efb --- /dev/null +++ b/code/game/machinery/Sleeper.dm.rej @@ -0,0 +1,10 @@ +diff a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm (rejected hunks) +@@ -162,7 +162,7 @@ + . = TRUE + if("inject") + var/chem = params["chem"] +- if(!is_operational() || mob_occupant) ++ if(!is_operational() || !mob_occupant) + return + if(mob_occupant.health < min_health && chem != "epinephrine") + return From 6880e7c3735912d6fa7078a8a1f37e9bc4da8ed4 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sat, 6 May 2017 21:03:17 -0700 Subject: [PATCH 2/3] Update Sleeper.dm --- code/game/machinery/Sleeper.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 5dc8ea3f20..4a7c2bfb0e 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -158,7 +158,7 @@ . = TRUE if("inject") var/chem = params["chem"] - if(!is_operational() || !occupant) + if(!is_operational() || !mob_occupant) return if(occupant.health < min_health && chem != "epinephrine") return From 91955ccb059fdb9b4dae7c23ee911abdfdd78515 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sat, 6 May 2017 21:04:22 -0700 Subject: [PATCH 3/3] Delete Sleeper.dm.rej --- code/game/machinery/Sleeper.dm.rej | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 code/game/machinery/Sleeper.dm.rej diff --git a/code/game/machinery/Sleeper.dm.rej b/code/game/machinery/Sleeper.dm.rej deleted file mode 100644 index 079bec3efb..0000000000 --- a/code/game/machinery/Sleeper.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm (rejected hunks) -@@ -162,7 +162,7 @@ - . = TRUE - if("inject") - var/chem = params["chem"] -- if(!is_operational() || mob_occupant) -+ if(!is_operational() || !mob_occupant) - return - if(mob_occupant.health < min_health && chem != "epinephrine") - return