Merge branch 'update-tgui' of https://github.com/sarcoph/Hyper-Station-13 into update-tgui

code/_globalvars/lists/maintenance_loot.dm

@@ -121,7 +121,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/autosurgeon/womb = 1,
 	/obj/item/toy/plush/random = 1,
 	/obj/item/grenade/spawnergrenade/clustaur = 1,
-	/obj/effect/spawner/lootdrop/grille_or_trash = 5
+	/obj/effect/spawner/lootdrop/trash = 5
 	))
 
 GLOBAL_LIST_INIT(ratking_trash, list(//Garbage: used by the regal rat mob when spawning garbage.

code/game/area/areas/centcom.dm

@@ -61,6 +61,29 @@
 
 /area/centcom/supplypod/loading/four
 	name = "Supplypod Loading Bay #4"
+
+/area/centcom/bunk
+	hidden = TRUE
+
+/area/centcom/bunk/one
+	name = "Centcom Bunk #1"
+
+/area/centcom/bunk/two
+	name = "Centcom Bunk #2"
+
+/area/centcom/bunk/three
+	name = "Centcom Bunk #3"
+
+/area/centcom/bunk/four
+	name = "Centcom Bunk #4"
+
+/area/centcom/bunk/five
+	name = "Centcom Bunk #5"
+
+/area/centcom/bunk/six
+	name = "Centcom Bunk #6"
+
+
 //THUNDERDOME
 
 /area/tdome

code/game/objects/effects/spawners/lootdrop.dm

@@ -68,6 +68,20 @@
 				/obj/item/toy/cards/deck/syndicate = 2
 				)
 
+/obj/effect/spawner/lootdrop/trash
+	name = "maint trash spawner"
+	loot = list(/obj/item/cigbutt = 1,
+			/obj/item/trash/cheesie = 1,
+			/obj/item/trash/candy = 1,
+			/obj/item/trash/chips = 1,
+			/obj/item/reagent_containers/food/snacks/deadmouse = 1,
+			/obj/item/trash/pistachios = 1,
+			/obj/item/trash/plate = 1,
+			/obj/item/trash/popcorn = 1,
+			/obj/item/trash/raisins = 1,
+			/obj/item/trash/sosjerky = 1,
+			/obj/item/trash/syndi_cakes = 1)
+
 /obj/effect/spawner/lootdrop/grille_or_trash
 	name = "maint grille or trash spawner"
 	loot = list(/obj/structure/grille = 5,

code/game/objects/items/dyekit.dm

@@ -35,7 +35,7 @@
 	if(!new_grad_color)
 		return
 
-	human_target.hair_color = new_hair_color
+	human_target.hair_color = sanitize_hexcolor(new_hair_color)
 	human_target.grad_style = new_grad_style
 	human_target.grad_color = sanitize_hexcolor(new_grad_color)
 	to_chat(human_target, "<span class='notice'>You start applying the hair dye...</span>")