diff --git a/baystation12.dme b/baystation12.dme index a46d31594b..1a952c2b1f 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1202,6 +1202,7 @@ #include "code\WorkInProgress\virus2\monkeydispensor.dm" #include "code\WorkInProgress\virus2\Prob.dm" #include "code\WorkInProgress\Wrongnumber\weldbackpack.dm" +#include "code\ZAS\Airflow.dm" #include "code\ZAS\Connection.dm" #include "code\ZAS\Creation.dm" #include "code\ZAS\Definition.dm" diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index 33edca2cce..faa4e42761 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -6,7 +6,7 @@ var/screen = 0 // the screen number: var/list/servers = list() // the servers located by the computer - var/var/obj/machinery/telecomms/server/SelectedServer + var/obj/machinery/telecomms/server/SelectedServer var/network = "NULL" // the network to probe var/temp = "" // temporary feedback messages diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index 210c45e6ab..40ff20f1c7 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -13,7 +13,7 @@ var/screen = 0 // the screen number: var/list/machines = list() // the machines located by the computer - var/var/obj/machinery/telecomms/SelectedMachine + var/obj/machinery/telecomms/SelectedMachine var/network = "NULL" // the network to probe diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index edf31b672d..99812a6fbc 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -281,7 +281,7 @@ datum lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0) lowertemp.react() T.assume_air(lowertemp) - T.apply_fire_protection() + //T.apply_fire_protection() del(hotspot) if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/monkeycube)) var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index b9a78017fc..e9cf67d60e 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -225,7 +225,7 @@ if(mob.stat==2) return if(isAI(mob)) return AIMove(n,direct,mob) - + if(mob.monkeyizing) return //This is sota the goto stop mobs from moving var if(mob.incorporeal_move)//Move though walls Process_Incorpmove(direct) diff --git a/code/modules/mob/organ/organ.dm b/code/modules/mob/organ/organ.dm index 7e7d657aba..fb150d0362 100644 --- a/code/modules/mob/organ/organ.dm +++ b/code/modules/mob/organ/organ.dm @@ -64,9 +64,9 @@ var/list/datum/organ/external/children var/damage_msg = "\red You feel a intense pain" - var/var/open = 0 - var/var/stage = 0 - var/var/wound = 0 + var/open = 0 + var/stage = 0 + var/wound = 0 New(mob/living/carbon/H) ..(H)