Merge branch 'staging' of github.com:NebulaSS13/Nebula into devupdate

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

@@ -82,4 +82,5 @@
 	..(locked_frequency)
 
 /obj/item/radio/intercom/locked/entertainment
-	locked_frequency = 1461
+	broadcasting = TRUE
+	locked_frequency = 1461

code/game/objects/items/weapons/implants/implants/adrenaline.dm

@@ -31,8 +31,8 @@
 	imp_in.set_status(STAT_PARA, 0)
 
 /obj/item/implant/adrenalin/implanted(mob/source)
-	source.StoreMemory("A implant can be activated by using the pale emote, <B>say *pale</B> to attempt to activate.", /decl/memory_options/system)
-	to_chat(source, "The implanted freedom implant can be activated by using the pale emote, <B>say *pale</B> to attempt to activate.")
+	source.StoreMemory("\A [src] can be activated by using the pale emote, <B>say *pale</B> to attempt to activate.", /decl/memory_options/system)
+	to_chat(source, "\The [src] can be activated by using the pale emote, <B>say *pale</B> to attempt to activate.")
 	return TRUE
 
 /obj/item/implanter/adrenalin

code/game/objects/items/weapons/implants/implants/compressed.dm

@@ -27,8 +27,8 @@
 /obj/item/implant/compressed/implanted(mob/source)
 	src.activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_v", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
 	if (source.mind)
-		source.StoreMemory("Compressed matter implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", /decl/memory_options/system)
-	to_chat(source, "The implanted compressed matter implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.")
+		source.StoreMemory("\A [src] can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", /decl/memory_options/system)
+	to_chat(source, "\The [src] can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.")
 	return TRUE
 
 /obj/item/implanter/compressed

code/game/objects/items/weapons/implants/implants/freedom.dm

@@ -50,8 +50,8 @@
 
 /obj/item/implant/freedom/implanted(mob/living/source)
 	src.activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_v", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
-	source.StoreMemory("Freedom implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", /decl/memory_options/system)
-	to_chat(source, "The implanted freedom implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.")
+	source.StoreMemory("\A [src] can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", /decl/memory_options/system)
+	to_chat(source, "\The [src] can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.")
 	return TRUE
 
 /obj/item/implanter/freedom

code/game/objects/items/weapons/implants/implants/uplink.dm

@@ -13,8 +13,8 @@
 /obj/item/implant/uplink/implanted(mob/source)
 	var/emote_options = list("blink", "blink_r", "eyebrow", "chuckle", "twitch_v", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
 	activation_emote = source.client ? (input(source, "Choose activation emote:", "Uplink Implant Setup") in emote_options) : emote_options[1]
-	source.StoreMemory("Uplink implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", /decl/memory_options/system)
-	to_chat(source, "The implanted uplink implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.")
+	source.StoreMemory("\A [src] can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", /decl/memory_options/system)
+	to_chat(source, "\The [src] can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.")
 	hidden_uplink.uplink_owner = source.mind
 	return TRUE
 

code/modules/atmospherics/datum_pipeline.dm

@@ -168,7 +168,7 @@
 
 /datum/pipeline/proc/mingle_with_turf(turf/target, mingle_volume)
 
-	if(!isturf(target))
+	if(!isturf(target) || !istype(air))
 		return
 
 	var/datum/gas_mixture/air_sample = air.remove_volume(mingle_volume)

code/modules/clothing/suits/jobs.dm

@@ -21,7 +21,7 @@
 /obj/item/clothing/suit/apron/colourable
 	desc = "A basic apron, good for protecting your clothes."
 	icon = 'icons/clothing/suits/apron_colourable.dmi'
-	color = null
+	paint_color = null
 	material_alteration = MAT_FLAG_ALTERATION_COLOR | MAT_FLAG_ALTERATION_NAME | MAT_FLAG_ALTERATION_DESC
 
 //Captain

code/modules/clothing/suits/robes.dm

@@ -7,6 +7,7 @@
 	body_parts_covered = SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_LEGS
 	material_alteration = MAT_FLAG_ALTERATION_COLOR | MAT_FLAG_ALTERATION_NAME | MAT_FLAG_ALTERATION_DESC
 	slot_flags = SLOT_UPPER_BODY | SLOT_OVER_BODY
+	valid_accessory_slots = UNIFORM_DEFAULT_ACCESSORIES
 	accessory_slot = ACCESSORY_SLOT_DECOR
 
 /obj/item/clothing/suit/robe/sleeved

code/modules/mining/machinery/material_stacker.dm

@@ -44,9 +44,11 @@
 			qdel(S)
 
 		if(emagged)
-			for(var/mob/living/M in input_turf)
-				visible_message(SPAN_DANGER("\The [src] squashes \the [src] with its stacking mechanism!"))
-				M.take_overall_damage(rand(10, 20), 0)
+			for(var/mob/living/victim in input_turf)
+				if(!victim.simulated)
+					continue
+				visible_message(SPAN_DANGER("\The [src] squashes \the [victim] with its stacking mechanism!"))
+				victim.take_overall_damage(rand(10, 20), 0)
 				break
 
 	if(output_turf)

code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm

@@ -148,7 +148,7 @@
 	boss_theme = play_looping_sound(src, sound_id, 'sound/music/Visager-Battle.ogg', volume = 10, range = 7, falloff = 4, prefer_mute = TRUE)
 	update_icon()
 
-/mob/living/simple_animal/hostile/retaliate/goat/guard
+/mob/living/simple_animal/hostile/goat/guard
 	name = "honour guard"
 	desc = "A very handsome and noble beast."
 	icon = 'icons/mob/simple_animal/goat_guard.dmi'
@@ -161,7 +161,7 @@
 	_base_attack_force = 15
 	sharp = TRUE
 
-/mob/living/simple_animal/hostile/retaliate/goat/guard/master
+/mob/living/simple_animal/hostile/goat/guard/master
 	name = "master of the guard"
 	desc = "A very handsome and noble beast - the most trusted of all the king's men."
 	icon = 'icons/mob/simple_animal/goat_master.dmi'

code/modules/reagents/chems/chems_nutriment.dm

@@ -32,7 +32,6 @@
 	lore_text = "Mollusc meat, or slug meat - something slimy, anyway."
 	scannable = 1
 	taste_description = "cold, bitter slime"
-	overdose = 10
 	hydration_factor = 6
 	uid = "chem_nutriment_slime"
 	allergen_flags = ALLERGEN_MEAT | ALLERGEN_FISH

code/unit_tests/mob_tests.dm

@@ -65,7 +65,7 @@
 		test_result["msg"] = "Unable to find a location to create test mob"
 		return test_result
 
-	var/mob/living/human/H = new mobtype(mobloc)
+	var/mob/living/human/H = new mobtype(mobloc, SPECIES_HUMAN) // force human for testing
 
 	H.mind_initialize("TestKey[rand(0,10000)]")
 

mods/content/corporate/clothing/suit/ponchos.dm

@@ -1,10 +1,10 @@
-/obj/item/clothing/suit/poncho/roles/science
+/obj/item/clothing/suit/poncho/science
 	name = "science poncho"
 	desc = "A simple, comfortable cloak without sleeves. This one is white with a few bottle green stripes, corporate colors."
 	bodytype_equip_flags = null
 	icon = 'mods/content/corporate/icons/clothing/suit/sci_poncho.dmi'
 
-/obj/item/clothing/suit/poncho/roles/science/nanotrasen
+/obj/item/clothing/suit/poncho/science/nanotrasen
 	name = "\improper NanoTrasen poncho"
 	desc = "A simple, comfortable cloak without sleeves. This one is white with a few red stripes, colors of NanoTrasen. Go NanoTrasen!"
 	icon = 'mods/content/corporate/icons/clothing/suit/nt_poncho.dmi'

mods/content/corporate/datum/loadout.dm

@@ -103,7 +103,7 @@
 
 /decl/loadout_option/suit/nanotrasen_poncho
 	name = "poncho, NanoTrasen"
-	path = /obj/item/clothing/suit/poncho/roles/science/nanotrasen
+	path = /obj/item/clothing/suit/poncho/science/nanotrasen
 	uid = "gear_suit_corpponcho"
 
 /decl/loadout_option/suit/corp_jacket
@@ -121,7 +121,7 @@
 
 /decl/loadout_option/suit/science_poncho
 	name = "poncho, science"
-	path = /obj/item/clothing/suit/poncho/roles/science
+	path = /obj/item/clothing/suit/poncho/science
 	uid = "gear_suit_corpponcho_science"
 
 /decl/loadout_option/suit/hoodie_nt

mods/species/neoavians/clothing.dm

@@ -43,7 +43,6 @@
 	name = "smock"
 	desc = "A loose-fitting smock favoured by neo-avians."
 	icon = 'mods/species/neoavians/icons/clothing/under/smock.dmi'
-	icon_state = ICON_STATE_WORLD
 	bodytype_equip_flags = BODY_EQUIP_FLAG_AVIAN
 	_avian_onmob_icon = null
 
@@ -83,7 +82,6 @@
 
 /obj/item/clothing/shoes/avian
 	name = "small shoes"
-	icon = 'mods/species/neoavians/icons/clothing/feet/shoes.dmi'
 	color = COLOR_GRAY
 	bodytype_equip_flags = BODY_EQUIP_FLAG_AVIAN
 	_avian_onmob_icon = null
@@ -95,4 +93,4 @@
 	icon = 'mods/species/neoavians/icons/clothing/feet/footwraps.dmi'
 	_base_attack_force = 1
 	item_flags = ITEM_FLAG_SILENT
-	w_class = ITEM_SIZE_SMALL
+	w_class = ITEM_SIZE_SMALL