Merge pull request #130 from honkpocket/pref-ninja

DopplerShift13 · Oct 12, 2024 · 42cba93 · 42cba93
2 parents 124948c + b3a080c
commit 42cba93
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 3 deletions.
diff --git a/code/__DEFINES/inventory.dm b/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)

diff --git a/code/_globalvars/bitfields.dm b/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(

diff --git a/code/modules/events/ghost_role/space_ninja.dm b/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)
 

diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/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

diff --git a/code/modules/surgery/organs/external/_visual_organs.dm b/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

diff --git a/code/modules/surgery/organs/external/tails.dm b/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