diff --git a/baystation12.dme b/baystation12.dme
index 0963f30248..d9d044e0f2 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1,6 +1,6 @@
 // DM Environment file for tgstation.dme.
-// All manual changes should be made outside the BEGIN_ and END_ blocks. 
- // New source code should be placed in .dm files: choose File/New --> Code File. 
+// All manual changes should be made outside the BEGIN_ and END_ blocks.
+ // New source code should be placed in .dm files: choose File/New --> Code File.
 // BEGIN_INTERNALS
 // END_INTERNALS
 // BEGIN_FILE_DIR
@@ -88,6 +88,7 @@
 #define FILE_DIR "code/game/objects/storage"
 #define FILE_DIR "code/game/objects/tanks"
 #define FILE_DIR "code/game/player"
+#define FILE_DIR "code/game/structure"
 #define FILE_DIR "code/game/vehicles"
 #define FILE_DIR "code/game/vehicles/airtight"
 #define FILE_DIR "code/game/verbs"
@@ -1263,5 +1264,5 @@
 #include "code\ZAS\ZAS_Zones.dm"
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
-#include "maps\tgstation.2.0.9.dmm"
+#include "maps\tgstation 3.0.0.dmm"
 // END_INCLUDE
diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm
index e7d343a9fb..a91d3eae35 100644
--- a/code/ZAS/Fire.dm
+++ b/code/ZAS/Fire.dm
@@ -320,7 +320,8 @@ datum/gas_mixture/proc/calculate_firelevel(obj/liquid_fuel/liquid)
 		arms_exposure = 1
 
 	//Get heat transfer coefficients for clothing.
-	for(var/obj/item/clothing/C in src)
+	//skytodo: different handling of temp with tg
+	/*for(var/obj/item/clothing/C in src)
 		if(l_hand == C || r_hand == C) continue
 		if(C.body_parts_covered & HEAD)
 			head_exposure *= C.heat_transfer_coefficient
@@ -331,7 +332,7 @@ datum/gas_mixture/proc/calculate_firelevel(obj/liquid_fuel/liquid)
 		if(C.body_parts_covered & LEGS)
 			legs_exposure *= C.heat_transfer_coefficient
 		if(C.body_parts_covered & ARMS)
-			arms_exposure *= C.heat_transfer_coefficient
+			arms_exposure *= C.heat_transfer_coefficient*/
 
 	//Always check these damage procs first if fire damage isn't working. They're probably what's wrong.
 
diff --git a/code/setup.dm b/code/setup.dm
index 54a784b49a..ac545d0108 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -16,9 +16,8 @@
 
 #define MOLES_PLASMA_VISIBLE	0.5 //Moles in a standard cell after which plasma is visible
 
-<<<<<<< HEAD
 #define BREATH_VOLUME 0.5	//liters in a normal breath
-=======
+
 #define SPECIFIC_HEAT_TOXIN		200
 #define SPECIFIC_HEAT_AIR		20
 #define SPECIFIC_HEAT_CDO		30
@@ -30,7 +29,6 @@
 #define TRANSFER_FRACTION 5 //What fraction (1/#) of the air difference to try and transfer
 
 #define BREATH_VOLUME 0.5	//liters in a normal breath  Increased to scale to SS13 speeds.
->>>>>>> caf88d81eb4ba61466414c5fa0609be06c932803
 #define BREATH_PERCENTAGE BREATH_VOLUME/CELL_VOLUME
 	//Amount of air to take a from a tile
 #define HUMAN_NEEDED_OXYGEN	MOLES_CELLSTANDARD*BREATH_PERCENTAGE*0.16
@@ -500,4 +498,4 @@ var/list/liftable_structures = list(\
 #define INVISIBILITY_OBSERVER 60
 #define SEE_INVISIBLE_OBSERVER 60
 
-#define INVISIBILITY_MAXIMUM 100
+#define INVISIBILITY_MAXIMUM 100