Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16

# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme

code/datums/autolathe/arms.dm

@@ -416,7 +416,7 @@
 
 /datum/category_item/autolathe/arms/knuckledusters
 	name = "knuckle dusters"
-	path =/obj/item/weapon/material/knuckledusters
+	path =/obj/item/clothing/gloves/knuckledusters
 	hidden = 1
 
 /datum/category_item/autolathe/arms/tacknife

code/datums/repositories/radiation.dm

@@ -116,7 +116,7 @@ var/global/repository/radiation/radiation_repository = new()
 		else if(O.density) //So open doors don't get counted
 			var/material/M = O.get_material()
 			if(!M)	continue
-			cached_rad_resistance += M.radiation_resistance
+			cached_rad_resistance += M.weight + M.radiation_resistance
 	// Looks like storing the contents length is meant to be a basic check if the cache is stale due to items enter/exiting.  Better than nothing so I'm leaving it as is. ~Leshana
 	radiation_repository.resistance_cache[src] = (length(contents) + 1)
 

code/datums/supplypacks/hospitality.dm

@@ -61,3 +61,17 @@
 	cost = 15
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Pizza crate"
+
+/datum/supply_packs/hospitality/gifts
+	name = "Gift crate"
+	contains = list(
+		/obj/item/toy/bouquet = 3,
+		/obj/item/weapon/storage/fancy/heartbox = 2,
+		/obj/item/weapon/paper/card/smile,
+		/obj/item/weapon/paper/card/heart,
+		/obj/item/weapon/paper/card/cat,
+		/obj/item/weapon/paper/card/flower
+		)
+	cost = 10
+	containertype = /obj/structure/closet/crate
+	containername = "crate of gifts"

code/datums/wires/mines.dm

@@ -0,0 +1,81 @@
+/datum/wires/mines
+	wire_count = 6
+	random = 1
+	holder_type = /obj/effect/mine
+
+#define WIRE_DETONATE 	1
+#define WIRE_TIMED_DET 	2
+#define WIRE_DISARM	4
+#define WIRE_DUMMY_1	8
+#define WIRE_DUMMY_2	16
+#define WIRE_BADDISARM	32
+
+/datum/wires/mines/GetInteractWindow()
+	. = ..()
+	. += "<br>\n["Warning: detonation may occur even with proper equipment."]"
+	return .
+
+/datum/wires/mines/proc/explode()
+	return
+
+/datum/wires/mines/UpdateCut(var/index, var/mended)
+	var/obj/effect/mine/C = holder
+
+	switch(index)
+		if(WIRE_DETONATE)
+			C.visible_message("\icon[C] *BEEE-*", "\icon[C] *BEEE-*")
+			C.explode()
+
+		if(WIRE_TIMED_DET)
+			C.visible_message("\icon[C] *BEEE-*", "\icon[C] *BEEE-*")
+			C.explode()
+
+		if(WIRE_DISARM)
+			C.visible_message("\icon[C] *click!*", "\icon[C] *click!*")
+			new C.mineitemtype(get_turf(C))
+			spawn(0)
+				qdel(C)
+				return
+
+		if(WIRE_DUMMY_1)
+			return
+
+
+		if(WIRE_DUMMY_2)
+			return
+
+		if(WIRE_BADDISARM)
+			C.visible_message("\icon[C] *BEEPBEEPBEEP*", "\icon[C] *BEEPBEEPBEEP*")
+			spawn(20)
+				C.explode()
+	return
+
+/datum/wires/mines/UpdatePulsed(var/index)
+	var/obj/effect/mine/C = holder
+	if(IsIndexCut(index))
+		return
+	switch(index)
+		if(WIRE_DETONATE)
+			C.visible_message("\icon[C] *beep*", "\icon[C] *beep*")
+
+		if(WIRE_TIMED_DET)
+			C.visible_message("\icon[C] *BEEPBEEPBEEP*", "\icon[C] *BEEPBEEPBEEP*")
+			spawn(20)
+				C.explode()
+
+		if(WIRE_DISARM)
+			C.visible_message("\icon[C] *ping*", "\icon[C] *ping*")
+
+		if(WIRE_DUMMY_1)
+			C.visible_message("\icon[C] *ping*", "\icon[C] *ping*")
+
+		if(WIRE_DUMMY_2)
+			C.visible_message("\icon[C] *beep*", "\icon[C] *beep*")
+
+		if(WIRE_BADDISARM)
+			C.visible_message("\icon[C] *ping*", "\icon[C] *ping*")
+	return
+
+/datum/wires/mines/CanUse(var/mob/living/L)
+	var/obj/effect/mine/M = holder
+	return M.panel_open