Merge branch 'main' into paranoid-android

code/__DEFINES/inventory.dm

@@ -112,6 +112,10 @@ DEFINE_BITFIELD(no_equip_flags, list(
 #define HIDEBELT (1<<14)
 ///hides antennae
 #define HIDEANTENNAE (1<<15)
+//DOPPLER ADDITION START
+#define HIDETAIL (1<<16)
+#define HIDEHORNS (1<<17)
+//DOPPLER ADDITION END
 
 //bitflags for clothing coverage - also used for limbs
 #define HEAD (1<<0)

code/_globalvars/bitfields.dm

@@ -206,6 +206,10 @@ DEFINE_BITFIELD(flags_inv, list(
 	"HIDESHOES" = HIDESHOES,
 	"HIDESNOUT" = HIDESNOUT,
 	"HIDESUITSTORAGE" = HIDESUITSTORAGE,
+	// DOPPLER ADDITION START
+	"HIDETAIL" = HIDETAIL,
+	"HIDEHORNS" = HIDEHORNS,
+	// DOPPLER ADDITION END
 ))
 
 DEFINE_BITFIELD(machine_stat, list(

code/modules/client/preferences_savefile.dm

@@ -307,6 +307,17 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 
 	//Quirks
 	all_quirks = save_data?["all_quirks"]
+	/// DOPPLER SHIFT ADDITION BEGIN
+	var/list/save_languages = SANITIZE_LIST(save_data["languages"])
+	for(var/language in save_languages)
+		var/value = save_languages[language]
+		save_languages -= language
+
+		if(istext(language))
+			language = _text2path(language)
+		save_languages[language] = value
+	languages = save_languages
+	/// DOPPLER SHIFT ADDITION END
 
 	//try to fix any outdated data if necessary
 	//preference updating will handle saving the updated data for us.
@@ -317,6 +328,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	randomise = SANITIZE_LIST(randomise)
 	job_preferences = SANITIZE_LIST(job_preferences)
 	all_quirks = SANITIZE_LIST(all_quirks)
+	languages = SANITIZE_LIST(languages) /// DOPPLER SHIFT ADDITION
 
 	//Validate job prefs
 	for(var/j in job_preferences)
@@ -325,6 +337,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 
 	all_quirks = SSquirks.filter_invalid_quirks(SANITIZE_LIST(all_quirks))
 	validate_quirks()
+	sanitize_languages() /// DOPPLER SHIFT ADDITION
 
 	return TRUE
 
@@ -365,6 +378,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 
 	//Quirks
 	save_data["all_quirks"] = all_quirks
+	save_data["languages"] = languages /// DOPPLER SHIFT ADDITION - we might want to migrate this
 
 	return TRUE
 

code/modules/events/ghost_role/space_ninja.dm

@@ -23,10 +23,20 @@
 	if(isnull(chosen_one))
 		return NOT_ENOUGH_PLAYERS
 	//spawn the ninja and assign the candidate
+	// DOPPLER ADDITION START - Preference Ninjas
+	var/loadme = tgui_alert(chosen_one, "Do you wish to load your character slot?", "Load Character?", list("Yes!", "No, I want to be random!"), timeout = 60 SECONDS)
+	// DOPPLER ADDITION END
 	var/mob/living/carbon/human/ninja = create_space_ninja(spawn_location)
 	ninja.key = chosen_one.key
 	ninja.mind.add_antag_datum(/datum/antagonist/ninja)
 	spawned_mobs += ninja
+	// DOPPLER ADDITION START - Preference Ninjas
+	if(loadme == "Yes!")
+		ninja.client?.prefs?.safe_transfer_prefs_to(ninja)
+		ninja.dna.update_dna_identity()
+
+		SSquirks.AssignQuirks(ninja, ninja.client)
+	// DOPPLER ADDITION END
 	message_admins("[ADMIN_LOOKUPFLW(ninja)] has been made into a space ninja by an event.")
 	ninja.log_message("was spawned as a ninja by an event.", LOG_GAME)
 

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

@@ -1,6 +1,6 @@
 /mob/living/carbon/update_obscured_slots(obscured_flags)
 	..()
-	if(obscured_flags & (HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT|HIDEMUTWINGS))
+	if(obscured_flags & (HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT|HIDEMUTWINGS|HIDETAIL|HIDEHORNS)) // DOPPLER EDIT, old code: if(obscured_flags & (HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT|HIDEMUTWINGS))
 		update_body()
 
 /// Updates features and clothing attached to a specific limb with limb-specific offsets

code/modules/surgery/organs/external/_visual_organs.dm

@@ -120,7 +120,7 @@ Unlike normal organs, we're actually inside a persons limbs at all times
 	feature_key = "horns"
 
 /datum/bodypart_overlay/mutant/horns/can_draw_on_bodypart(mob/living/carbon/human/human)
-	if((human.head?.flags_inv & HIDEHAIR) || (human.wear_mask?.flags_inv & HIDEHAIR))
+	if((human.head?.flags_inv & HIDEHORNS) || (human.wear_mask?.flags_inv & HIDEHORNS)) // DOPPLER EDIT, old code: if((human.head?.flags_inv & HIDEHAIR) || (human.wear_mask?.flags_inv & HIDEHAIR))
 		return FALSE
 
 	return TRUE

code/modules/surgery/organs/external/tails.dm

@@ -153,7 +153,7 @@
 	return "[wagging ? "wagging_" : ""][sprite_datum.icon_state]" //add the wagging tag if we be wagging
 
 /datum/bodypart_overlay/mutant/tail/can_draw_on_bodypart(mob/living/carbon/human/human)
-	if(human.wear_suit && (human.wear_suit.flags_inv & HIDEJUMPSUIT))
+	if(human.wear_suit && (human.wear_suit.flags_inv & HIDETAIL)) // DOPPLER EDIT, old code: if(human.wear_suit && (human.wear_suit.flags_inv & HIDEJUMPSUIT))
 		return FALSE
 	return TRUE
 

modular_doppler/loadout_categories/categories/undersuit.dm

@@ -18,7 +18,13 @@
 /datum/loadout_item/undersuit/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE, override_items = LOADOUT_OVERRIDE_BACKPACK)
 	if(override_items == LOADOUT_OVERRIDE_BACKPACK && !visuals_only)
 		if(outfit.uniform)
-			LAZYADD(outfit.backpack_contents, outfit.uniform)
+			if(equipper.jumpsuit_style == PREF_SKIRT)
+				outfit.uniform = "[outfit.uniform]/skirt"
+				if(!text2path(outfit.uniform))
+					outfit.uniform = initial(outfit.uniform)
+				LAZYADD(outfit.backpack_contents, outfit.uniform)
+			else
+				LAZYADD(outfit.backpack_contents, outfit.uniform)
 		outfit.uniform = item_path
 	else
 		outfit.uniform = item_path

modular_doppler/sprite_accessories/code/hair.dm → modular_doppler/modular_customization/accessories/code/hair.dm

@@ -1,7 +1,7 @@
 // Hairstyles
 
 /datum/sprite_accessory/hair/modular
-	icon = 'modular_doppler/sprite_accessories/icons/hair.dmi'
+	icon = 'modular_doppler/modular_customization/accessories/icons/hair.dmi'
 
 /datum/sprite_accessory/hair/modular/pigtails4
 	name = "Pigtails 4"
@@ -651,10 +651,14 @@
 	name = "Long Dreadlocks"
 	icon_state = "hair_dreadlocks_long"
 
+/datum/sprite_accessory/hair/modular/inari
+	name = "Inari"
+	icon_state = "inari"
+
 // Facial hair
 
 /datum/sprite_accessory/facial_hair/modular
-	icon = 'modular_doppler/sprite_accessories/icons/facialhair.dmi'
+	icon = 'modular_doppler/modular_customization/accessories/icons/facialhair.dmi'
 
 /datum/sprite_accessory/facial_hair/modular/sideburns
 	name = "Sideburns"

modular_doppler/modular_species/species_types/genemod/genemod.dm

@@ -10,12 +10,13 @@
 		TRAIT_ANIMALISTIC,
 		TRAIT_MUTANT_COLORS,
 	)
+	body_markings = list(/datum/bodypart_overlay/simple/body_marking/lizard = "None")
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
 
 	digitigrade_customization = DIGITIGRADE_OPTIONAL
 	digi_leg_overrides = list(
-		BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/digitigrade/anthromorph,
-		BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/digitigrade/anthromorph,
+		BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/digitigrade/genemod,
+		BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/digitigrade/genemod,
 	)
 
 /datum/outfit/genemod_preview

modular_doppler/modular_species/species_types/genemod/genemod_bodyparts.dm

@@ -0,0 +1,15 @@
+/obj/item/bodypart/leg/left/digitigrade/genemod
+	icon_greyscale = 'modular_doppler/modular_species/species_types/genemod/icons/bodyparts.dmi'
+
+/obj/item/bodypart/leg/left/digitigrade/genemod/update_limb(dropping_limb = FALSE, is_creating = FALSE)
+	. = ..()
+	if(limb_id == SPECIES_LIZARD)
+		limb_id = SPECIES_HUMAN
+
+/obj/item/bodypart/leg/right/digitigrade/genemod
+	icon_greyscale = 'modular_doppler/modular_species/species_types/genemod/icons/bodyparts.dmi'
+
+/obj/item/bodypart/leg/right/digitigrade/genemod/update_limb(dropping_limb = FALSE, is_creating = FALSE)
+	. = ..()
+	if(limb_id == SPECIES_LIZARD)
+		limb_id = SPECIES_HUMAN

modular_doppler/modular_species/species_types/snails/modular_snail.dm

@@ -1,6 +1,7 @@
 #define SHELL_TRANSPARENCY_ALPHA 90
 
 /datum/species/snail
+	preview_outfit = /datum/outfit/snail_preview
 	mutantliver = /obj/item/organ/internal/liver/snail //This is just a better liver to deal with toxins, it's a thematic thing.
 	mutantheart = /obj/item/organ/internal/heart/snail //This gives them the shell buff where they take less damage from behind, and their heart's more durable.
 	exotic_blood = /datum/reagent/bug_blood
@@ -12,6 +13,11 @@
 		BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/digitigrade/insectoid,
 	)
 
+/datum/outfit/snail_preview
+	name = "Snail (Species Preview)"
+	uniform = /obj/item/clothing/under/rank/medical/chemist/pharmacologist/skirt
+	mask = /obj/item/clothing/mask/surgical
+
 /datum/species/snail/on_species_gain(mob/living/carbon/new_snailperson, datum/species/old_species, pref_load)
 	. = ..()
 	new_snailperson.update_icons()
@@ -141,7 +147,12 @@
 		wearer.update_worn_back()
 
 /datum/species/snail/prepare_human_for_preview(mob/living/carbon/human/snail)
-	snail.dna.features["mcolor"] = "#adaba7"
+	snail.dna.features["mcolor"] = "#797289"
+	snail.hairstyle = "Phoenix Half-Shaven"
+	snail.hair_color = "#4C3C7E"
+	snail.eye_color_left = "#615188"
+	snail.eye_color_right = "#615188"
+	regenerate_organs(snail, src, visual_only = TRUE)
 	snail.update_body(TRUE)
 
 /datum/species/snail/create_pref_unique_perks()

tgstation.dme

@@ -6707,6 +6707,7 @@
 #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_under.dm"
 #include "modular_doppler\modular_crafting\code\crafting_extended.dm"
 #include "modular_doppler\modular_crafting\code\sheet_types.dm"
+#include "modular_doppler\modular_customization\accessories\code\hair.dm"
 #include "modular_doppler\modular_customization\accessories\code\aquatic_accessories\aquatic_body_markings.dm"
 #include "modular_doppler\modular_customization\accessories\code\aquatic_accessories\aquatic_ears.dm"
 #include "modular_doppler\modular_customization\accessories\code\aquatic_accessories\aquatic_snout.dm"
@@ -6884,6 +6885,7 @@
 #include "modular_doppler\modular_species\species_types\ethereal\ethereal.dm"
 #include "modular_doppler\modular_species\species_types\flypeople\flypeople.dm"
 #include "modular_doppler\modular_species\species_types\genemod\genemod.dm"
+#include "modular_doppler\modular_species\species_types\genemod\genemod_bodyparts.dm"
 #include "modular_doppler\modular_species\species_types\golem\golem.dm"
 #include "modular_doppler\modular_species\species_types\hemophage\_hemophage_defines.dm"
 #include "modular_doppler\modular_species\species_types\hemophage\_organ_corruption.dm"
@@ -6962,7 +6964,6 @@
 #include "modular_doppler\religion\code\mind.dm"
 #include "modular_doppler\religion\code\religious_sects.dm"
 #include "modular_doppler\research\designs\limbgrower_designs.dm"
-#include "modular_doppler\sprite_accessories\code\hair.dm"
 #include "modular_doppler\stone\code\ore_veins.dm"
 #include "modular_doppler\stone\code\stone.dm"
 #include "modular_doppler\tableflip\tableflip.dm"