mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-31 00:58:26 +01:00
code cleanup to satisfy linters
This commit is contained in:
@@ -16,18 +16,6 @@
|
||||
spawner_job_path = /datum/job/ancient_crew
|
||||
allow_custom_character = GHOSTROLE_TAKE_PREFS_APPEARANCE
|
||||
|
||||
/obj/effect/mob_spawn/ghost_role/human/oldstation/create(mob/mob_possessor, newname, apply_prefs)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
notify_ghosts(
|
||||
"Someone just woke up on Charlie Station! Why not join them and help out?",
|
||||
source = ., //the spawned mob
|
||||
header = "Join in, help out!",
|
||||
click_interact = TRUE,
|
||||
notify_flags = NOTIFY_CATEGORY_NOFLASH,
|
||||
)
|
||||
|
||||
/obj/effect/mob_spawn/ghost_role/human/oldstation/Destroy()
|
||||
new /obj/structure/showcase/machinery/oldpod/used(drop_location())
|
||||
return ..()
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
/// Are we limited to a certain species type? LISTED TYPE
|
||||
var/restricted_species
|
||||
|
||||
/obj/effect/mob_spawn/ghost_role/create(mob/mob_possessor, newname, load_prefs = FALSE)
|
||||
/obj/effect/mob_spawn/ghost_role/create(mob/mob_possessor, newname, apply_prefs = FALSE)
|
||||
//if we can load our own appearance and its not restricted, try
|
||||
|
||||
var/mob/living/carbon/human/spawned_human = ..(mob_possessor, newname, load_prefs)
|
||||
var/mob/living/carbon/human/spawned_human = ..(mob_possessor, newname, apply_prefs)
|
||||
|
||||
if(!load_prefs)
|
||||
if(!apply_prefs)
|
||||
var/datum/language_holder/holder = spawned_human.get_language_holder()
|
||||
holder.get_selected_language() //we need this here so a language starts off selected
|
||||
|
||||
@@ -34,7 +34,8 @@
|
||||
post_transfer_prefs(spawned_human)
|
||||
|
||||
if(loadout_enabled)
|
||||
spawned_human.equip_outfit_and_loadout(outfit, spawned_human.client.prefs)
|
||||
ASYNC // Expensive and not needing to return
|
||||
spawned_human.equip_outfit_and_loadout(outfit, spawned_human.client.prefs)
|
||||
else
|
||||
equip(spawned_human)
|
||||
|
||||
@@ -47,15 +48,6 @@
|
||||
|
||||
return spawned_human
|
||||
|
||||
/// This edit would cause somewhat ugly diffs, so I'm just replacing it.
|
||||
/// Original proc in code/modules/mob_spawn/mob_spawn.dm ~line 39.
|
||||
/obj/effect/mob_spawn/create(mob/mob_possessor, newname, is_pref_loaded)
|
||||
var/mob/living/spawned_mob = new mob_type(get_turf(src)) //living mobs only
|
||||
name_mob(spawned_mob, newname)
|
||||
special(spawned_mob, mob_possessor)
|
||||
if(!is_pref_loaded)
|
||||
equip(spawned_mob)
|
||||
return spawned_mob
|
||||
|
||||
// Anything that can potentially be overwritten by transferring prefs must go in this proc
|
||||
// This is needed because safe_transfer_prefs_to() can override some things that get set in special() for certain roles, like name replacement
|
||||
|
||||
Reference in New Issue
Block a user