Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

code/game/objects/items/bodybag.dm

@@ -3,7 +3,7 @@
 /obj/item/bodybag
 	name = "body bag"
 	desc = "A folded bag designed for the storage and transportation of cadavers."
-	icon = 'icons/obj/bodybag.dmi'
+	icon = 'icons/obj/closets/bodybag.dmi'
 	icon_state = "bodybag_folded"
 	w_class = ITEMSIZE_SMALL
 
@@ -31,10 +31,8 @@
 /obj/structure/closet/body_bag
 	name = "body bag"
 	desc = "A plastic bag designed for the storage and transportation of cadavers."
-	icon = 'icons/obj/bodybag.dmi'
-	icon_state = "bodybag_closed"
-	icon_closed = "bodybag_closed"
-	icon_opened = "bodybag_open"
+	icon = 'icons/obj/closets/bodybag.dmi'
+	closet_appearance = null
 	open_sound = 'sound/items/zip.ogg'
 	close_sound = 'sound/items/zip.ogg'
 	var/item_path = /obj/item/bodybag
@@ -128,19 +126,22 @@
 
 /obj/structure/closet/body_bag/update_icon()
 	if(opened)
-		icon_state = icon_opened
+		icon_state = "open"
 	else
-		if(contains_body > 0)
-			icon_state = "bodybag_closed1"
-		else
-			icon_state = icon_closed
+		icon_state = "closed_unlocked"
+
+	src.overlays.Cut()
+	/* Ours don't have toetags
+	if(has_label)
+		src.overlays += image(src.icon, "bodybag_label")
+	*/
 
 
 /obj/item/bodybag/cryobag
 	name = "stasis bag"
 	desc = "A non-reusable plastic bag designed to slow down bodily functions such as circulation and breathing, \
 	especially useful if short on time or in a hostile enviroment."
-	icon = 'icons/obj/cryobag.dmi'
+	icon = 'icons/obj/closets/cryobag.dmi'
 	icon_state = "bodybag_folded"
 	item_state = "bodybag_cryo_folded"
 	origin_tech = list(TECH_BIO = 4)
@@ -158,7 +159,7 @@
 	name = "stasis bag"
 	desc = "A non-reusable plastic bag designed to slow down bodily functions such as circulation and breathing, \
 	especially useful if short on time or in a hostile enviroment."
-	icon = 'icons/obj/cryobag.dmi'
+	icon = 'icons/obj/closets/cryobag.dmi'
 	item_path = /obj/item/bodybag/cryobag
 	store_misc = 0
 	store_items = 0
@@ -189,13 +190,17 @@
 /obj/structure/closet/body_bag/cryobag/open()
 	. = ..()
 	if(used)
-		var/obj/item/O = new/obj/item(src.loc)
-		O.name = "used [name]"
-		O.icon = src.icon
-		O.icon_state = "bodybag_used"
-		O.desc = "Pretty useless now..."
+		new /obj/item/usedcryobag(loc)
 		qdel(src)
 
+/obj/structure/closet/body_bag/cryobag/update_icon()
+	..()
+	overlays.Cut()
+	var/image/I = image(icon, "indicator[opened]")
+	I.appearance_flags = RESET_COLOR
+	I.color = COLOR_LIME
+	overlays += I
+
 /obj/structure/closet/body_bag/cryobag/MouseDrop(over_object, src_location, over_location)
 	. = ..()
 	if(. && syringe)
@@ -283,3 +288,9 @@
 
 		else
 			..()
+
+/obj/item/usedcryobag
+	name = "used stasis bag"
+	desc = "Pretty useless now.."
+	icon_state = "bodybag_used"
+	icon = 'icons/obj/closets/cryobag.dmi'

code/game/objects/items/devices/suit_cooling.dm

@@ -18,7 +18,7 @@
 
 	var/on = 0				//is it turned on?
 	var/cover_open = 0		//is the cover open?
-	var/obj/item/weapon/cell/cell
+	var/obj/item/weapon/cell/cell = /obj/item/weapon/cell/high
 	var/max_cooling = 15				// in degrees per second - probably don't need to mess with heat capacity here
 	var/charge_consumption = 3			// charge per second at max_cooling
 	var/thermostat = T20C
@@ -30,7 +30,8 @@
 
 /obj/item/device/suit_cooling_unit/Initialize()
 	. = ..()
-	cell = new/obj/item/weapon/cell/high(src)	//comes not with the crappy default power cell - because this is dedicated EVA equipment
+	if(ispath(cell))
+		cell = new cell(src)
 
 /obj/item/device/suit_cooling_unit/Destroy()
 	qdel_null(cell)
@@ -200,3 +201,23 @@
 			. += "The charge meter reads [round(cell.percent())]%."
 		else
 			. += "It doesn't have a power cell installed."
+
+/obj/item/device/suit_cooling_unit/emergency
+	icon_state = "esuitcooler"
+	cell = /obj/item/weapon/cell
+	w_class = ITEMSIZE_NORMAL
+
+/obj/item/device/suit_cooling_unit/emergency/updateicon()
+	return
+
+/obj/item/device/suit_cooling_unit/emergency/get_cell()
+	if(on)
+		return null // Don't let recharging happen while we're on
+	return cell
+
+/obj/item/device/suit_cooling_unit/emergency/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if (W.is_screwdriver())
+		to_chat(user, "<span class='warning'>This model has the cell permanently installed!</span>")
+		return
+
+	return ..()

code/game/objects/items/poi_items.dm

@@ -61,10 +61,8 @@
 /obj/structure/closet/crate/oldreactor
 	name = "fission reactor rack"
 	desc = "Used in older models of nuclear reactors, essentially a cooling rack for high volumes of radioactive material."
-	icon = 'icons/obj/objects.dmi'
-	icon_state = "poireactor"
-	icon_opened = "poireactor_open"
-	icon_closed = "poireactor"
+	icon = 'icons/obj/closets/poireactor.dmi'
+	closet_appearance = null
 	catalogue_data = list(/datum/category_item/catalogue/information/objects/oldreactor)
 	climbable = 0