Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151

code/modules/mob/dead/new_player/new_player.dm

@@ -429,7 +429,19 @@
 
 
 /mob/dead/new_player/proc/LateChoices()
-	var/dat = "<div class='notice'>Round Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]</div>"
+
+	var/level = "green"
+	switch(GLOB.security_level)
+		if(SEC_LEVEL_BLUE)
+			level = "blue"
+		if(SEC_LEVEL_AMBER)
+			level = "amber"
+		if(SEC_LEVEL_RED)
+			level = "red"
+		if(SEC_LEVEL_DELTA)
+			level = "delta"	
+
+	var/dat = "<div class='notice'>Round Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]<br>Alert Level: [capitalize(level)]</div>"
 
 	if(SSshuttle.emergency)
 		switch(SSshuttle.emergency.mode)

code/modules/mob/dead/new_player/preferences_setup.dm

@@ -6,11 +6,11 @@
 	else
 		gender = pick(MALE,FEMALE)
 	underwear = random_underwear(gender)
-	undie_color = random_color()
+	undie_color = random_short_color()
 	undershirt = random_undershirt(gender)
-	shirt_color = random_color()
+	shirt_color = random_short_color()
 	socks = random_socks()
-	socks_color = random_color()
+	socks_color = random_short_color()
 	skin_tone = random_skin_tone()
 	hair_style = random_hair_style(gender)
 	facial_hair_style = random_facial_hair_style(gender)

code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm

@@ -172,11 +172,13 @@
 	name = "Tank Top - Midriff"
 	icon_state = "tank_midriff"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/tanktop_midriff_alt
 	name = "Tank Top - Midriff Halterneck"
 	icon_state = "tank_midriff_alt"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/tankstripe
 	name = "Tank Top - Striped"
@@ -190,100 +192,122 @@
 	name = "Baby-Doll"
 	icon_state = "babydoll"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/bra
 	name = "Bra"
 	icon_state = "bra"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/bra_alt
 	name = "Bra - Alt"
 	icon_state = "bra_alt"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/bra_thin
 	name = "Bra - Thin"
 	icon_state = "bra_thin"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/bra_kinky
 	name = "Bra - Kinky Black"
 	icon_state = "bra_kinky"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/bra_freedom
 	name = "Bra - Freedom"
 	icon_state = "bra_assblastusa"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/bra_commie
 	name = "Bra - Commie"
 	icon_state = "bra_commie"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/bra_beekini
 	name = "Bra - Bee-kini"
 	icon_state = "bra_bee-kini"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/bra_uk
 	name = "Bra - UK"
 	icon_state = "bra_uk"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/bra_neko
 	name = "Bra - Neko"
 	icon_state = "bra_neko"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/halterneck_bra
 	name = "Bra - Halterneck"
 	icon_state = "halterneck_bra"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/sports_bra
 	name = "Bra, Sports"
 	icon_state = "sports_bra"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/sports_bra_alt
 	name = "Bra, Sports - Alt"
 	icon_state = "sports_bra_alt"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/bra_strapless
 	name = "Bra, Strapless"
 	icon_state = "bra_strapless"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/bra_strapless_alt
 	name = "Bra, Strapless - Alt"
 	icon_state = "bra_blue"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/striped_bra
 	name = "Bra - Striped"
 	icon_state = "striped_bra"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/fishnet_sleeves
 	name = "Fishnet - sleeves"
 	icon_state = "fishnet_sleeves"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/fishnet_gloves
 	name = "Fishnet - gloves"
 	icon_state = "fishnet_gloves"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/fishnet_base
 	name = "Fishnet - top"
 	icon_state = "fishnet_body"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/swimsuit
 	name = "Swimsuit Top"
 	icon_state = "bra_swimming"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/swimsuit_alt
 	name = "Swimsuit Top - Strapless"
 	icon_state = "bra_swimming_alt"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/top/tubetop
 	name = "Tube Top"
 	icon_state = "tubetop"
-	has_color = TRUE
+	has_color = TRUE
+	gender = FEMALE

code/modules/mob/dead/new_player/sprite_accessories/underwear.dm

@@ -10,45 +10,55 @@
 	name = "Mankini"
 	icon_state = "mankini"
 	has_color = TRUE
+	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/male_kinky
 	name = "Jockstrap"
 	icon_state = "jockstrap"
 	has_color = TRUE
+	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/briefs
 	name = "Briefs"
 	icon_state = "briefs"
 	has_color = TRUE
+	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/boxers
 	name = "Boxers"
 	icon_state = "boxers"
 	has_color = TRUE
+	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/male_bee
 	name = "Boxers - Bee"
 	icon_state = "bee_shorts"
+	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/male_hearts
 	name = "Boxers - Heart"
 	icon_state = "boxers_heart"
+	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/male_stripe
 	name = "Boxers - Striped"
 	icon_state = "boxers_striped"
+	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/male_commie
 	name = "Boxers - Striped Communist"
 	icon_state = "boxers_commie"
+	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/male_usastripe
 	name = "Boxers - Striped Freedom"
 	icon_state = "boxers_assblastusa"
+	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/male_uk
 	name = "Boxers - Striped UK"
 	icon_state = "boxers_uk"
+	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/boxer_briefs
 	name = "Boxer Briefs"
@@ -59,60 +69,73 @@
 	name = "Panties"
 	icon_state = "panties"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/panties_alt
 	name = "Panties - Alt"
 	icon_state = "panties_alt"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/fishnet_lower
 	name = "Panties - Fishnet"
 	icon_state = "fishnet_lower"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/female_beekini
 	name = "Panties - Bee-kini"
 	icon_state = "panties_bee-kini"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/female_commie
 	name = "Panties - Commie"
 	icon_state = "panties_commie"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/female_usastripe
 	name = "Panties - Freedom"
 	icon_state = "panties_assblastusa"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/female_kinky
 	name = "Panties - Kinky Black"
 	icon_state = "panties_kinky"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/panties_uk
 	name = "Panties - UK"
 	icon_state = "panties_uk"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/panties_neko
 	name = "Panties - Neko"
 	icon_state = "panties_neko"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/panties_slim
 	name = "Panties - Slim"
 	icon_state = "panties_slim"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/striped_panties
 	name = "Panties - Striped"
 	icon_state = "striped_panties"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/panties_swimsuit
 	name = "Panties - Swimsuit"
 	icon_state = "panties_swimming"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/panties_thin
 	name = "Panties - Thin"
 	icon_state = "panties_thin"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/longjon
 	name = "Long John Bottoms"
@@ -122,23 +145,28 @@
 /datum/sprite_accessory/underwear/bottom/swimsuit_red
 	name = "Swimsuit, One Piece - Red"
 	icon_state = "swimming_red"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/swimsuit
 	name = "Swimsuit, One Piece - Black"
 	icon_state = "swimming_black"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/swimsuit_blue
 	name = "Swimsuit, One Piece - Striped Blue"
 	icon_state = "swimming_blue"
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/thong
 	name = "Thong"
 	icon_state = "thong"
 	has_color = TRUE
+	gender = FEMALE
 
 /datum/sprite_accessory/underwear/bottom/thong_babydoll
 	name = "Thong - Alt"
 	icon_state = "thong_babydoll"
 	has_color = TRUE
+	gender = FEMALE
 
 

code/modules/mob/dead/observer/say.dm

@@ -4,14 +4,14 @@
 		return
 
 	var/message_mode = get_message_mode(message)
-	if(client && (message_mode == "admin" || message_mode == "deadmin"))
+	if(client && (message_mode == MODE_ADMIN || message_mode == MODE_DEADMIN))
 		message = copytext(message, 3)
 		if(findtext(message, " ", 1, 2))
 			message = copytext(message, 2)
 
-		if(message_mode == "admin")
+		if(message_mode == MODE_ADMIN)
 			client.cmd_admin_say(message)
-		else if(message_mode == "deadmin")
+		else if(message_mode == MODE_DEADMIN)
 			client.dsay(message)
 		return
 

code/modules/mob/living/carbon/alien/humanoid/update_icons.dm

@@ -59,15 +59,19 @@
 
 /mob/living/carbon/alien/humanoid/update_inv_handcuffed()
 	remove_overlay(HANDCUFF_LAYER)
-	var/cuff_icon = "aliencuff"
-	var/dmi_file = 'icons/mob/alien.dmi'
-
-	if(mob_size == MOB_SIZE_LARGE)
-		cuff_icon = "aliencuff_[caste]"
-		dmi_file = 'icons/mob/alienqueen.dmi'
 
 	if(handcuffed)
-		overlays_standing[HANDCUFF_LAYER] = mutable_appearance(dmi_file, cuff_icon, -HANDCUFF_LAYER)
+		var/cuff_icon = handcuffed.item_state
+		var/dmi_file = 'icons/mob/alien.dmi'
+
+		if(mob_size == MOB_SIZE_LARGE)
+			cuff_icon += "_[caste]"
+			dmi_file = 'icons/mob/alienqueen.dmi'
+
+		var/mutable_appearance/cuffs = mutable_appearance(dmi_file, cuff_icon, -HANDCUFF_LAYER)
+		cuffs.color = handcuffed.color
+
+		overlays_standing[HANDCUFF_LAYER] = cuffs
 		apply_overlay(HANDCUFF_LAYER)
 
 //Royals have bigger sprites, so inhand things must be handled differently.

code/modules/mob/living/carbon/alien/special/alien_embryo.dm

@@ -63,7 +63,7 @@
 
 
 
-/obj/item/organ/body_egg/alien_embryo/proc/AttemptGrow(gib_on_success=TRUE)
+/obj/item/organ/body_egg/alien_embryo/proc/AttemptGrow(var/kill_on_sucess=TRUE)
 	if(!owner || bursting)
 		return
 
@@ -102,10 +102,12 @@
 		new_xeno.notransform = 0
 		new_xeno.invisibility = 0
 
-	if(gib_on_success)
-		new_xeno.visible_message("<span class='danger'>[new_xeno] bursts out of [owner] in a shower of gore!</span>", "<span class='userdanger'>You exit [owner], your previous host.</span>", "<span class='italics'>You hear organic matter ripping and tearing!</span>")
-		owner.gib(TRUE)
-	else
+	if(kill_on_sucess) //ITS TOO LATE
+		new_xeno.visible_message("<span class='danger'>[new_xeno] bursts out of [owner]!</span>", "<span class='userdanger'>You exit [owner], your previous host.</span>", "<span class='italics'>You hear organic matter ripping and tearing!</span>")
+		owner.apply_damage(rand(100,300),BRUTE,zone,FALSE) //Random high damage to torso so health sensors don't metagame.
+		owner.spill_organs(TRUE,FALSE,TRUE) //Lets still make the death gruesome and impossible to just simply defib someone.
+		owner.death(FALSE) //Just in case some freak occurance occurs where you somehow survive all your organs being removed from you and the 100-300 brute damage.
+	else //When it is removed via surgery at a late stage, rather than forced.
 		new_xeno.visible_message("<span class='danger'>[new_xeno] wriggles out of [owner]!</span>", "<span class='userdanger'>You exit [owner], your previous host.</span>")
 		owner.adjustBruteLoss(40)
 		owner.cut_overlay(overlay)

code/modules/mob/living/carbon/carbon.dm

@@ -699,9 +699,10 @@
 		clear_fullscreen("critvision")
 
 	//Oxygen damage overlay
-	if(oxyloss)
+	var/windedup = getOxyLoss() + getStaminaLoss() * 0.2 + stamdamageoverlaytemp
+	if(windedup)
 		var/severity = 0
-		switch(oxyloss)
+		switch(windedup)
 			if(10 to 20)
 				severity = 1
 			if(20 to 25)

code/modules/mob/living/carbon/carbon_defines.dm

@@ -11,8 +11,8 @@
 	var/silent = FALSE 		//Can't talk. Value goes down every life proc. //NOTE TO FUTURE CODERS: DO NOT INITIALIZE NUMERICAL VARS AS NULL OR I WILL MURDER YOU.
 	var/dreaming = 0 //How many dream images we have left to send
 
-	var/obj/item/handcuffed = null //Whether or not the mob is handcuffed
-	var/obj/item/legcuffed = null  //Same as handcuffs but for legs. Bear traps use this.
+	var/obj/item/restraints/handcuffed //Whether or not the mob is handcuffed
+	var/obj/item/restraints/legcuffed //Same as handcuffs but for legs. Bear traps use this.
 
 	var/disgust = 0
 
@@ -61,5 +61,6 @@
 	var/next_hallucination = 0
 	var/cpr_time = 1 //CPR cooldown.
 	var/damageoverlaytemp = 0
+	var/stamdamageoverlaytemp = 0
 
 	var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects

code/modules/mob/living/carbon/human/human.dm

@@ -623,6 +623,7 @@
 		facial_hair_style = "Shaved"
 	hair_style = pick("Bedhead", "Bedhead 2", "Bedhead 3")
 	underwear = "Nude"
+	undershirt = "Nude"
 	update_body()
 	update_hair()
 	update_genitals()
@@ -899,12 +900,9 @@
 		stop_pulling()
 
 /mob/living/carbon/human/proc/is_shove_knockdown_blocked() //If you want to add more things that block shove knockdown, extend this
-	var/list/body_parts = list(head, wear_mask, wear_suit, w_uniform, back, gloves, shoes, belt, s_store, glasses, ears, wear_id) //Everything but pockets. Pockets are l_store and r_store. (if pockets were allowed, putting something armored, gloves or hats for example, would double up on the armor)
-	for(var/bp in body_parts)
-		if(istype(bp, /obj/item/clothing))
-			var/obj/item/clothing/C = bp
-			if(C.blocks_shove_knockdown)
-				return TRUE
+	for(var/obj/item/clothing/C in get_equipped_items()) //doesn't include pockets
+		if(C.blocks_shove_knockdown)
+			return TRUE
 	return FALSE
 
 /mob/living/carbon/human/proc/clear_shove_slowdown()

code/modules/mob/living/carbon/human/human_defines.dm

@@ -31,6 +31,7 @@
 	var/socks = "Nude" //Which socks the player wants
 	var/socks_color = "#FFFFFF"
 	var/backbag = DBACKPACK		//Which backpack type the player has chosen.
+	var/jumpsuit_style = PREF_SUIT		//suit/skirt
 
 	//Equipment slots
 	var/obj/item/wear_suit = null

code/modules/mob/living/carbon/human/say.dm

@@ -53,14 +53,14 @@
 	if(ears)
 		var/obj/item/radio/headset/dongle = ears
 		if(!istype(dongle))
-			return 0
+			return FALSE
 		if(dongle.translate_binary)
-			return 1
+			return TRUE
 
 /mob/living/carbon/human/radio(message, message_mode, list/spans, language)
 	. = ..()
-	if(. != 0)
-		return .
+	if(.)
+		return
 
 	switch(message_mode)
 		if(MODE_HEADSET)

code/modules/mob/living/carbon/human/species.dm

@@ -1781,6 +1781,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		if(CLONE)
 			H.adjustCloneLoss(damage * hit_percent * H.physiology.clone_mod)
 		if(STAMINA)
+			H.stamdamageoverlaytemp = 20
 			if(BP)
 				if(damage > 0 ? BP.receive_damage(0, 0, damage * hit_percent * H.physiology.stamina_mod) : BP.heal_damage(0, 0, abs(damage * hit_percent * H.physiology.stamina_mod), only_robotic = FALSE, only_organic = FALSE))
 					H.update_stamina()

code/modules/mob/living/carbon/human/species_types/golems.dm

@@ -420,7 +420,7 @@
 	H.visible_message("<span class='warning'>[H] teleports!</span>", "<span class='danger'>You destabilize and teleport!</span>")
 	new /obj/effect/particle_effect/sparks(get_turf(H))
 	playsound(get_turf(H), "sparks", 50, 1)
-	do_teleport(H, get_turf(H), 6, asoundin = 'sound/weapons/emitter2.ogg')
+	do_teleport(H, get_turf(H), 6, asoundin = 'sound/weapons/emitter2.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
 	last_teleport = world.time
 
 /datum/species/golem/bluespace/spec_hitby(atom/movable/AM, mob/living/carbon/human/H)
@@ -486,7 +486,7 @@
 	spark_system.set_up(10, 0, src)
 	spark_system.attach(H)
 	spark_system.start()
-	do_teleport(H, get_turf(H), 12, asoundin = 'sound/weapons/emitter2.ogg')
+	do_teleport(H, get_turf(H), 12, asoundin = 'sound/weapons/emitter2.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
 	last_teleport = world.time
 	UpdateButtonIcon() //action icon looks unavailable
 	sleep(cooldown + 5)

code/modules/mob/living/carbon/human/species_types/jellypeople.dm

@@ -14,7 +14,8 @@
 	damage_overlay_type = ""
 	var/datum/action/innate/regenerate_limbs/regenerate_limbs
 	var/datum/action/innate/slime_change/slime_change	//CIT CHANGE
-	liked_food = MEAT
+	liked_food = TOXIC | MEAT
+	toxic_food = null
 	coldmod = 6   // = 3x cold damage
 	heatmod = 0.5 // = 1/4x heat damage
 	burnmod = 0.5 // = 1/2x generic burn damage

code/modules/mob/living/carbon/human/update_icons.dm

@@ -288,8 +288,10 @@ There are several things that need to be remembered:
 				S.alternate_worn_icon = 'modular_citadel/icons/mob/digishoes.dmi'
 			else
 				S.alternate_worn_icon = null
-
-		overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(state = shoes.icon_state, default_layer = SHOES_LAYER, default_icon_file = ((shoes.alternate_worn_icon) ? shoes.alternate_worn_icon : 'icons/mob/feet.dmi'))
+		var/t_state = shoes.item_state
+		if (!t_state)
+			t_state = shoes.icon_state
+		overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(state = t_state, default_layer = SHOES_LAYER, default_icon_file = ((shoes.alternate_worn_icon) ? shoes.alternate_worn_icon : 'icons/mob/feet.dmi'))
 		var/mutable_appearance/shoes_overlay = overlays_standing[SHOES_LAYER]
 		if(OFFSET_SHOES in dna.species.offset_features)
 			shoes_overlay.pixel_x += dna.species.offset_features[OFFSET_SHOES][1]
@@ -471,14 +473,6 @@ There are several things that need to be remembered:
 			overlays_standing[BACK_LAYER] = back_overlay
 		apply_overlay(BACK_LAYER)
 
-/mob/living/carbon/human/update_inv_legcuffed()
-	remove_overlay(LEGCUFF_LAYER)
-	clear_alert("legcuffed")
-	if(legcuffed)
-		overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/mob.dmi', "legcuff1", -LEGCUFF_LAYER)
-		apply_overlay(LEGCUFF_LAYER)
-		throw_alert("legcuffed", /obj/screen/alert/restrained/legcuffed, new_master = src.legcuffed)
-
 /proc/wear_female_version(t_color, icon, layer, type)
 	var/index = t_color
 	var/icon/female_clothing_icon = GLOB.female_clothing_icons[index]

code/modules/mob/living/carbon/life.dm

@@ -4,8 +4,9 @@
 	if(notransform)
 		return
 
-	if(damageoverlaytemp)
+	if(damageoverlaytemp || stamdamageoverlaytemp)
 		damageoverlaytemp = 0
+		stamdamageoverlaytemp = 0
 		update_damage_hud()
 
 	if(stat != DEAD) //Reagent processing needs to come before breathing, to prevent edge cases.

code/modules/mob/living/carbon/monkey/update_icons.dm

@@ -43,12 +43,15 @@
 
 /mob/living/carbon/monkey/update_inv_legcuffed()
 	remove_overlay(LEGCUFF_LAYER)
+	clear_alert("legcuffed")
 	if(legcuffed)
-		var/mutable_appearance/legcuff_overlay = mutable_appearance('icons/mob/mob.dmi', "legcuff1", -LEGCUFF_LAYER)
-		legcuff_overlay.pixel_y = 8
-		overlays_standing[LEGCUFF_LAYER] = legcuff_overlay
-	apply_overlay(LEGCUFF_LAYER)
+		var/mutable_appearance/legcuffs = mutable_appearance('icons/mob/restraints.dmi', legcuffed.item_state, -LEGCUFF_LAYER)
+		legcuffs.color = handcuffed.color
+		legcuffs.pixel_y = 8
 
+		overlays_standing[HANDCUFF_LAYER] = legcuffs
+		apply_overlay(LEGCUFF_LAYER)
+		throw_alert("legcuffed", /obj/screen/alert/restrained/legcuffed, new_master = legcuffed)
 
 //monkey HUD updates for items in our inventory
 

code/modules/mob/living/carbon/update_icons.dm

@@ -176,9 +176,22 @@
 /mob/living/carbon/update_inv_handcuffed()
 	remove_overlay(HANDCUFF_LAYER)
 	if(handcuffed)
-		overlays_standing[HANDCUFF_LAYER] = mutable_appearance('icons/mob/mob.dmi', "handcuff1", -HANDCUFF_LAYER)
+		var/mutable_appearance/cuffs = mutable_appearance('icons/mob/restraints.dmi', handcuffed.item_state, -HANDCUFF_LAYER)
+		cuffs.color = handcuffed.color
+
+		overlays_standing[HANDCUFF_LAYER] = cuffs
 		apply_overlay(HANDCUFF_LAYER)
 
+/mob/living/carbon/update_inv_legcuffed()
+	remove_overlay(LEGCUFF_LAYER)
+	clear_alert("legcuffed")
+	if(legcuffed)
+		var/mutable_appearance/legcuffs = mutable_appearance('icons/mob/restraints.dmi', legcuffed.item_state, -LEGCUFF_LAYER)
+		legcuffs.color = handcuffed.color
+
+		overlays_standing[HANDCUFF_LAYER] = legcuffs
+		apply_overlay(LEGCUFF_LAYER)
+		throw_alert("legcuffed", /obj/screen/alert/restrained/legcuffed, new_master = legcuffed)
 
 //mob HUD updates for items in our inventory
 

code/modules/mob/living/say.dm

@@ -2,61 +2,61 @@ GLOBAL_LIST_INIT(department_radio_prefixes, list(":", "."))
 
 GLOBAL_LIST_INIT(department_radio_keys, list(
 	// Location
-	"r" = "right hand",
-	"l" = "left hand",
-	"i" = "intercom",
+	MODE_KEY_R_HAND = MODE_R_HAND,
+	MODE_KEY_L_HAND = MODE_L_HAND,
+	MODE_KEY_INTERCOM = MODE_INTERCOM,
 
 	// Department
-	"h" = "department",
-	"c" = "Command",
-	"n" = "Science",
-	"m" = "Medical",
-	"e" = "Engineering",
-	"s" = "Security",
-	"u" = "Supply",
-	"v" = "Service",
+	MODE_KEY_DEPARTMENT = MODE_DEPARTMENT,
+	RADIO_KEY_COMMAND = RADIO_CHANNEL_COMMAND,
+	RADIO_KEY_SCIENCE = RADIO_CHANNEL_SCIENCE,
+	RADIO_KEY_MEDICAL = RADIO_CHANNEL_MEDICAL,
+	RADIO_KEY_ENGINEERING = RADIO_CHANNEL_ENGINEERING,
+	RADIO_KEY_SECURITY = RADIO_CHANNEL_SECURITY,
+	RADIO_KEY_SUPPLY = RADIO_CHANNEL_SUPPLY,
+	RADIO_KEY_SERVICE = RADIO_CHANNEL_SERVICE,
 
 	// Faction
-	"t" = "Syndicate",
-	"y" = "CentCom",
+	RADIO_KEY_SYNDICATE = RADIO_CHANNEL_SYNDICATE,
+	RADIO_KEY_CENTCOM = RADIO_CHANNEL_CENTCOM,
 
 	// Admin
-	"p" = "admin",
-	"d" = "deadmin",
+	MODE_KEY_ADMIN = MODE_ADMIN,
+	MODE_KEY_DEADMIN = MODE_DEADMIN,
 
 	// Misc
-	"o" = "AI Private", // AI Upload channel
-	"x" = "cords",		// vocal cords, used by Voice of God
+	RADIO_KEY_AI_PRIVATE = RADIO_CHANNEL_AI_PRIVATE, // AI Upload channel
+	MODE_KEY_VOCALCORDS = MODE_VOCALCORDS,		// vocal cords, used by Voice of God
 
 
 	//kinda localization -- rastaf0
 	//same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding.
 	// Location
-	"ê" = "right hand",
-	"ä" = "left hand",
-	"ø" = "intercom",
+	"ê" = MODE_R_HAND,
+	"ä" = MODE_L_HAND,
+	"ø" = MODE_INTERCOM,
 
 	// Department
-	"ð" = "department",
-	"ñ" = "Command",
-	"ò" = "Science",
-	"ü" = "Medical",
-	"ó" = "Engineering",
-	"û" = "Security",
-	"ã" = "Supply",
-	"ì" = "Service",
+	"ð" = MODE_DEPARTMENT,
+	"ñ" = RADIO_CHANNEL_COMMAND,
+	"ò" = RADIO_CHANNEL_SCIENCE,
+	"ü" = RADIO_CHANNEL_MEDICAL,
+	"ó" = RADIO_CHANNEL_ENGINEERING,
+	"û" = RADIO_CHANNEL_SECURITY,
+	"ã" = RADIO_CHANNEL_SUPPLY,
+	"ì" = RADIO_CHANNEL_SERVICE,
 
 	// Faction
-	"å" = "Syndicate",
-	"í" = "CentCom",
+	"å" = RADIO_CHANNEL_SYNDICATE,
+	"í" = RADIO_CHANNEL_CENTCOM,
 
 	// Admin
-	"ç" = "admin",
-	"â" = "deadmin",
+	"ç" = MODE_ADMIN,
+	"â" = MODE_ADMIN,
 
 	// Misc
-	"ù" = "AI Private",
-	"÷" = "cords"
+	"ù" = RADIO_CHANNEL_AI_PRIVATE,
+	"÷" = MODE_VOCALCORDS
 ))
 
 /mob/living/proc/Ellipsis(original_msg, chance = 50, keep_words)
@@ -105,12 +105,12 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	if(findtext(message, " ", 1, 2))
 		message = copytext(message, 2)
 
-	if(message_mode == "admin")
+	if(message_mode == MODE_ADMIN)
 		if(client)
 			client.cmd_admin_say(message)
 		return
 
-	if(message_mode == "deadmin")
+	if(message_mode == MODE_DEADMIN)
 		if(client)
 			client.dsay(message)
 		return

code/modules/mob/living/simple_animal/bot/bot.dm

@@ -61,7 +61,7 @@
 	var/mob/living/silicon/ai/calling_ai //Links a bot to the AI calling it.
 	var/obj/item/radio/Radio //The bot's radio, for speaking to people.
 	var/radio_key = null //which channels can the bot listen to
-	var/radio_channel = "Common" //The bot's default radio channel
+	var/radio_channel = RADIO_CHANNEL_COMMON //The bot's default radio channel
 	var/auto_patrol = 0// set to make bot automatically patrol
 	var/turf/patrol_target	// this is turf to navigate to (location of beacon)
 	var/turf/summon_target	// The turf of a user summoning a bot.

code/modules/mob/living/simple_animal/bot/cleanbot.dm

@@ -9,7 +9,7 @@
 	health = 25
 	maxHealth = 25
 	radio_key = /obj/item/encryptionkey/headset_service
-	radio_channel = "Service" //Service
+	radio_channel = RADIO_CHANNEL_SERVICE //Service
 	bot_type = CLEAN_BOT
 	model = "Cleanbot"
 	bot_core_type = /obj/machinery/bot_core/cleanbot
@@ -155,7 +155,7 @@
 			else
 				shuffle = TRUE	//Shuffle the list the next time we scan so we dont both go the same way.
 			path = list()
-		
+
 		if(!path || path.len == 0) //No path, need a new one
 			//Try to produce a path to the target, and ignore airlocks to which it has access.
 			path = get_path_to(src, target.loc, /turf/proc/Distance_cardinal, 0, 30, id=access_card)

code/modules/mob/living/simple_animal/bot/ed209bot.dm

@@ -13,7 +13,7 @@
 	mob_size = MOB_SIZE_LARGE
 
 	radio_key = /obj/item/encryptionkey/headset_sec
-	radio_channel = "Security"
+	radio_channel = RADIO_CHANNEL_SECURITY
 	bot_type = SEC_BOT
 	model = "ED-209"
 	bot_core = /obj/machinery/bot_core/secbot

code/modules/mob/living/simple_animal/bot/firebot.dm

@@ -16,7 +16,7 @@
 	spacewalk = TRUE
 
 	radio_key = /obj/item/encryptionkey/headset_eng
-	radio_channel = "Engineering"
+	radio_channel = RADIO_CHANNEL_ENGINEERING
 	bot_type = FIRE_BOT
 	model = "Firebot"
 	bot_core = /obj/machinery/bot_core/firebot

code/modules/mob/living/simple_animal/bot/floorbot.dm

@@ -11,7 +11,7 @@
 	spacewalk = TRUE
 
 	radio_key = /obj/item/encryptionkey/headset_eng
-	radio_channel = "Engineering"
+	radio_channel = RADIO_CHANNEL_ENGINEERING
 	bot_type = FLOOR_BOT
 	model = "Floorbot"
 	bot_core = /obj/machinery/bot_core/floorbot

code/modules/mob/living/simple_animal/bot/honkbot.dm

@@ -11,7 +11,6 @@
 	pass_flags = PASSMOB
 
 	radio_key = /obj/item/encryptionkey/headset_service //doesn't have security key
-	radio_channel = "Service" //Doesn't even use the radio anyway.
 	bot_type = HONK_BOT
 	model = "Honkbot"
 	bot_core_type = /obj/machinery/bot_core/honkbot

code/modules/mob/living/simple_animal/bot/medbot.dm

@@ -17,7 +17,7 @@
 	status_flags = (CANPUSH | CANSTUN)
 
 	radio_key = /obj/item/encryptionkey/headset_med
-	radio_channel = "Medical"
+	radio_channel = RADIO_CHANNEL_MEDICAL
 
 	bot_type = MED_BOT
 	model = "Medibot"

code/modules/mob/living/simple_animal/bot/mulebot.dm

@@ -23,7 +23,7 @@
 	mob_size = MOB_SIZE_LARGE
 
 	radio_key = /obj/item/encryptionkey/headset_cargo
-	radio_channel = "Supply"
+	radio_channel = RADIO_CHANNEL_SUPPLY
 
 	bot_type = MULE_BOT
 	model = "MULE"

code/modules/mob/living/simple_animal/bot/secbot.dm

@@ -11,7 +11,7 @@
 	pass_flags = PASSMOB
 
 	radio_key = /obj/item/encryptionkey/secbot //AI Priv + Security
-	radio_channel = "Security" //Security channel
+	radio_channel = RADIO_CHANNEL_SECURITY //Security channel
 	bot_type = SEC_BOT
 	model = "Securitron"
 	bot_core_type = /obj/machinery/bot_core/secbot
@@ -61,7 +61,7 @@
 /mob/living/simple_animal/bot/secbot/pingsky
 	name = "Officer Pingsky"
 	desc = "It's Officer Pingsky! Delegated to satellite guard duty for harbouring anti-human sentiment."
-	radio_channel = "AI Private"
+	radio_channel = RADIO_CHANNEL_AI_PRIVATE
 
 /mob/living/simple_animal/bot/secbot/Initialize()
 	. = ..()

code/modules/mob/living/simple_animal/guardian/types/explosive.dm

@@ -22,7 +22,7 @@
 		var/mob/living/M = target
 		if(!M.anchored && M != summoner && !hasmatchingsummoner(M))
 			new /obj/effect/temp_visual/guardian/phase/out(get_turf(M))
-			do_teleport(M, M, 10)
+			do_teleport(M, M, 10, channel = TELEPORT_CHANNEL_BLUESPACE)
 			for(var/mob/living/L in range(1, M))
 				if(hasmatchingsummoner(L)) //if the summoner matches don't hurt them
 					continue

code/modules/mob/living/simple_animal/guardian/types/support.dm

@@ -142,5 +142,5 @@
 		L.flash_act()
 	A.visible_message("<span class='danger'>[A] disappears in a flash of light!</span>", \
 	"<span class='userdanger'>Your vision is obscured by a flash of light!</span>")
-	do_teleport(A, beacon, 0)
+	do_teleport(A, beacon, 0, channel = TELEPORT_CHANNEL_BLUESPACE)
 	new /obj/effect/temp_visual/guardian/phase(get_turf(A))

code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm

@@ -747,6 +747,12 @@ Difficulty: Very Hard
 /obj/structure/closet/stasis/ex_act()
 	return
 
+/obj/structure/closet/stasis/handle_lock_addition()
+	return
+
+/obj/structure/closet/stasis/handle_lock_removal()
+	return
+
 /obj/effect/proc_holder/spell/targeted/exit_possession
 	name = "Exit Possession"
 	desc = "Exits the body you are possessing."

code/modules/mob/living/simple_animal/parrot.dm

@@ -241,23 +241,23 @@
 					clearlist(available_channels)
 					for(var/ch in headset_to_add.channels)
 						switch(ch)
-							if("Engineering")
-								available_channels.Add(":e")
-							if("Command")
-								available_channels.Add(":c")
-							if("Security")
-								available_channels.Add(":s")
-							if("Science")
-								available_channels.Add(":n")
-							if("Medical")
-								available_channels.Add(":m")
-							if("Supply")
-								available_channels.Add(":u")
-							if("Service")
-								available_channels.Add(":v")
+							if(RADIO_CHANNEL_ENGINEERING)
+								available_channels.Add(RADIO_TOKEN_ENGINEERING)
+							if(RADIO_CHANNEL_COMMAND)
+								available_channels.Add(RADIO_TOKEN_COMMAND)
+							if(RADIO_CHANNEL_SECURITY)
+								available_channels.Add(RADIO_TOKEN_SECURITY)
+							if(RADIO_CHANNEL_SCIENCE)
+								available_channels.Add(RADIO_TOKEN_SCIENCE)
+							if(RADIO_CHANNEL_MEDICAL)
+								available_channels.Add(RADIO_TOKEN_MEDICAL)
+							if(RADIO_CHANNEL_SUPPLY)
+								available_channels.Add(RADIO_TOKEN_SUPPLY)
+							if(RADIO_CHANNEL_SERVICE)
+								available_channels.Add(RADIO_TOKEN_SERVICE)
 
 					if(headset_to_add.translate_binary)
-						available_channels.Add(":b")
+						available_channels.Add(MODE_TOKEN_BINARY)
 	else
 		return ..()
 

code/modules/mob/living/simple_animal/simple_animal_vr.dm

@@ -105,6 +105,9 @@
 	var/mob/living/carbon/human/user = usr
 	if(!istype(user) || user.stat) return
 
+	if(!vore_active)
+		return
+
 	if(vore_selected.digest_mode == DM_HOLD)
 		var/confirm = alert(usr, "Enabling digestion on [name] will cause it to digest all stomach contents. Using this to break OOC prefs is against the rules. Digestion will disable itself after 20 minutes.", "Enabling [name]'s Digestion", "Enable", "Cancel")
 		if(confirm == "Enable")

code/modules/mob/mob.dm

@@ -116,7 +116,7 @@
 // vision_distance (optional) define how many tiles away the message can be seen.
 // ignored_mob (optional) doesn't show any message to a given mob if TRUE.
 
-/atom/proc/visible_message(message, self_message, blind_message, vision_distance, ignored_mob)
+/atom/proc/visible_message(message, self_message, blind_message, vision_distance, ignored_mob, no_ghosts = FALSE)
 	var/turf/T = get_turf(src)
 	if(!T)
 		return
@@ -129,6 +129,8 @@
 		if(M == ignored_mob)
 			continue
 		var/msg = message
+		if(isobserver(M) && no_ghosts)
+			continue
 		if(M == src) //the src always see the main message or self message
 			if(self_message)
 				msg = self_message
@@ -155,7 +157,7 @@
 // deaf_message (optional) is what deaf people will see.
 // hearing_distance (optional) is the range, how many tiles away the message can be heard.
 
-/mob/audible_message(message, deaf_message, hearing_distance, self_message)
+/mob/audible_message(message, deaf_message, hearing_distance, self_message, no_ghosts = FALSE)
 	var/range = 7
 	if(hearing_distance)
 		range = hearing_distance
@@ -163,6 +165,8 @@
 		var/msg = message
 		if(self_message && M==src)
 			msg = self_message
+		if(no_ghosts && isobserver(M))
+			continue
 		M.show_message( msg, 2, deaf_message, 1)
 
 // Show a message to all mobs in earshot of this atom
@@ -171,11 +175,13 @@
 // deaf_message (optional) is what deaf people will see.
 // hearing_distance (optional) is the range, how many tiles away the message can be heard.
 
-/atom/proc/audible_message(message, deaf_message, hearing_distance)
+/atom/proc/audible_message(message, deaf_message, hearing_distance, no_ghosts = FALSE)
 	var/range = 7
 	if(hearing_distance)
 		range = hearing_distance
 	for(var/mob/M in get_hearers_in_view(range, src))
+		if(no_ghosts && isobserver(M))
+			continue
 		M.show_message( message, 2, deaf_message, 1)
 
 /mob/proc/Life()

code/modules/mob/say_vr.dm

@@ -172,15 +172,11 @@ proc/get_top_level_mob(var/mob/S)
 	user.log_message(message, INDIVIDUAL_EMOTE_LOG)
 	message = "<b>[user]</b> " + "<i>[message]</i>"
 
-	for(var/mob/M)
-		if(M in list(/mob/living))
-			M.show_message(message)
-
 	if(emote_type == EMOTE_AUDIBLE)
-		user.audible_message(message=message,hearing_distance=1)
+		user.audible_message(message=message,hearing_distance=1, no_ghosts = TRUE)
 	else
-		user.visible_message(message=message,self_message=message,vision_distance=1)
-	log_emote("[key_name(user)] : [message]")
+		user.visible_message(message=message,self_message=message,vision_distance=1, no_ghosts = TRUE)
+	log_emote("[key_name(user)] : (SUBTLER) [message]")
 
 	message = null