Merge branch 'master' into medbay_fixes_and_shit

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

@@ -2,7 +2,7 @@
 	name = "portable suit cooling unit"
 	desc = "A portable heat sink and liquid cooled radiator that can be hooked up to a space suit's existing temperature controls to provide industrial levels of cooling."
 	w_class = ITEMSIZE_LARGE
-	icon = 'icons/obj/suitcooler.dmi'
+	icon = 'icons/obj/contained_items/tools/suitcooler.dmi'
 	icon_state = "suitcooler0"
 	item_state = "coolingpack"
 	contained_sprite = TRUE
@@ -24,7 +24,7 @@
 	var/cover_open = 0		//is the cover open?
 	var/obj/item/cell/cell
 	var/max_cooling = 12				//in degrees per second - probably don't need to mess with heat capacity here
-	var/charge_consumption = 16.6		//charge per second at max_cooling
+	var/charge_consumption = 8.3		//charge per second at max_cooling
 	var/thermostat = T20C
 
 	//TODO: make it heat up the surroundings when not in space
@@ -134,8 +134,13 @@
 		src.cell = null
 		update_icon()
 		return
+	toggle_power(user)
 
-	//TODO use a UI like the air tanks
+/obj/item/device/suit_cooling_unit/AltClick(mob/user)
+	if(Adjacent(user))
+		toggle_power(user)
+
+/obj/item/device/suit_cooling_unit/proc/toggle_power(var/mob/user)
 	if(on)
 		turn_off()
 	else
@@ -177,23 +182,31 @@
 		return
 
 	icon_state = "suitcooler0"
+	item_state = "coolingpack"
 
-	if(!cell || !on)
-		return
+	if(cell && on)
+		var/battery_level = 0
+		switch(round(cell.percent()))
+			if(86 to INFINITY)
+				battery_level = 0
+			if(69 to 85)
+				battery_level = 1
+			if(52 to 68)
+				battery_level = 2
+			if(35 to 51)
+				battery_level = 3
+			if(18 to 34)
+				battery_level = 4
+			if(-INFINITY to 17)
+				battery_level = 5
 
-	switch(round(cell.percent()))
-		if(86 to INFINITY)
-			add_overlay("battery-0")
-		if(69 to 85)
-			add_overlay("battery-1")
-		if(52 to 68)
-			add_overlay("battery-2")
-		if(35 to 51)
-			add_overlay("battery-3")
-		if(18 to 34)
-			add_overlay("battery-4")
-		if(-INFINITY to 17)
-			add_overlay("battery-5")
+		add_overlay("battery-[battery_level]")
+		item_state = "coolingpack[battery_level]"
+
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_back()
+		M.update_inv_s_store()
 
 /obj/item/device/suit_cooling_unit/examine(mob/user)
 	if(!..(user, 1))

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

@@ -211,6 +211,10 @@ RFD Construction-Class
 			build_cost =  1
 			build_type =  "floor"
 			build_atom =  /turf/simulated/floor/airless
+		else if(istype(T, /turf/simulated/open))
+			build_cost =  1
+			build_type =  "floor"
+			build_atom =  /turf/simulated/floor/airless
 		else if(istype(T, /turf/simulated/floor))
 			build_delay = 20
 			build_cost =  3

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

@@ -41,7 +41,7 @@
 			can_place = TRUE
 		else
 			for (var/obj/item/grab/G in C.grabbed_by)
-				if (G.loc == user && G.state >= GRAB_AGGRESSIVE)
+				if (G.state >= GRAB_AGGRESSIVE)
 					can_place = TRUE
 					break
 
@@ -102,7 +102,7 @@
 		user.drop_from_inventory(cuffs,target)
 	else
 		cuffs.forceMove(target)
-	
+
 	if(!legcuff)
 		target.handcuffed = cuffs
 		target.update_inv_handcuffed()
@@ -250,4 +250,4 @@
 	icon_state = "legcuff"
 	legcuff = TRUE
 	breakouttime = 30 SECONDS
-	cuff_type = "legcuffs"
+	cuff_type = "legcuffs"

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

@@ -172,12 +172,6 @@
 	desc = "It's an orange backpack which was designed to hold beakers, pill bottles and bottles."
 	icon_state = "chempack"
 
-/obj/item/storage/backpack/cloak
-	name = "tunnel cloak"
-	desc = "It's a Vaurca cloak with storage pockets."
-	icon_state = "cape"
-	sprite_sheets = list(BODYTYPE_VAURCA = 'icons/mob/species/vaurca/back.dmi')
-
 /obj/item/storage/backpack/syndie
 	name = "syndicate rucksack"
 	desc = "The latest in carbon fiber and red satin combat rucksack technology. Comfortable and tough!"
@@ -625,4 +619,71 @@
 	desc = "A small, fashionable bag typically worn over the shoulder."
 	icon_state = "purse"
 	item_state = "purse"
-	max_storage_space = 16
+	max_storage_space = 16
+
+//**Vaurca cloaks**//
+
+/obj/item/storage/backpack/cloak
+	name = "tunnel cloak"
+	desc = "A Vaurca cloak with storage pockets."
+	icon_state = "cape"
+	item_state = "cape"
+	sprite_sheets = list(BODYTYPE_VAURCA = 'icons/mob/species/vaurca/back.dmi')
+	var/hooded = FALSE
+
+/obj/item/storage/backpack/cloak/verb/toggle_cloak_hood()
+	set name = "Toggle Cloak Hood"
+	set desc = "Toggle your cloak hood."
+	set category = "Object"
+	set src in usr
+	if(use_check_and_message(usr))
+		return 0
+	hooded = !hooded 
+	to_chat(usr, "You [hooded ? "raise" : "lower"] \the [src] hood.")
+	icon_state = "[initial(icon_state)][hooded ? "_up" : ""]"
+	item_state = "icon_state"
+	var/mob/living/carbon/human/H = src.loc
+	H.update_icon()
+	H.update_inv_back()
+
+/obj/item/storage/backpack/cloak/sedantis
+	name = "Sedantis tunnel cloak"
+	desc = "A Vaurca cloak with storage pockets. This one has the Sedantis flag design."
+	icon_state = "sedcape"
+	item_state = "sedcape"
+
+/obj/item/storage/backpack/cloak/medical
+	name = "medical tunnel cloak"
+	desc = "A Vaurca cloak with storage pockets. This one has the medical department design."
+	icon_state = "medcape"
+	item_state = "medcape"
+
+/obj/item/storage/backpack/cloak/engi 
+	name = "engineering tunnel cloak"
+	desc = "A Vaurca cloak with storage pockets. This one has the engineering department design."
+	icon_state = "engicape"
+	item_state = "engicape"
+
+/obj/item/storage/backpack/cloak/atmos
+	name = "atmospherics tunnel cloak"
+	desc = "A Vaurca cloak with storage pockets. This one has the atmospherics design."
+	icon_state = "atmoscape"
+	item_state = "atmoscape"
+
+/obj/item/storage/backpack/cloak/cargo
+	name = "cargo tunnel cloak"
+	desc = "A Vaurca cloak with storage pockets. This one has the supply department design."
+	icon_state = "cargocape"
+	item_state = "cargocape"
+
+/obj/item/storage/backpack/cloak/sci
+	name = "science tunnel cloak"
+	desc = "A Vaurca cloak with storage pockets. This one has the science department design."
+	icon_state = "scicape"
+	item_state = "scicape"
+
+/obj/item/storage/backpack/cloak/sec
+	name = "security tunnel cloak"
+	desc = "A Vaurca cloak with storage pockets. This one has the security department design."
+	icon_state = "seccape"
+	item_state = "seccape"

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

@@ -46,19 +46,24 @@
 	var/flipped = null
 	var/flippable = 1
 	var/wear_over_suit = 0
-	var/base_name = ""
 
 /obj/item/storage/wallet/Initialize()
 	. = ..()
-	base_name = name
+	AddComponent(/datum/component/base_name, name)
 
+/obj/item/storage/wallet/proc/update_name(var/base_name = initial(name))
+	SEND_SIGNAL(src, COMSIG_BASENAME_SETNAME, args)
+	if(front_id)
+		name = "[base_name] ([front_id])"
+	else
+		name = "[base_name]"
 
 /obj/item/storage/wallet/remove_from_storage(obj/item/W as obj, atom/new_location)
 	. = ..(W, new_location)
 	if(.)
 		if(W == front_id)
 			front_id = null
-			name = base_name
+			update_name()
 			update_icon()
 
 /obj/item/storage/wallet/handle_item_insertion(obj/item/W as obj, prevent_warning = 0)
@@ -66,7 +71,7 @@
 	if(.)
 		if(!front_id && istype(W, /obj/item/card/id))
 			front_id = W
-			name = "[name] ([front_id])"
+			update_name()
 			update_icon()
 
 /obj/item/storage/wallet/update_icon()