mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 13:38:41 +01:00
Ghost cafe fix (#5022)
## About The Pull Request Ghost cafe fix. Adding allow_custom_character to our ghost cafe because TG checking for it and removed user.started_as_observer check - everyone can set it to true by observing after respawn anyways. And now explicitly allowing custom characters for roundstart ghost spawners. ## Why It's Good For The Game ## Proof Of Testing <details> <summary>Screenshots/Videos</summary> Spawned me with my prefs now. And tarkon works too, just for example <img width="476" height="333" alt="image" src="https://github.com/user-attachments/assets/dde2309c-3568-4d90-a6b1-3c3224888a65" /> <img width="887" height="692" alt="image" src="https://github.com/user-attachments/assets/440298d5-79d4-4c16-9775-d55389437e94" /> </details> ## Changelog 🆑 fix: Fixed ghost cafe because I couldnt ERP once /🆑 --------- Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
This commit is contained in:
@@ -165,6 +165,7 @@
|
||||
spawner_job_path = /datum/job/lifebringer
|
||||
restricted_species = list(/datum/species/pod) //SKYRAT EDIT ADDITION
|
||||
random_appearance = FALSE // SKYRAT EDIT ADDITION
|
||||
allow_custom_character = ALL // BUBBER EDIT ADDITION
|
||||
|
||||
/obj/effect/mob_spawn/ghost_role/human/seed_vault/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -234,6 +235,7 @@
|
||||
var/obj/structure/ash_walker_eggshell/eggshell
|
||||
restricted_species = list(/datum/species/lizard/ashwalker) //SKYRAT EDIT ADDITION
|
||||
random_appearance = FALSE // SKYRAT EDIT ADDITION
|
||||
allow_custom_character = GHOSTROLE_TAKE_PREFS_SPECIES // BUBBER EDIT ADDITION
|
||||
|
||||
/obj/effect/mob_spawn/ghost_role/human/ash_walker/Destroy()
|
||||
eggshell = null
|
||||
|
||||
@@ -205,7 +205,8 @@
|
||||
prompt_fail = tgui_alert(user, prompt, buttons = list("Yes", "No"), timeout = 10 SECONDS) != "Yes"
|
||||
|
||||
var/species_pref = user.client.prefs.read_preference(/datum/preference/choiced/species) || /datum/species/human
|
||||
if(!prompt_fail && user.started_as_observer && allow_custom_character && (GLOB.species_prototypes[species_pref].inherent_respiration_type & RESPIRATION_OXYGEN))
|
||||
// BUBBER EDIT - Commented observer check
|
||||
if(!prompt_fail && /*user.started_as_observer &&*/ allow_custom_character && (GLOB.species_prototypes[species_pref].inherent_respiration_type & RESPIRATION_OXYGEN))
|
||||
var/static_prompt = "Because you haven't taken a role so far, you may spawn in as \
|
||||
[((allow_custom_character & GHOSTROLE_TAKE_PREFS_SPECIES) || species_pref == /datum/species/human) ? "" : "a human version of"] \
|
||||
your customized character with a random name. Would you like to?"
|
||||
|
||||
Reference in New Issue
Block a user