diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
index be613640869..b78301584cb 100644
--- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
@@ -32,7 +32,6 @@ Housekeeping and pipe network stuff
var/node2_connect = dir
var/node1_connect = turn(dir, 180)
-/obj/machinery/atmospherics/binary/unsafe_pressure_release(mob/user,pressures)
var/list/node_connects = new/list()
node_connects.Add(node1_connect, node2_connect)
..(node_connects)
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
index a38c408ca3a..d75d045a636 100644
--- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
@@ -145,7 +145,8 @@ Passive gate is similar to the regular pump except:
-/obj/machinery/atmospherics/components/binary/passive_gate/attack_hand(mob/user) if(..())
+/obj/machinery/atmospherics/components/binary/passive_gate/attack_hand(mob/user)
+ if(..())
return
src.add_fingerprint(usr)
if(!src.allowed(user))
@@ -178,7 +179,8 @@ Passive gate is similar to the regular pump except:
-/obj/machinery/atmospherics/components/binary/passive_gate/attackby(obj/item/weapon/W, mob/user, params) if (!istype(W, /obj/item/weapon/wrench))
+/obj/machinery/atmospherics/components/binary/passive_gate/attackby(obj/item/weapon/W, mob/user, params)
+ if (!istype(W, /obj/item/weapon/wrench))
return ..()
if (on)
user << "You cannot unwrench this [src], turn it off first!"
diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm
index 757e55f938b..73482b9c864 100644
--- a/code/ATMOSPHERICS/components/binary_devices/pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -97,7 +97,8 @@ Thus, the two variables affect pump operation are set in New():
return 1
-/obj/machinery/atmospherics/components/binary/pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER))
+/obj/machinery/atmospherics/components/binary/pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null)
+ if(stat & (BROKEN|NOPOWER))
return
ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "atmos_gas_pump.tmpl", name, 400, 120, 0)
@@ -147,7 +148,8 @@ Thus, the two variables affect pump operation are set in New():
return
-/obj/machinery/atmospherics/components/binary/pump/attack_hand(mod/user) if(..())
+/obj/machinery/atmospherics/components/binary/pump/attack_hand(mob/user)
+ if(..())
return
src.add_fingerprint(usr)
if(!src.allowed(user))
@@ -178,7 +180,8 @@ Thus, the two variables affect pump operation are set in New():
..()
update_icon()
-/obj/machinery/atmospherics/binary/pump/attackby(obj/item/weapon/W, mob/user, params) if (!istype(W, /obj/item/weapon/wrench))
+/obj/machinery/atmospherics/components/binary/pump/attackby(obj/item/weapon/W, mob/user, params)
+ if (!istype(W, /obj/item/weapon/wrench))
return ..()
if (!(stat & NOPOWER) && on)
user << "You cannot unwrench this [src], turn it off first!"
diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
index 415a937cda4..a87f2964480 100644
--- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
@@ -94,7 +94,8 @@ Thus, the two variables affect pump operation are set in New():
return 1
-/obj/machinery/atmospherics/components/binary/volume_pump/ui_interact(mob/user, ui_key = "main", datum/nanoui = null) if(stat & (BROKEN|NOPOWER))
+/obj/machinery/atmospherics/components/binary/volume_pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null)
+ if(stat & (BROKEN|NOPOWER))
return
ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "atmos_gas_pump.tmpl", name, 400, 120, 0)
@@ -144,7 +145,8 @@ Thus, the two variables affect pump operation are set in New():
update_icon()
-/obj/machinery/atmospherics/components/binary/volume_pump/attack_hand(mob/user) if(..())
+/obj/machinery/atmospherics/components/binary/volume_pump/attack_hand(mob/user)
+ if(..())
return
src.add_fingerprint(usr)
if(!src.allowed(user))
@@ -177,7 +179,8 @@ Thus, the two variables affect pump operation are set in New():
-/obj/machinery/atmospherics/components/binary/volume_pump/attackby(obj/item/weapon/W, mob/user, params) if (!istype(W, /obj/item/weapon/wrench))
+/obj/machinery/atmospherics/components/binary/volume_pump/attackby(obj/item/weapon/W, mob/user, params)
+ if (!istype(W, /obj/item/weapon/wrench))
return ..()
if (!(stat & NOPOWER) && on)
user << "You cannot unwrench this [src], turn it off first!"
diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
index e5731e28236..a1190f5d705 100644
--- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
@@ -156,7 +156,8 @@ Filter types:
set_frequency(frequency)
return ..()
-/obj/machinery/atmospherics/components/trinary/filter/attack_hand(mob/user) if(..())
+/obj/machinery/atmospherics/components/trinary/filter/attack_hand(mob/user)
+ if(..())
return
if(!src.allowed(user))
@@ -165,7 +166,8 @@ Filter types:
ui_interact(user)
-/obj/machinery/atmospherics/components/trinary/filter/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER))
+/obj/machinery/atmospherics/components/trinary/filter/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null)
+ if(stat & (BROKEN|NOPOWER))
return
ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "atmos_filter.tmpl", name, 400, 320, 0)
diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
index eea96501e8c..56062f70d83 100644
--- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
@@ -119,7 +119,8 @@
return 1
-/obj/machinery/atmospherics/components/trinary/mxer/attack_hand(mob/user) if(..())
+/obj/machinery/atmospherics/components/trinary/mxer/attack_hand(mob/user)
+ if(..())
return
if(!src.allowed(user))
@@ -128,7 +129,8 @@
ui_interact(user)
-/obj/machinery/atmospherics/components/trinary/mixer/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER))
+/obj/machinery/atmospherics/components/trinary/mixer/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null)
+ if(stat & (BROKEN|NOPOWER))
return
ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "atmos_mixer.tmpl", name, 400, 320, 0)
diff --git a/code/ATMOSPHERICS/components/unary_devices/cryo.dm b/code/ATMOSPHERICS/components/unary_devices/cryo.dm
index 763aecb36ea..f0b549c9d1f 100644
--- a/code/ATMOSPHERICS/components/unary_devices/cryo.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/cryo.dm
@@ -136,7 +136,8 @@
*
* @return nothing
*/
-/obj/machinery/atmospherics/components/unary/cry_cell/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(user == occupant || user.stat || panel_open)
+/obj/machinery/atmospherics/components/unary/cry_cell/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null)
+ if(user == occupant || user.stat || panel_open)
return
ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "cryo.tmpl", "Cryo Cell Control System", 520, 410, 1)
diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
index e9bd3b2b9a3..7c8ed4b389c 100644
--- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
+++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
@@ -245,7 +245,8 @@
stat |= NOPOWER
update_icon_nopipes()
-/obj/machinery/atmospherics/components/unary/vent_scrubber/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/weldingtool))
+/obj/machinery/atmospherics/components/unary/vent_scrubber/attackby(obj/item/weapon/W, mob/user, params)
+ if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(WT.remove_fuel(0,user))
playsound(loc, 'sound/items/Welder.ogg', 40, 1)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index c76942bb250..887f52a85d4 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1138,7 +1138,9 @@
//BREATHING//
/////////////
- if(istype(H.loc, /obj/machinery/atmospherics/unary/cryo_cell)) return
+/datum/species/proc/breathe(mob/living/carbon/human/H)
+ return
+
/datum/species/proc/check_breath(datum/gas_mixture/breath, var/mob/living/carbon/human/H)
if((H.status_flags & GODMODE))
return
diff --git a/tgstation.dme b/tgstation.dme
index a29f5191935..5bd5b7aa3de 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6,63 +6,6 @@
// BEGIN_FILE_DIR
#define FILE_DIR .
-#define FILE_DIR "code"
-#define FILE_DIR "code/modules"
-#define FILE_DIR "code/modules/games"
-#define FILE_DIR "code/modules/html_interface"
-#define FILE_DIR "code/modules/html_interface/cards"
-#define FILE_DIR "code/modules/html_interface/nanotrasen"
-#define FILE_DIR "html"
-#define FILE_DIR "icons"
-#define FILE_DIR "icons/ass"
-#define FILE_DIR "icons/effects"
-#define FILE_DIR "icons/mecha"
-#define FILE_DIR "icons/misc"
-#define FILE_DIR "icons/mob"
-#define FILE_DIR "icons/mob/inhands"
-#define FILE_DIR "icons/obj"
-#define FILE_DIR "icons/obj/assemblies"
-#define FILE_DIR "icons/obj/atmospherics"
-#define FILE_DIR "icons/obj/atmospherics/pipes"
-#define FILE_DIR "icons/obj/clothing"
-#define FILE_DIR "icons/obj/doors"
-#define FILE_DIR "icons/obj/flora"
-#define FILE_DIR "icons/obj/food"
-#define FILE_DIR "icons/obj/guns"
-#define FILE_DIR "icons/obj/hydroponics"
-#define FILE_DIR "icons/obj/machines"
-#define FILE_DIR "icons/obj/power_cond"
-#define FILE_DIR "icons/obj/smooth_structures"
-#define FILE_DIR "icons/obj/smooth_structures/alien"
-#define FILE_DIR "icons/pda_icons"
-#define FILE_DIR "icons/spideros_icons"
-#define FILE_DIR "icons/stamp_icons"
-#define FILE_DIR "icons/Testing"
-#define FILE_DIR "icons/turf"
-#define FILE_DIR "icons/turf/floors"
-#define FILE_DIR "icons/turf/walls"
-#define FILE_DIR "icons/vending_icons"
-#define FILE_DIR "nano"
-#define FILE_DIR "nano/images"
-#define FILE_DIR "sound"
-#define FILE_DIR "sound/AI"
-#define FILE_DIR "sound/ambience"
-#define FILE_DIR "sound/arcade"
-#define FILE_DIR "sound/effects"
-#define FILE_DIR "sound/guitar"
-#define FILE_DIR "sound/hallucinations"
-#define FILE_DIR "sound/items"
-#define FILE_DIR "sound/machines"
-#define FILE_DIR "sound/magic"
-#define FILE_DIR "sound/mecha"
-#define FILE_DIR "sound/misc"
-#define FILE_DIR "sound/piano"
-#define FILE_DIR "sound/spookoween"
-#define FILE_DIR "sound/violin"
-#define FILE_DIR "sound/voice"
-#define FILE_DIR "sound/voice/complionator"
-#define FILE_DIR "sound/vox_fem"
-#define FILE_DIR "sound/weapons"
// END_FILE_DIR
// BEGIN_PREFERENCES
@@ -1311,7 +1254,6 @@
#include "code\modules\mob\living\simple_animal\hostile\retaliate\bat.dm"
#include "code\modules\mob\living\simple_animal\hostile\retaliate\clown.dm"
#include "code\modules\mob\living\simple_animal\hostile\retaliate\retaliate.dm"
-#include "code\modules\mob\living\simple_animal\morph\morph.dm"
#include "code\modules\mob\living\simple_animal\revenant\revenant.dm"
#include "code\modules\mob\living\simple_animal\revenant\revenant_abilities.dm"
#include "code\modules\mob\living\simple_animal\revenant\revenant_spawn_event.dm"