From a8c4c86e1c7f272a045e89bf8aaadb2dd33845fc Mon Sep 17 00:00:00 2001 From: LetterJay Date: Wed, 26 Apr 2017 06:48:41 -0500 Subject: [PATCH] REJ CLEANUP! --- code/__DEFINES/mobs.dm.rej | 8 -------- .../machinery/components/binary_devices/pump.dm.rej | 10 ---------- .../components/binary_devices/volume_pump.dm.rej | 10 ---------- code/modules/clothing/glasses/engine_goggles.dm.rej | 9 --------- 4 files changed, 37 deletions(-) delete mode 100644 code/__DEFINES/mobs.dm.rej delete mode 100644 code/modules/atmospherics/machinery/components/binary_devices/pump.dm.rej delete mode 100644 code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm.rej delete mode 100644 code/modules/clothing/glasses/engine_goggles.dm.rej diff --git a/code/__DEFINES/mobs.dm.rej b/code/__DEFINES/mobs.dm.rej deleted file mode 100644 index 9df0109926..0000000000 --- a/code/__DEFINES/mobs.dm.rej +++ /dev/null @@ -1,8 +0,0 @@ -diff a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm (rejected hunks) -@@ -107,4 +107,4 @@ - #define INDIVIDUAL_SAY_LOG "Say log" - #define INDIVIDUAL_EMOTE_LOG "Emote log" - #define INDIVIDUAL_OOC_LOG "OOC log" --#define INDIVIDUAL_SHOW_ALL_LOG "All logs" -\ No newline at end of file -+#define INDIVIDUAL_SHOW_ALL_LOG "All logs" diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm.rej b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm.rej deleted file mode 100644 index 01709610dd..0000000000 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm (rejected hunks) -@@ -176,7 +176,7 @@ Thus, the two variables affect pump operation are set in New(): - /obj/machinery/atmospherics/components/binary/pump/can_unwrench(mob/user) - if(..()) - if(!(stat & NOPOWER) && on) -- to_chat(user, "You cannot unwrench this [src], turn it off first!") -+ to_chat(user, "You cannot unwrench [src], turn it off first!") - else - return 1 - diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm.rej b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm.rej deleted file mode 100644 index 3ba3e0b753..0000000000 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm (rejected hunks) -@@ -172,7 +172,7 @@ Thus, the two variables affect pump operation are set in New(): - /obj/machinery/atmospherics/components/binary/volume_pump/can_unwrench(mob/user) - if(..()) - if(!(stat & NOPOWER) && on) -- to_chat(user, "You cannot unwrench this [src], turn it off first!") -+ to_chat(user, "You cannot unwrench [src], turn it off first!") - else - return 1 - diff --git a/code/modules/clothing/glasses/engine_goggles.dm.rej b/code/modules/clothing/glasses/engine_goggles.dm.rej deleted file mode 100644 index 4c922a8671..0000000000 --- a/code/modules/clothing/glasses/engine_goggles.dm.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm (rejected hunks) -@@ -26,7 +25,6 @@ - darkness_view = 1 - invis_view = SEE_INVISIBLE_MINIMUM - to_chat(loc, "You toggle the goggles' scanning mode to \[Meson].") -- invis_update() - - if(ishuman(user)) - var/mob/living/carbon/human/H = user