Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro

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

@@ -2,7 +2,7 @@
 	name = "flash"
 	desc = "Used for blinding and being an asshole."
 	icon_state = "flash"
-	item_state = "flashbang"	//looks exactly like a flash (and nothing like a flashbang)
+	item_state = "flash"
 	throwforce = 5
 	w_class = 2.0
 	throw_speed = 4

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

@@ -7,6 +7,13 @@
 	slot_flags = SLOT_BELT
 	attack_verb = list("whipped", "lashed", "disciplined")
 
+
+/obj/item/weapon/storage/update_icon()
+	if (ismob(src.loc))
+		var/mob/M = src.loc
+		M.update_inv_belt()
+
+
 /obj/item/weapon/storage/belt/utility
 	name = "tool-belt" //Carn: utility belt is nicer, but it bamboozles the text parsing.
 	desc = "Can hold various tools."
@@ -84,7 +91,7 @@
 	name = "security belt"
 	desc = "Can hold security gear like handcuffs and flashes."
 	icon_state = "securitybelt"
-	item_state = "security"//Could likely use a better one.
+	item_state = "security"
 	storage_slots = 7
 	max_w_class = 3
 	max_combined_w_class = 21

code/game/objects/objs.dm

@@ -20,7 +20,8 @@
 	// Calling Topic without a corresponding window open causes runtime errors
 	if(!nowindow && ..())
 		return 1
-	if(usr.can_interact_with_interface(src, checkrange) != STATUS_INTERACTIVE)
+
+	if(usr.can_interact_with_interface(nano_host(), checkrange) != STATUS_INTERACTIVE)
 		return 1
 	add_fingerprint(usr)
 	return 0

code/game/objects/structures/under_wardrobe.dm

@@ -0,0 +1,34 @@
+/obj/structure/undies_wardrobe
+	name = "underwear wardrobe"
+	desc = "Holds item of clothing you shouldn't be showing off in the hallways."
+	icon = 'icons/obj/closet.dmi'
+	icon_state = "cabinet_closed"
+
+
+/obj/structure/undies_wardrobe/attack_hand(mob/user as mob)
+	src.add_fingerprint(user)
+	var/mob/living/carbon/human/H = user
+	if(!ishuman(user) || (H.species && !(H.species.flags & HAS_UNDERWEAR)))
+		user << "<span class='warning'>Sadly there's nothing in here for you to wear.</span>"
+		return 0
+
+	var/utype = alert("Which section do you want to pick from?",,"Male underwear", "Female underwear", "Undershirts")
+	var/list/selection
+	switch(utype)
+		if("Male underwear")
+			selection = underwear_m
+		if("Female underwear")
+			selection = underwear_f
+		if("Undershirts")
+			selection = undershirt_t
+	var/pick = input("Select the style") as null|anything in selection
+	if(pick)
+		if(get_dist(src,user) > 1)
+			return
+		if(utype == "Undershirts")
+			H.undershirt = undershirt_t[pick]
+		else
+			H.underwear = selection[pick]
+		H.update_body(1)
+
+	return 1