From d07f300063b06f0eb094268ed144ddd8abc550e8 Mon Sep 17 00:00:00 2001
From: MMMiracles <lolaccount1@hotmail.com>
Date: Tue, 15 Dec 2015 16:46:24 -0500
Subject: [PATCH] i did things

---
 code/game/objects/structures/statues.dm       |  2 +-
 code/game/turfs/simulated/floor/misc_floor.dm |  2 +-
 .../awaymissions/mission_code/snowdin.dm      |  6 ++---
 .../living/simple_animal/hostile/skeleton.dm  | 22 +++++++------------
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index e431a6af0a6..2dca240edb7 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -355,7 +355,7 @@
 
 /obj/structure/statue/snow
 	hardness = 0.5
-	mineralType = "sandstone"
+	mineralType = "snow"
 
 /obj/structure/statue/snow/snowman
 	name = "snowman"
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index 04d2d38938f..9254074e67b 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -118,7 +118,7 @@
 	icon_state = "ice"
 	baseturf = /turf/simulated/floor/plating/snow
 	slowdown = 1
-	wet = 3
+	wet = TURF_WET_ICE
 
 /turf/simulated/floor/plating/ice/break_tile()
 	return
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index d0e34cb441a..3f82dda929a 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -193,8 +193,6 @@ obj/item/weapon/paper/crumpled/snowdin/shovel
 
 //special items//--
 
-/obj/item/clothing/belt/
-
 /obj/item/clothing/under/syndicate/coldres
 	name = "insulated tactical turtleneck"
 	desc = "A non-descript and slightly suspicious looking turtleneck with digital camouflage cargo pants. The interior has been padded with special insulation for both warmth and protection"
@@ -206,12 +204,12 @@ obj/item/weapon/paper/crumpled/snowdin/shovel
 	desc = "High speed, low drag combat boots, now with an added layer of insulation."
 	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
 
-/obj/item/weapon/gun/magic/wand/fireball/innert
+/obj/item/weapon/gun/magic/wand/fireball/inert
 	name = "weakened wand of fireball"
 	desc = "This wand shoots scorching balls of fire that explode into destructive flames. The years of the cold have weakened the magic inside the wand."
 	max_charges = 4
 
-/obj/item/weapon/gun/magic/wand/resurrection/innert
+/obj/item/weapon/gun/magic/wand/resurrection/inert
 	name = "weakened wand of healing"
 	desc = "This wand uses healing magics to heal and revive. The years of the cold have weakened the magic inside the wand."
 	max_charges = 5
diff --git a/code/modules/mob/living/simple_animal/hostile/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/skeleton.dm
index 03ddaa572f1..a27b966bed3 100644
--- a/code/modules/mob/living/simple_animal/hostile/skeleton.dm
+++ b/code/modules/mob/living/simple_animal/hostile/skeleton.dm
@@ -32,8 +32,6 @@
 	layer = MOB_LAYER - 0.1
 	var/remains = /obj/effect/decal/remains/human
 	var/loot
-	var/loot2
-	var/loot3
 	var/deathmessage = "The skeleton collaspes into a pile of bones!"
 
 
@@ -43,10 +41,6 @@
 		new remains (src.loc)
 	if(loot)
 		new loot (src.loc)
-	if(loot2)
-		new loot2 (src.loc)
-	if(loot3)
-		new loot3 (src.loc)
 	visible_message("<span class='danger'>[deathmessage]</span>")
 	qdel(src)
 	return
@@ -64,9 +58,9 @@
 	melee_damage_lower = 17
 	melee_damage_upper = 20
 	deathmessage = "The skeleton collaspes into a pile of bones, its gear falling to the floor!"
-	loot = /obj/item/clothing/suit/hooded/wintercoat
-	loot2 = /obj/item/clothing/shoes/winterboots
-	loot3 = /obj/item/weapon/twohanded/spear
+	loot = list(/obj/item/weapon/twohanded/spear,
+				/obj/item/clothing/shoes/winterboots,
+				/obj/item/clothing/suit/hooded/wintercoat)
 
 
 /mob/living/simple_animal/hostile/skeleton/templar
@@ -86,12 +80,12 @@
 	melee_damage_lower = 25
 	melee_damage_upper = 30
 	deathmessage = "The templar knight collaspes into a pile of bones, its gear clanging as it hits the ground!"
-	loot = /obj/item/clothing/head/helmet/knight/templar
-	loot2 = /obj/item/clothing/suit/armor/riot/knight/templar
-	loot3 = /obj/item/weapon/claymore/hog{name = "holy sword"}
-
+	loot = list(/obj/item/clothing/suit/armor/riot/knight/templar,
+				/obj/item/clothing/head/helmet/knight/templar,
+				/obj/item/weapon/claymore/hog{name = "holy sword"})
 /mob/living/simple_animal/hostile/skeleton/templar/bullet_act(obj/item/projectile/Proj)
-	if(!Proj)	return
+	if(!Proj)
+		return
 	if(prob(50))
 		if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
 			src.health -= Proj.damage