Merge branch 'master' into override-override

code/modules/clothing/shoes/_shoes.dm

@@ -15,6 +15,10 @@
 	var/offset = 0
 	var/equipped_before_drop = FALSE
 
+	//CITADEL EDIT Enables digitigrade shoe styles
+	var/adjusted = NORMAL_STYLE
+	var/mutantrace_variation = MUTANTRACE_VARIATION
+
 /obj/item/clothing/shoes/ComponentInitialize()
 	. = ..()
 	AddComponent(/datum/component/redirect, list(COMSIG_COMPONENT_CLEAN_ACT = CALLBACK(src, .proc/clean_blood)))
@@ -54,6 +58,16 @@
 
 /obj/item/clothing/shoes/equipped(mob/user, slot)
 	. = ..()
+
+	if(mutantrace_variation && ishuman(user))
+		var/mob/living/carbon/human/H = user
+		if(DIGITIGRADE in H.dna.species.species_traits)
+			adjusted = DIGITIGRADE_STYLE
+			H.update_inv_shoes()
+		else if(adjusted == DIGITIGRADE_STYLE)
+			adjusted = NORMAL_STYLE
+			H.update_inv_shoes()
+
 	if(offset && slot_flags & slotdefine2slotbit(slot))
 		user.pixel_y += offset
 		worn_y_dimension -= (offset * 2)

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

@@ -1516,3 +1516,18 @@
 /datum/sprite_accessory/moth_wings/snow
 	name = "Snow"
 	icon_state = "snow"
+
+//Lunasune
+/datum/sprite_accessory/mam_ears/lunasune
+	name = "lunasune"
+	icon_state = "lunasune"
+	hasinner = 1
+	extra = TRUE
+	extra_color_src = MUTCOLORS2
+	ckeys_allowed = list("invader4352")
+
+/datum/sprite_accessory/mam_tails/lunasune
+	name = "lunasune"
+	icon_state = "lunasune"
+	extra = TRUE
+	ckeys_allowed = list("invader4352")

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

@@ -922,9 +922,10 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			if(num_legs < 2)
 				return FALSE
 			if(DIGITIGRADE in species_traits)
-				if(!disable_warning)
-					to_chat(H, "<span class='warning'>The footwear around here isn't compatible with your feet!</span>")
-				return FALSE
+				if(!is_species(H, /datum/species/lizard/ashwalker))
+					H.update_inv_shoes()
+				else
+					return FALSE
 			return equip_delay_self_check(I, H, bypass_equip_delay_self)
 		if(SLOT_BELT)
 			if(H.belt)

code/modules/surgery/bodyparts/helpers.dm

@@ -298,5 +298,10 @@
 				else
 					U.suit_style = DIGITIGRADE_SUIT_STYLE
 				H.update_inv_w_uniform()
-		if(H.shoes && !swap_back)
-			H.dropItemToGround(H.shoes)
+		if(H.shoes)
+			var/obj/item/clothing/shoes/S = H.shoes
+			if(swap_back)
+				S.adjusted = NORMAL_STYLE
+			else
+				S.adjusted = DIGITIGRADE_STYLE
+			H.update_inv_shoes()

html/changelogs/AutoChangeLog-pr-7592.yml

@@ -0,0 +1,5 @@
+author: "Poojawa"
+delete-after: True
+changes: 
+  - rscadd: "Digitigrade legs are now able to wear shoes and look fancy, Uniforms to come."
+  - tweak: "Xenos are only digitigrade now, mammals and aquatics have the option."

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -326,3 +326,9 @@ datum/gear/darksabresheath
 	category = SLOT_IN_BACKPACK
 	path = /obj/item/toy/gun/m41
 	ckeywhitelist = list("thalverscholen")
+
+/datum/gear/Divine_robes
+	name = "Divine robes"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/lunasune
+	ckeywhitelist = list("invader4352")

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -397,3 +397,11 @@
 	desc = "Comfy Lucky Jackboots with the word Luck on them."
 	item_state = "luckyjack"
 	icon_state = "luckyjack"
+
+/obj/item/clothing/under/lunasune
+	name = "Divine Robes"
+	icon = 'icons/obj/custom.dmi'
+	icon_override = 'icons/mob/custom_w.dmi'
+	desc = "Heavenly robes of the kitsune Luna Pumpkin,you can feel radiance coming from them."
+	item_state = "Divine_robes"
+	icon_state = "Divine_robes"

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

@@ -426,7 +426,7 @@
 
 /datum/sprite_accessory/mam_tails
 	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
-	
+
 /datum/sprite_accessory/mam_tails/none
 	name = "None"
 
@@ -1432,7 +1432,27 @@ datum/sprite_accessory/mam_tails/tentacle
 	extra2 = FALSE
 	ckeys_allowed = list("poojawa")
 
-	
+
+//Lunasune
+/datum/sprite_accessory/mam_ears/lunasune
+	name = "lunasune"
+	icon_state = "lunasune"
+	hasinner = 1
+	extra = TRUE
+	extra_color_src = MUTCOLORS2
+	ckeys_allowed = list("invader4352")
+
+/datum/sprite_accessory/mam_tails/lunasune
+	name = "lunasune"
+	icon_state = "lunasune"
+	extra = TRUE
+	ckeys_allowed = list("invader4352")
+
+/datum/sprite_accessory/mam_tails_animated/lunasune
+	name = "lunasune"
+	icon_state = "lunasune"
+	extra = TRUE
+
 /*************** VIRGO PORTED HAIRS ****************************/
 #define VHAIR(_name, new_state) /datum/sprite_accessory/hair/##new_state/icon_state=#new_state;/datum/sprite_accessory/hair/##new_state/name = "Virgo - " + #_name
 //VIRGO PORTED HAIRS
@@ -1591,7 +1611,7 @@ VHAIR(Short Hair 4 alt, hair_shorthair4_s)
 VHAIR(Tressshoulder, hair_tressshoulder_s)
  //END
 #undef VHAIR
- 
+
 #define VFACE(_name, new_state) /datum/sprite_accessory/facial_hair/##new_state/icon_state=#new_state;;/datum/sprite_accessory/facial_hair/##new_state/name="Virgo" + #_name
 VFACE(Watson, facial_watson_s)
 VFACE(Chaplin, facial_chaplin_s)

modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm

@@ -221,10 +221,10 @@
 	id = "xeno"
 	say_mod = "hisses"
 	default_color = "00FF00"
-	species_traits = list(MUTCOLORS,EYECOLOR,LIPS)
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,DIGITIGRADE)
 	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
-	mutant_bodyparts = list("xenotail", "xenohead", "xenodorsal", "legs", "taur", "mam_body_markings")
-	default_features = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None","mam_body_markings" = "Xeno", "legs" = "Digitigrade Legs")
+	mutant_bodyparts = list("xenotail", "xenohead", "xenodorsal", "taur", "mam_body_markings")
+	default_features = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None","mam_body_markings" = "Xeno")
 	attack_verb = "slash"
 	attack_sound = 'sound/weapons/slash.ogg'
 	miss_sound = 'sound/weapons/slashmiss.ogg'
@@ -260,4 +260,4 @@
 	no_vore = TRUE
 
 /mob/living/carbon/human/vore
-	devourable = TRUE
+	devourable = TRUE