Merge branch 'master' of https://github.com/tgstation/-tg-station into EXPLODINGKNEES

Conflicts:
	icons/mob/uniform.dmi

code/WorkInProgress/Sigyn/Softcurity/jobs.dm

@@ -49,7 +49,7 @@
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/device/pda/warden(H), slot_belt)
 		H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses)
-		H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store)
+		H.equip_to_slot_or_del(new /obj/item/device/flash/handheld(H), slot_l_store)
 		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
 		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
@@ -115,7 +115,7 @@
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/device/pda/security(H), slot_belt)
 		H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_r_store)
-		H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store)
+		H.equip_to_slot_or_del(new /obj/item/device/flash/handheld(H), slot_l_store)
 		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
 		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)

code/WorkInProgress/Sigyn/Softcurity/secure_closet.dm

@@ -49,7 +49,7 @@
 		new /obj/item/clothing/shoes/brown(src)
 		new /obj/item/weapon/storage/id_kit(src)
 		new /obj/item/weapon/storage/id_kit( src )
-		new /obj/item/device/flash(src)
+		new /obj/item/device/flash/handheld(src)
 		new /obj/item/clothing/glasses/sunglasses(src)
 		return
 
@@ -73,7 +73,7 @@
 		new /obj/item/weapon/storage/lockbox/loyalty(src)
 		new /obj/item/weapon/storage/flashbang_kit(src)
 		new /obj/item/weapon/storage/belt/security(src)
-		new /obj/item/device/flash(src)
+		new /obj/item/device/flash/handheld(src)
 		new /obj/item/weapon/melee/baton(src)
 		new /obj/item/weapon/gun/energy/taser(src)
 		new /obj/item/weapon/reagent_containers/spray/pepper(src)
@@ -122,7 +122,7 @@
 		new /obj/item/weapon/storage/backpack/satchel_sec(src)
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/weapon/storage/belt/security(src)
-		new /obj/item/device/flash(src)
+		new /obj/item/device/flash/handheld(src)
 		new /obj/item/weapon/reagent_containers/spray/pepper(src)
 		new /obj/item/weapon/reagent_containers/spray/pepper(src)
 		new /obj/item/clothing/glasses/sunglasses(src)

code/game/jobs/job/security.dm

@@ -84,7 +84,7 @@ Warden
 	H.equip_to_slot_or_del(new /obj/item/clothing/head/warden(H), slot_head)
 	H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
 	H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses)
-	H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store)
+	H.equip_to_slot_or_del(new /obj/item/device/flash/handheld(H), slot_l_store)
 
 	if(H.backbag == 1)
 		H.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs(H), slot_l_hand)
@@ -175,7 +175,7 @@ Security Officer
 	H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit)
 	H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), slot_head)
 	H.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs(H), slot_s_store)
-	H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store)
+	H.equip_to_slot_or_del(new /obj/item/device/flash/handheld(H), slot_l_store)
 
 	if(H.backbag == 1)
 		H.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs(H), slot_r_store)

code/game/machinery/flasher.dm

@@ -46,7 +46,7 @@
 			bulb = null
 			power_change()
 
-	else if (istype(W, /obj/item/device/flash))
+	else if (istype(W, /obj/item/device/flash/handheld))
 		if (!bulb)
 			user.visible_message("<span class='notice'>[user] installs [W] into [src].</span>", "<span class='notice'>You install [W] into [src].</span>")
 			user.drop_item()
@@ -174,4 +174,4 @@
 	icon_state = "launcherbtt"
 	active = 0
 
-	return
+	return

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

@@ -23,15 +23,15 @@
 	return 1
 
 
-/obj/item/device/flash/proc/burn_out(var/mob/user) //Made so you can override it if you want to have an invincible flash from R&D or something.
+/obj/item/device/flash/proc/burn_out() //Made so you can override it if you want to have an invincible flash from R&D or something.
 	broken = 1
 	icon_state = "[initial(icon_state)]burnt"
-	user.visible_message("<span class='notice'>The [src.name] burns out!</span>")
+	visible_message("<span class='notice'>The [src.name] burns out!</span>")
 
 
 /obj/item/device/flash/proc/flash_recharge(var/mob/user)
 	if(prob(times_used * 2))	//if you use it 5 times in a minute it has a 10% chance to break!
-		burn_out(user)
+		burn_out()
 		return 0
 
 	var/deciseconds_passed = world.time - last_used
@@ -156,4 +156,6 @@
 	name = "memorizer"
 	desc = "If you see this, you're not likely to remember it any time soon."
 	icon_state = "memorizer"
-	item_state = "nullrod"
+	item_state = "nullrod"
+
+/obj/item/device/flash/handheld //this is now the regular pocket flashes

code/game/objects/items/devices/radio/headset.dm

@@ -20,6 +20,13 @@
 	keyslot1 = new /obj/item/device/encryptionkey/
 	recalculateChannels()
 
+/obj/item/device/radio/headset/Destroy()
+	qdel(keyslot1)
+	qdel(keyslot2)
+	keyslot1 = null
+	keyslot2 = null
+	..()
+
 /obj/item/device/radio/headset/talk_into(mob/living/M as mob, message, channel)
 	if (!listening)
 		return

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

@@ -50,7 +50,10 @@
 		initialize()
 
 /obj/item/device/radio/Destroy()
-	remove_radio_all(src) //Just to be sure.
+	qdel(wires)
+	wires = null
+	remove_radio_all(src) //Just to be sure
+	..()
 
 /obj/item/device/radio/MouseDrop(obj/over_object as obj, src_location, over_location)
 	var/mob/M = usr
@@ -218,7 +221,7 @@
 		the signal gets processed and logged, and an audible transmission gets sent
 		to each individual headset.
 	*/
-		
+
 	/*
 		be prepared to disregard any comments in all of tcomms code. i tried my best to keep them somewhat up-to-date, but eh
 	*/

code/game/objects/items/robot/robot_parts.dm

@@ -331,8 +331,8 @@
 
 /obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob)
 	..()
-	if(istype(W, /obj/item/device/flash))
-		var/obj/item/device/flash/F = W
+	if(istype(W, /obj/item/device/flash/handheld))
+		var/obj/item/device/flash/handheld/F = W
 		if(src.flash1 && src.flash2)
 			user << "<span class='notice'>You have already inserted the eyes!</span>"
 			return

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

@@ -112,7 +112,7 @@
 		/obj/item/weapon/grenade/flashbang,
 		/obj/item/weapon/reagent_containers/spray/pepper,
 		/obj/item/weapon/restraints/handcuffs,
-		/obj/item/device/flash,
+		/obj/item/device/flash/handheld,
 		/obj/item/clothing/glasses,
 		/obj/item/ammo_casing/shotgun,
 		/obj/item/ammo_box,

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

@@ -183,12 +183,12 @@
 
 /obj/item/weapon/storage/box/flashes/New()
 	..()
-	new /obj/item/device/flash(src)
-	new /obj/item/device/flash(src)
-	new /obj/item/device/flash(src)
-	new /obj/item/device/flash(src)
-	new /obj/item/device/flash(src)
-	new /obj/item/device/flash(src)
+	new /obj/item/device/flash/handheld(src)
+	new /obj/item/device/flash/handheld(src)
+	new /obj/item/device/flash/handheld(src)
+	new /obj/item/device/flash/handheld(src)
+	new /obj/item/device/flash/handheld(src)
+	new /obj/item/device/flash/handheld(src)
 
 /obj/item/weapon/storage/box/teargas
 	name = "box of tear gas grenades (WARNING)"

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -30,7 +30,7 @@
 	new /obj/item/weapon/airlock_painter(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/device/multitool(src)
-	new /obj/item/device/flash(src)
+	new /obj/item/device/flash/handheld(src)
 	return
 
 /obj/structure/closet/secure_closet/engineering_electrical

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -120,7 +120,7 @@
 	new /obj/item/clothing/shoes/sneakers/brown	(src)
 	new /obj/item/device/radio/headset/heads/cmo(src)
 	new /obj/item/weapon/storage/belt/medical(src)
-	new /obj/item/device/flash(src)
+	new /obj/item/device/flash/handheld(src)
 	new /obj/item/weapon/reagent_containers/hypospray/CMO(src)
 	return
 

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -46,7 +46,7 @@
 	new /obj/item/weapon/tank/air(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/clothing/suit/armor/reactive(src)
-	new /obj/item/device/flash(src)
+	new /obj/item/device/flash/handheld(src)
 	new /obj/item/device/laser_pointer(src)
 	new /obj/item/clothing/under/rank/research_director/alt(src)
 	return

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -49,7 +49,7 @@
 	new /obj/item/weapon/storage/box/ids(src)
 	new /obj/item/clothing/suit/armor/vest(src)
 	new /obj/item/weapon/gun/energy/gun(src)
-	new /obj/item/device/flash(src)
+	new /obj/item/device/flash/handheld(src)
 	new /obj/item/clothing/glasses/sunglasses(src)
 	new /obj/item/weapon/mining_voucher(src)
 	return
@@ -79,7 +79,7 @@
 	new /obj/item/weapon/shield/riot/tele(src)
 	new /obj/item/clothing/mask/gas/sechailer/hos(src)
 	new /obj/item/weapon/storage/box/flashbangs(src)
-	new /obj/item/device/flash(src)
+	new /obj/item/device/flash/handheld(src)
 	new /obj/item/weapon/melee/baton/loaded(src)
 	new /obj/item/weapon/gun/energy/gun(src)
 	new /obj/item/weapon/storage/belt/security(src)
@@ -134,7 +134,7 @@
 	new /obj/item/clothing/head/helmet(src)
 	new /obj/item/device/radio/headset/headset_sec/alt(src)
 	new /obj/item/clothing/mask/gas/sechailer(src)
-	new /obj/item/device/flash(src)
+	new /obj/item/device/flash/handheld(src)
 	new /obj/item/weapon/reagent_containers/spray/pepper(src)
 	new /obj/item/weapon/grenade/flashbang(src)
 	new /obj/item/weapon/gun/energy/taser(src)

code/modules/clothing/suits/jobs.dm

@@ -20,7 +20,7 @@
 	item_state = "bio_suit"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	flags_inv = HIDEJUMPSUIT
-	allowed = list(/obj/item/weapon/disk, /obj/item/weapon/stamp, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/weapon/melee, /obj/item/weapon/storage/lockbox/medal, /obj/item/device/flash, /obj/item/weapon/storage/box/matches, /obj/item/weapon/lighter, /obj/item/clothing/mask/cigarette, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/tank/emergency_oxygen)
+	allowed = list(/obj/item/weapon/disk, /obj/item/weapon/stamp, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/weapon/melee, /obj/item/weapon/storage/lockbox/medal, /obj/item/device/flash/handheld, /obj/item/weapon/storage/box/matches, /obj/item/weapon/lighter, /obj/item/clothing/mask/cigarette, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/tank/emergency_oxygen)
 
 //Chaplain
 /obj/item/clothing/suit/chaplain_hoodie

code/modules/clothing/under/color.dm

@@ -1,19 +1,27 @@
 /obj/item/clothing/under/color
-	desc = "A standard issue colored jumpsuit for assistants. Variety is the spice of life!"
+	desc = "A standard issue colored jumpsuit. Variety is the spice of life!"
 
 /obj/item/clothing/under/color/random/New()
-	var/obj/item/clothing/under/color/C = pick(typesof(/obj/item/clothing/under/color) - /obj/item/clothing/under/color/random)
+	var/list/excluded = list(/obj/item/clothing/under/color/random, /obj/item/clothing/under/color)
+	var/obj/item/clothing/under/color/C = pick(typesof(/obj/item/clothing/under/color) - excluded)
 	name = initial(C.name)
 	icon_state = initial(C.icon_state)
 	item_state = initial(C.item_state)
 	item_color = initial(C.item_color)
 
+
 /obj/item/clothing/under/color/black
 	name = "black jumpsuit"
 	icon_state = "black"
 	item_state = "bl_suit"
 	item_color = "black"
 
+/obj/item/clothing/under/color/grey
+	name = "grey jumpsuit"
+	icon_state = "grey"
+	item_state = "gy_suit"
+	item_color = "grey"
+
 /obj/item/clothing/under/color/blue
 	name = "blue jumpsuit"
 	icon_state = "blue"
@@ -26,12 +34,6 @@
 	item_state = "g_suit"
 	item_color = "green"
 
-/obj/item/clothing/under/color/grey
-	name = "grey jumpsuit"
-	icon_state = "grey"
-	item_state = "gy_suit"
-	item_color = "grey"
-
 /obj/item/clothing/under/color/orange
 	name = "orange jumpsuit"
 	desc = "Don't wear this near paranoid security officers."

code/modules/mob/living/simple_animal/friendly/drone.dm

@@ -494,6 +494,10 @@
 	else
 		mode()
 
+/mob/living/simple_animal/drone/assess_threat() //Secbots won't hunt maintenance drones.
+	return -10
+
+
 #undef HANDS_LAYER
 #undef HEAD_LAYER
 #undef TOTAL_LAYERS

code/modules/research/designs/medical_designs.dm

@@ -52,7 +52,7 @@ datum/design/synthetic_flash
 	build_type = MECHFAB
 	materials = list("$metal" = 750, "$glass" = 750)
 	reliability = 76
-	build_path = /obj/item/device/flash/
+	build_path = /obj/item/device/flash/handheld
 	category = "Misc"
 
 datum/design/bluespacebeaker