Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Space Ninja can load character preference #130

Merged
merged 1 commit into from
Oct 12, 2024
Merged

Space Ninja can load character preference #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/__DEFINES/inventory.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions code/_globalvars/bitfields.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
10 changes: 10 additions & 0 deletions code/modules/events/ghost_role/space_ninja.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/carbon_update_icons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/surgery/organs/external/_visual_organs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/surgery/organs/external/tails.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading