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

# Conflicts:
#	maps/southern_cross/southern_cross-1.dmm

code/game/objects/items/weapons/RCD.dm

@@ -103,7 +103,7 @@
 		build_delay = 50
 		build_type = "airlock"
 		build_other = /obj/machinery/door/airlock
-	else if(!deconstruct && (istype(T,/turf/space) || istype(T,get_base_turf_by_area(T))))
+	else if(!deconstruct && isturf(T) && (istype(T,/turf/space) || istype(T,get_base_turf_by_area(T))))
 		build_cost =  1
 		build_type =  "floor"
 		build_turf =  /turf/simulated/floor/airless

code/game/objects/items/weapons/storage/boxes.dm

@@ -60,6 +60,11 @@
 		/obj/item/clothing/mask/breath
 	)
 
+/obj/item/weapon/storage/box/survival/synth
+	name = "synthetic supply box"
+	desc = "A survival box issued to synthetic crew members for use in emergency situations."
+	starts_with = list()
+
 /obj/item/weapon/storage/box/survival/comp
 	name = "emergency supply box"
 	desc = "A comprehensive survival box issued to crew members for use in emergency situations. Contains additional supplies."

code/game/objects/items/weapons/storage/fancy.dm

@@ -307,6 +307,8 @@
 /obj/item/weapon/storage/fancy/heartbox
 	icon_state = "heartbox"
 	name = "box of chocolates"
+	icon_type = "chocolate"
+
 	var/startswith = 6
 	max_storage_space = ITEMSIZE_COST_SMALL * 6
 	can_hold = list(

code/game/objects/items/weapons/storage/storage.dm

@@ -670,3 +670,59 @@
 		can_hold[I.type]++
 		max_w_class = max(I.w_class, max_w_class)
 		max_storage_space += I.get_storage_cost()
+
+/*
+ * Trinket Box - READDING SOON
+ */
+/*
+/obj/item/weapon/storage/trinketbox
+	name = "trinket box"
+	desc = "A box that can hold small trinkets, such as a ring."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "trinketbox"
+	var/open = 0
+	storage_slots = 1
+	can_hold = list(
+		/obj/item/clothing/gloves/ring,
+		/obj/item/weapon/coin,
+		/obj/item/clothing/accessory/medal
+		)
+	var/open_state
+	var/closed_state
+
+/obj/item/weapon/storage/trinketbox/update_icon()
+	overlays.Cut()
+	if(open)
+		icon_state = open_state
+
+		if(contents.len >= 1)
+			var/contained_image = null
+			if(istype(contents[1],  /obj/item/clothing/gloves/ring))
+				contained_image = "ring_trinket"
+			else if(istype(contents[1], /obj/item/weapon/coin))
+				contained_image = "coin_trinket"
+			else if(istype(contents[1], /obj/item/clothing/accessory/medal))
+				contained_image = "medal_trinket"
+			if(contained_image)
+				overlays += contained_image
+	else
+		icon_state = closed_state
+
+/obj/item/weapon/storage/trinketbox/New()
+	if(!open_state)
+		open_state = "[initial(icon_state)]_open"
+	if(!closed_state)
+		closed_state = "[initial(icon_state)]"
+	..()
+
+/obj/item/weapon/storage/trinketbox/attack_self()
+	open = !open
+	update_icon()
+	..()
+
+/obj/item/weapon/storage/trinketbox/examine(mob/user)
+	..()
+	if(open && contents.len)
+		var/display_item = contents[1]
+		to_chat(user, "<span class='notice'>\The [src] contains \the [display_item]!</span>")
+		*/