Merge branch 'master' into trek_tmp

# Conflicts Resolved:
#	icons/mob/clothing/uniform.dmi
#	icons/mob/clothing/uniform_digi.dmi
#	icons/obj/clothing/uniforms.dmi

modular_citadel/code/modules/arousal/genitals.dm

@@ -319,7 +319,7 @@
 				genital_overlay = center_image(genital_overlay, dim_x, dim_y)
 
 			if(dna.species.use_skintones && dna.features["genitals_use_skintone"])
-				genital_overlay.color = "#[skintone2hex(skin_tone)]"
+				genital_overlay.color = SKINTONE2HEX(skin_tone)
 			else
 				switch(S.color_src)
 					if("cock_color")
@@ -331,7 +331,7 @@
 					if("vag_color")
 						genital_overlay.color = "#[dna.features["vag_color"]]"
 
-			genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size][dna.species.use_skintones ? "_s" : ""]_[aroused_state]_[layertext]"
+			genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size][(dna.species.use_skintones && !dna.skin_tone_override) ? "_s" : ""]_[aroused_state]_[layertext]"
 
 			if(layers_num[layer] == GENITALS_FRONT_LAYER && G.genital_flags & GENITAL_THROUGH_CLOTHES)
 				genital_overlay.layer = -GENITALS_EXPOSED_LAYER
@@ -361,9 +361,8 @@
 	var/willyCheck = getorganslot(ORGAN_SLOT_PENIS)
 
 	if(organCheck == FALSE)
-		if(ishuman(src) && dna.species.id == "human")
+		if(ishuman(src) && dna.species.use_skintones)
 			dna.features["genitals_use_skintone"] = TRUE
-			dna.species.use_skintones = TRUE
 		if(src.dna.species.fixed_mut_color)
 			dna.features["cock_color"] = "[dna.species.fixed_mut_color]"
 			dna.features["breasts_color"] = "[dna.species.fixed_mut_color]"

modular_citadel/code/modules/arousal/organs/breasts.dm

@@ -55,13 +55,14 @@
 	var/datum/sprite_accessory/S = GLOB.breasts_shapes_list[shape]
 	var/icon_shape = S ? S.icon_state : "pair"
 	var/icon_size = CLAMP(breast_values[size], BREASTS_ICON_MIN_SIZE, BREASTS_ICON_MAX_SIZE)
-	icon_state = "breasts_[icon_shape]_[breast_values[icon_size]]"
+	icon_state = "breasts_[icon_shape]_[icon_size]"
 	if(owner)
 		if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"])
 			if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow...
 				var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need.
-				color = "#[skintone2hex(H.skin_tone)]"
-				icon_state += "_s"
+				color = SKINTONE2HEX(H.skin_tone)
+				if(!H.dna.skin_tone_override)
+					icon_state += "_s"
 		else
 			color = "#[owner.dna.features["breasts_color"]]"
 
@@ -117,7 +118,7 @@
 /obj/item/organ/genital/breasts/get_features(mob/living/carbon/human/H)
 	var/datum/dna/D = H.dna
 	if(D.species.use_skintones && D.features["genitals_use_skintone"])
-		color = "#[skintone2hex(H.skin_tone)]"
+		color = SKINTONE2HEX(H.skin_tone)
 	else
 		color = "#[D.features["breasts_color"]]"
 	size = D.features["breasts_size"]

modular_citadel/code/modules/arousal/organs/penis.dm

@@ -84,8 +84,9 @@
 		if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"])
 			if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow...
 				var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need.
-				color = "#[skintone2hex(H.skin_tone)]"
-				icon_state += "_s"
+				color = SKINTONE2HEX(H.skin_tone)
+				if(!H.dna.skin_tone_override)
+					icon_state += "_s"
 		else
 			color = "#[owner.dna.features["cock_color"]]"
 		if(genital_flags & GENITAL_CAN_TAUR && S?.taur_icon && (!S.feat_taur || owner.dna.features[S.feat_taur]) && owner.dna.species.mutant_bodyparts["taur"])
@@ -98,7 +99,7 @@
 /obj/item/organ/genital/penis/get_features(mob/living/carbon/human/H)
 	var/datum/dna/D = H.dna
 	if(D.species.use_skintones && D.features["genitals_use_skintone"])
-		color = "#[skintone2hex(H.skin_tone)]"
+		color = SKINTONE2HEX(H.skin_tone)
 	else
 		color = "#[D.features["cock_color"]]"
 	length = D.features["cock_length"]

modular_citadel/code/modules/arousal/organs/testicles.dm

@@ -49,15 +49,16 @@
 		if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"])
 			if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow...
 				var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need.
-				color = "#[skintone2hex(H.skin_tone)]"
-				icon_state += "_s"
+				color = SKINTONE2HEX(H.skin_tone)
+				if(!H.dna.skin_tone_override)
+					icon_state += "_s"
 		else
 			color = "#[owner.dna.features["balls_color"]]"
 
 /obj/item/organ/genital/testicles/get_features(mob/living/carbon/human/H)
 	var/datum/dna/D = H.dna
 	if(D.species.use_skintones && D.features["genitals_use_skintone"])
-		color = "#[skintone2hex(H.skin_tone)]"
+		color = SKINTONE2HEX(H.skin_tone)
 	else
 		color = "#[D.features["balls_color"]]"
 	shape = D.features["balls_shape"]

modular_citadel/code/modules/arousal/organs/vagina.dm

@@ -55,8 +55,9 @@
 		if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"])
 			if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow...
 				var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need.
-				color = "#[skintone2hex(H.skin_tone)]"
-				icon_state += "_s"
+				color = SKINTONE2HEX(H.skin_tone)
+				if(!H.dna.skin_tone_override)
+					icon_state += "_s"
 		else
 			color = "#[owner.dna.features["vag_color"]]"
 		if(ishuman(owner))
@@ -66,7 +67,7 @@
 /obj/item/organ/genital/vagina/get_features(mob/living/carbon/human/H)
 	var/datum/dna/D = H.dna
 	if(D.species.use_skintones && D.features["genitals_use_skintone"])
-		color = "#[skintone2hex(H.skin_tone)]"
+		color = SKINTONE2HEX(H.skin_tone)
 	else
 		color = "[D.features["vag_color"]]"
 	shape = "[D.features["vag_shape"]]"

modular_citadel/code/modules/clothing/trek.dm

@@ -18,7 +18,7 @@
 	mob_overlay_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
 	item_state = "trek_ds9_coat"
 	body_parts_covered = CHEST|GROIN|ARMS
-	mutantrace_variation = NONE
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
 	permeability_coefficient = 0.50
 	allowed = list(
 		/obj/item/flashlight, /obj/item/analyzer,
@@ -47,7 +47,7 @@
 	mob_overlay_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
 	icon_state = "fedcoat"
 	item_state = "fedcoat"
-	mutantrace_variation = NONE
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
 	blood_overlay_type = "coat"
 	body_parts_covered = CHEST|GROIN|ARMS
 	allowed = list(
@@ -113,6 +113,7 @@
 	mob_overlay_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
 	icon_state = "fedmodern"
 	item_state = "fedmodern"
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
 	body_parts_covered = CHEST|GROIN|ARMS
 	allowed = list(
 		/obj/item/flashlight, /obj/item/analyzer,

modular_citadel/code/modules/mob/cit_emotes.dm

@@ -54,6 +54,8 @@
 				sound = 'modular_citadel/sound/voice/scream_skeleton.ogg'
 			if (is_species(user, /datum/species/fly) || is_species(user, /datum/species/insect))
 				sound = 'modular_citadel/sound/voice/scream_moth.ogg'
+			if (is_species(user, /datum/species/xeno))
+				sound = 'sound/voice/hiss6.ogg'
 		if(isalien(user))
 			sound = 'sound/voice/hiss6.ogg'
 		LAZYINITLIST(user.alternate_screams)

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

@@ -14,7 +14,12 @@
 /mob/living/carbon/adjustStaminaLoss(amount, updating_health = TRUE, forced = FALSE, affected_zone = BODY_ZONE_CHEST)
 	if(!forced && (status_flags & GODMODE))
 		return FALSE
-	apply_damage(amount > 0 ? amount*incomingstammult : amount, STAMINA, affected_zone)
+	var/obj/item/bodypart/BP = isbodypart(affected_zone)? affected_zone : (get_bodypart(check_zone(affected_zone)) || bodyparts[1])
+	if(amount > 0? BP.receive_damage(0, 0, amount * incomingstammult) : BP.heal_damage(0, 0, abs(amount)))
+		update_damage_overlays()
+	if(updating_health)
+		updatehealth()
+	update_stamina()
 	if((combat_flags & COMBAT_FLAG_HARD_STAMCRIT) && amount > 20)
 		incomingstammult = max(0.01, incomingstammult/(amount*0.05))
 	return amount

modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm

@@ -265,20 +265,22 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 			R.cell.give(500)
 			return
 		R.visible_message("[R] begins to lick \the [target.name] clean...", "<span class='notice'>You begin to lick \the [target.name] clean...</span>")
-	else if(ishuman(target))
+	else if(isliving(target))
 		var/mob/living/L = target
-		if(status == 0 && check_zone(R.zone_selected) == "head")
-			R.visible_message("<span class='warning'>\the [R] affectionally licks \the [L]'s face!</span>", "<span class='notice'>You affectionally lick \the [L]'s face!</span>")
-			playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
-			if(istype(L) && L.fire_stacks > 0)
-				L.adjust_fire_stacks(-10)
-			return
-		else if(status == 0)
-			R.visible_message("<span class='warning'>\the [R] affectionally licks \the [L]!</span>", "<span class='notice'>You affectionally lick \the [L]!</span>")
-			playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
-			if(istype(L) && L.fire_stacks > 0)
-				L.adjust_fire_stacks(-10)
-			return
+		if(!status)
+			if(L.ckey && !(L.client?.prefs.lickable))
+				to_chat(R, "<span class='danger'>ERROR ERROR: Target not lickable. Aborting display-of-affection subroutine.</span>")
+				return
+			if(check_zone(R.zone_selected) == "head")
+				R.visible_message("<span class='warning'>\the [R] affectionally licks \the [L]'s face!</span>", "<span class='notice'>You affectionally lick \the [L]'s face!</span>")
+				playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
+				if(istype(L) && L.fire_stacks > 0)
+					L.adjust_fire_stacks(-10)
+			else
+				R.visible_message("<span class='warning'>\the [R] affectionally licks \the [L]!</span>", "<span class='notice'>You affectionally lick \the [L]!</span>")
+				playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
+				if(istype(L) && L.fire_stacks > 0)
+					L.adjust_fire_stacks(-10)
 		else
 			if(R.cell.charge <= 800)
 				to_chat(R, "Insufficent Power!")
@@ -310,35 +312,43 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 	return
 
 //Nerfed tongue for flavour reasons (haha geddit?). Used for aux skins for regular borgs
-/obj/item/soap/tongue/flavour
+/obj/item/dogborg_tongue
+	name = "synthetic tongue"
+	desc = "Useful for slurping mess off the floor before affectionally licking the crew members in the face."
+	icon = 'icons/mob/dogborg.dmi'
+	icon_state = "synthtongue"
+	hitsound = 'sound/effects/attackblob.ogg'
 	desc = "For giving affectionate kisses."
+	item_flags = NOBLUDGEON
 
-/obj/item/soap/tongue/flavour/attack_self(mob/user)
-	return
-
-/obj/item/soap/tongue/flavour/afterattack(atom/target, mob/user, proximity)
-	if(!proximity)
+/obj/item/dogborg_tongue/afterattack(atom/target, mob/user, proximity)
+	. = ..()
+	if(!proximity || !isliving(target))
 		return
 	var/mob/living/silicon/robot/R = user
-	if(ishuman(target))
-		var/mob/living/L = target
-		if(status == 0 && check_zone(R.zone_selected) == "head")
-			R.visible_message("<span class='warning'>\the [R] affectionally licks \the [L]'s face!</span>", "<span class='notice'>You affectionally lick \the [L]'s face!</span>")
-			playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
-			return
-		else if(status == 0)
-			R.visible_message("<span class='warning'>\the [R] affectionally licks \the [L]!</span>", "<span class='notice'>You affectionally lick \the [L]!</span>")
-			playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
-			return
+	var/mob/living/L = target
+	if(L.ckey && !(L.client?.prefs.lickable))
+		to_chat(R, "<span class='danger'>ERROR ERROR: Target not lickable. Aborting display-of-affection subroutine.</span>")
+		return
 
-//Same as above but for noses
-/obj/item/analyzer/nose/flavour/AltClick(mob/user)
-	return
+	if(check_zone(R.zone_selected) == "head")
+		R.visible_message("<span class='warning'>\the [R] affectionally licks \the [L]'s face!</span>", "<span class='notice'>You affectionally lick \the [L]'s face!</span>")
+		playsound(R, 'sound/effects/attackblob.ogg', 50, 1)
+	else
+		R.visible_message("<span class='warning'>\the [R] affectionally licks \the [L]!</span>", "<span class='notice'>You affectionally lick \the [L]!</span>")
+		playsound(R, 'sound/effects/attackblob.ogg', 50, 1)
 
-/obj/item/analyzer/nose/flavour/attack_self(mob/user)
-	return
 
-/obj/item/analyzer/nose/flavour/afterattack(atom/target, mob/user, proximity)
+/obj/item/dogborg_nose
+	name = "boop module"
+	icon = 'icons/mob/dogborg.dmi'
+	icon_state = "nose"
+	desc = "The BOOP module"
+	flags_1 = CONDUCT_1|NOBLUDGEON
+	force = 0
+
+/obj/item/dogborg_nose/afterattack(atom/target, mob/user, proximity)
+	. = ..()
 	if(!proximity)
 		return
 	do_attack_animation(target, null, src)

modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm

@@ -68,11 +68,11 @@
 
 		B = new
 		if(H.dna.species.use_skintones && H.dna.features["genitals_use_skintone"])
-			B.color = skintone2hex(H.skin_tone)
+			B.color = SKINTONE2HEX(H.skin_tone)
 		else if(M.dna.features["breasts_color"])
 			B.color = "#[M.dna.features["breasts_color"]]"
 		else
-			B.color = skintone2hex(H.skin_tone)
+			B.color = SKINTONE2HEX(H.skin_tone)
 		B.size = "flat"
 		B.cached_size = 0
 		B.prev_size = 0