diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm
index a2d6ce3341..2040f22a99 100644
--- a/code/game/objects/items/devices/suit_cooling.dm
+++ b/code/game/objects/items/devices/suit_cooling.dm
@@ -46,9 +46,15 @@
 
 	var/mob/living/carbon/human/H = loc
 
-	var/efficiency = 1 - H.get_pressure_weakness()		//you need to have a good seal for effective cooling
-	var/env_temp = get_environment_temperature()		//wont save you from a fire
-	var/temp_adj = min(H.bodytemperature - max(thermostat, env_temp), max_cooling)
+	var/efficiency = 1 - H.get_pressure_weakness()			// You need to have a good seal for effective cooling
+	var/temp_adj = 0										// How much the unit cools you. Adjusted later on.
+	var/env_temp = get_environment_temperature()			// This won't save you from a fire
+	var/thermal_protection = H.get_heat_protection(env_temp)	// ... unless you've got a good suit.
+
+	if(thermal_protection < 0.99)		//For some reason, < 1 returns false if the value is 1.
+		temp_adj = min(H.bodytemperature - max(thermostat, env_temp), max_cooling)
+	else
+		temp_adj = min(H.bodytemperature - thermostat, max_cooling)
 
 	if (temp_adj < 0.5)	//only cools, doesn't heat, also we don't need extreme precision
 		return
diff --git a/code/game/objects/items/stacks/marker_beacons.dm b/code/game/objects/items/stacks/marker_beacons.dm
index 9978ef6b0d..2194b84fbd 100644
--- a/code/game/objects/items/stacks/marker_beacons.dm
+++ b/code/game/objects/items/stacks/marker_beacons.dm
@@ -25,6 +25,7 @@ var/list/marker_beacon_colors = list(
 	icon_state = "marker"
 	max_amount = 100
 	no_variants = TRUE
+	w_class = ITEMSIZE_SMALL
 	var/picked_color = "random"
 
 /obj/item/stack/marker_beacon/ten
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
index eb2ab38b52..de7f85c91e 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -67,3 +67,34 @@
 		new /obj/item/clothing/suit/storage/hooded/wintercoat/cargo(src)
 		new /obj/item/clothing/shoes/boots/winter/supply(src)
 		return
+
+/obj/structure/closet/secure_closet/miner
+	name = "miner's equipment"
+	icon_state = "miningsec1"
+	icon_closed = "miningsec"
+	icon_locked = "miningsec1"
+	icon_opened = "miningsecopen"
+	icon_broken = "miningsecbroken"
+	icon_off = "miningsecoff"
+	req_access = list(access_mining)
+
+/obj/structure/closet/secure_closet/miner/New()
+	..()
+	sleep(2)
+	if(prob(50))
+		new /obj/item/weapon/storage/backpack/industrial(src)
+	else
+		new /obj/item/weapon/storage/backpack/satchel/eng(src)
+	new /obj/item/device/radio/headset/headset_cargo(src)
+	new /obj/item/clothing/under/rank/miner(src)
+	new /obj/item/clothing/gloves/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/device/analyzer(src)
+	new /obj/item/weapon/storage/bag/ore(src)
+	new /obj/item/device/flashlight/lantern(src)
+	new /obj/item/weapon/shovel(src)
+	new /obj/item/weapon/pickaxe(src)
+	new /obj/item/clothing/glasses/material(src)
+	new /obj/item/clothing/suit/storage/hooded/wintercoat/miner(src)
+	new /obj/item/clothing/shoes/boots/winter/mining(src)
+	new /obj/item/stack/marker_beacon/thirty(src)
\ No newline at end of file
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 7980c2f8e2..f6315296f1 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -1,35 +1,3 @@
-/**********************Miner Lockers**************************/
-
-/obj/structure/closet/secure_closet/miner
-	name = "miner's equipment"
-	icon_state = "miningsec1"
-	icon_closed = "miningsec"
-	icon_locked = "miningsec1"
-	icon_opened = "miningsecopen"
-	icon_broken = "miningsecbroken"
-	icon_off = "miningsecoff"
-	req_access = list(access_mining)
-
-/obj/structure/closet/secure_closet/miner/New()
-	..()
-	sleep(2)
-	if(prob(50))
-		new /obj/item/weapon/storage/backpack/industrial(src)
-	else
-		new /obj/item/weapon/storage/backpack/satchel/eng(src)
-	new /obj/item/device/radio/headset/headset_cargo(src)
-	new /obj/item/clothing/under/rank/miner(src)
-	new /obj/item/clothing/gloves/black(src)
-	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/device/analyzer(src)
-	new /obj/item/weapon/storage/bag/ore(src)
-	new /obj/item/device/flashlight/lantern(src)
-	new /obj/item/weapon/shovel(src)
-	new /obj/item/weapon/pickaxe(src)
-	new /obj/item/clothing/glasses/material(src)
-	new /obj/item/clothing/suit/storage/hooded/wintercoat/miner(src)
-	new /obj/item/clothing/shoes/boots/winter/mining(src)
-
 /******************************Lantern*******************************/
 
 /obj/item/device/flashlight/lantern
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 130230a952..e643ee24b1 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -616,11 +616,11 @@
 		var/temp_adj = 0
 		if(loc_temp < bodytemperature)			//Place is colder than we are
 			var/thermal_protection = get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
-			if(thermal_protection < 1)
+			if(thermal_protection < 0.99)	//For some reason, < 1 returns false if the value is 1.
 				temp_adj = (1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR)	//this will be negative
 		else if (loc_temp > bodytemperature)			//Place is hotter than we are
 			var/thermal_protection = get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
-			if(thermal_protection < 1)
+			if(thermal_protection < 0.99)	//For some reason, < 1 returns false if the value is 1.
 				temp_adj = (1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR)
 
 		//Use heat transfer as proportional to the gas density. However, we only care about the relative density vs standard 101 kPa/20 C air. Therefore we can use mole ratios
diff --git a/html/changelog.html b/html/changelog.html
index 629a7c1c02..c6a3dd049d 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,39 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">17 February 2018</h2>
+			<h3 class="author">Anewbe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a random mine spawner, for use in PoIs. Replaces mines in PoIs with the random spawner.</li>
+				<li class="rscadd">Mines now give a visible message when they go off.</li>
+				<li class="tweak">Land mines on the ground can no longer be told apart from one another, to prevent gaming the system.</li>
+				<li class="bugfix">Hovering mobs (viscerators, drones, Poly, carp) no longer set off land mines.</li>
+				<li class="tweak">Arming a land mine now takes concentration. If you move, it will boom.</li>
+				<li class="tweak">RINGS AND CERTAIN GLOVES INCREASE PUNCHING DAMAGE.</li>
+				<li class="tweak">BRASS KNUCKLES HAVE BEEN TURNED INTO GLOVES AND REBALANCED. THEY DO LESS DAMAGE PER HIT BECAUSE IT'S HARD TO DISARM A PAIR OF GLOVES.</li>
+				<li class="rscadd">Cyborg Chargers now decrease radiation on FBPs.</li>
+				<li class="tweak">Falling one floor now does a lot less damage, on average.</li>
+				<li class="bugfix">Falling one floor in a Mech no longer hurts the occupant.</li>
+			</ul>
+			<h3 class="author">PrismaticGynoid updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">A lot more machines can now be moved with a wrench, mostly kitchen, hydroponics, and virology machines.</li>
+				<li class="tweak">Changed department ponchos to be open to any job, just like department jackets.</li>
+			</ul>
+			<h3 class="author">Schnayy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds bouquets. Can be ordered via 'gift crate' in cargo.</li>
+				<li class="rscadd">Adds fake bouquets for the cheap. Can currently be won from arcade machines.</li>
+				<li class="rscadd">Adds chocolate heart-shaped boxes. Can be ordered via 'gift crate' in cargo.</li>
+				<li class="rscadd">Adds gift cards with four cover variations. Function like paper. Can be ordered via 'gift crate' in cargo.</li>
+			</ul>
+			<h3 class="author">battlefieldCommander updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added packed snow brick material. Craft it using snow piles.</li>
+				<li class="recadd">Added snow girders and igloo walls. Craft them using snow bricks.</li>
+				<li class="rscadd">Added various snowmen. Craft them using snow piles. Punch 'em to destroy.</li>
+			</ul>
+
 			<h2 class="date">10 February 2018</h2>
 			<h3 class="author">Atermonera updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 88837fc3e1..bc24c3c67f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3868,3 +3868,35 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - maptweak: Redesign of medical surgery rooms, replacement of the closets with wall
       closets.
   - bugfix: Multiple map bugfixes including distro and scrubber lines to deck 3.
+2018-02-17:
+  Anewbe:
+  - rscadd: Added a random mine spawner, for use in PoIs. Replaces mines in PoIs with
+      the random spawner.
+  - rscadd: Mines now give a visible message when they go off.
+  - tweak: Land mines on the ground can no longer be told apart from one another,
+      to prevent gaming the system.
+  - bugfix: Hovering mobs (viscerators, drones, Poly, carp) no longer set off land
+      mines.
+  - tweak: Arming a land mine now takes concentration. If you move, it will boom.
+  - tweak: RINGS AND CERTAIN GLOVES INCREASE PUNCHING DAMAGE.
+  - tweak: BRASS KNUCKLES HAVE BEEN TURNED INTO GLOVES AND REBALANCED. THEY DO LESS
+      DAMAGE PER HIT BECAUSE IT'S HARD TO DISARM A PAIR OF GLOVES.
+  - rscadd: Cyborg Chargers now decrease radiation on FBPs.
+  - tweak: Falling one floor now does a lot less damage, on average.
+  - bugfix: Falling one floor in a Mech no longer hurts the occupant.
+  PrismaticGynoid:
+  - rscadd: A lot more machines can now be moved with a wrench, mostly kitchen, hydroponics,
+      and virology machines.
+  - tweak: Changed department ponchos to be open to any job, just like department
+      jackets.
+  Schnayy:
+  - rscadd: Adds bouquets. Can be ordered via 'gift crate' in cargo.
+  - rscadd: Adds fake bouquets for the cheap. Can currently be won from arcade machines.
+  - rscadd: Adds chocolate heart-shaped boxes. Can be ordered via 'gift crate' in
+      cargo.
+  - rscadd: Adds gift cards with four cover variations. Function like paper. Can be
+      ordered via 'gift crate' in cargo.
+  battlefieldCommander:
+  - rscadd: Added packed snow brick material. Craft it using snow piles.
+  - recadd: Added snow girders and igloo walls. Craft them using snow bricks.
+  - rscadd: Added various snowmen. Craft them using snow piles. Punch 'em to destroy.
diff --git a/html/changelogs/ANEWBE CASTS FIST.yml b/html/changelogs/ANEWBE CASTS FIST.yml
deleted file mode 100644
index 229458924d..0000000000
--- a/html/changelogs/ANEWBE CASTS FIST.yml	
+++ /dev/null
@@ -1,37 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Anewbe
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - tweak: "RINGS AND CERTAIN GLOVES INCREASE PUNCHING DAMAGE."
-  - tweak: "BRASS KNUCKLES HAVE BEEN TURNED INTO GLOVES AND REBALANCED. THEY DO LESS DAMAGE PER HIT BECAUSE IT'S HARD TO DISARM A PAIR OF GLOVES."
diff --git a/html/changelogs/Anewbe - Mines.yml b/html/changelogs/Anewbe - Mines.yml
deleted file mode 100644
index 502771f248..0000000000
--- a/html/changelogs/Anewbe - Mines.yml	
+++ /dev/null
@@ -1,40 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Anewbe
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - rscadd: "Added a random mine spawner, for use in PoIs. Replaces mines in PoIs with the random spawner."
-  - rscadd: "Mines now give a visible message when they go off."
-  - tweak: "Land mines on the ground can no longer be told apart from one another, to prevent gaming the system."
-  - bugfix: "Hovering mobs (viscerators, drones, Poly, carp) no longer set off land mines."
-  - tweak: "Arming a land mine now takes concentration. If you move, it will boom."
diff --git a/html/changelogs/Anewbe- Various.yml b/html/changelogs/Anewbe - Suit Coolers.yml
similarity index 86%
rename from html/changelogs/Anewbe- Various.yml
rename to html/changelogs/Anewbe - Suit Coolers.yml
index c6b7dad78e..005f4a3550 100644
--- a/html/changelogs/Anewbe- Various.yml	
+++ b/html/changelogs/Anewbe - Suit Coolers.yml	
@@ -33,6 +33,4 @@ delete-after: True
 # Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
 # Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
 changes: 
-  - rscadd: "Cyborg Chargers now decrease radiation on FBPs."
-  - tweak: "Falling one floor now does a lot less damage, on average."
-  - bugfix: "Falling one floor in a Mech no longer hurts the occupant."
+  - bugfix: "Suit Coolers now properly cool FBPs in slightly burning rooms. If it gets too hot for your suit, you're still dead."
diff --git a/html/changelogs/BattlefieldCommander-doyouwannabuildasnowman.yml b/html/changelogs/BattlefieldCommander-doyouwannabuildasnowman.yml
deleted file mode 100644
index 4ee55c6114..0000000000
--- a/html/changelogs/BattlefieldCommander-doyouwannabuildasnowman.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: battlefieldCommander
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - rscadd: "Added packed snow brick material. Craft it using snow piles."
-  - recadd: "Added snow girders and igloo walls. Craft them using snow bricks."
-  - rscadd: "Added various snowmen. Craft them using snow piles. Punch 'em to destroy."
\ No newline at end of file
diff --git a/html/changelogs/PrismaticGynoid-movethosemachines.yml b/html/changelogs/PrismaticGynoid-movethosemachines.yml
deleted file mode 100644
index b7e06c916f..0000000000
--- a/html/changelogs/PrismaticGynoid-movethosemachines.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: PrismaticGynoid
-delete-after: True
-changes: 
-  - rscadd: "A lot more machines can now be moved with a wrench, mostly kitchen, hydroponics, and virology machines."
diff --git a/html/changelogs/PrismaticGynoid-universalponchos.yml b/html/changelogs/PrismaticGynoid-universalponchos.yml
deleted file mode 100644
index 185525498b..0000000000
--- a/html/changelogs/PrismaticGynoid-universalponchos.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: PrismaticGynoid
-delete-after: True
-changes: 
-  - tweak: "Changed department ponchos to be open to any job, just like department jackets."
diff --git a/html/changelogs/schnayy-giftcrates.yml b/html/changelogs/schnayy-giftcrates.yml
deleted file mode 100644
index 08c0668df5..0000000000
--- a/html/changelogs/schnayy-giftcrates.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: Schnayy
-
-delete-after: True
-
-changes:
-  - rscadd: "Adds bouquets. Can be ordered via 'gift crate' in cargo."
-  - rscadd: "Adds fake bouquets for the cheap. Can currently be won from arcade machines."
-  - rscadd: "Adds chocolate heart-shaped boxes. Can be ordered via 'gift crate' in cargo."
-  - rscadd: "Adds gift cards with four cover variations. Function like paper. Can be ordered via 'gift crate' in cargo."
\ No newline at end of file