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

Jump to bottom

[s] Fix Tutorials #5718

Merged
merged 3 commits into from
Feb 15, 2024
Merged

[s] Fix Tutorials #5718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4aa0e6d
Tutorial fixes
Drulikar Feb 14, 2024
01c340c
Xeno tutorial fixes
Drulikar Feb 14, 2024
c38afe3
Fix runtime when ghosting in tutorial
Drulikar Feb 14, 2024
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
2 changes: 1 addition & 1 deletion code/datums/tutorial/_tutorial_menu.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@

path = text2path(params["tutorial_path"])

if(!path || !isnewplayer(usr))
if(!ispath(path, /datum/tutorial) || !isnewplayer(usr))
return

if(HAS_TRAIT(usr, TRAIT_IN_TUTORIAL) || istype(get_area(usr), /area/misc/tutorial))
Expand Down
1 change: 1 addition & 0 deletions code/datums/tutorial/xenomorph/xenomorph_basic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
xeno.plasma_max = 0
xeno.melee_damage_lower = 40
xeno.melee_damage_upper = 40
xeno.lock_evolve = TRUE

message_to_player("Welcome to the Xenomorph basic tutorial. You are [xeno.name], a drone, the workhorse of the hive.")

Expand Down
5 changes: 4 additions & 1 deletion code/modules/mob/dead/observer/observer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,10 @@
hud_used.show_hud(hud_used.hud_version)

/mob/dead/observer/Login()
..()
..() // This calls signals which might have resulted in our client getting deleted

if(!client)
return

if(client.check_whitelist_status(WHITELIST_PREDATOR))
RegisterSignal(SSdcs, COMSIG_GLOB_PREDATOR_ROUND_TOGGLED, PROC_REF(toggle_predator_action))
Expand Down
10 changes: 8 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/Evolution.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,10 @@
return FALSE

if(lock_evolve)
to_chat(src, SPAN_WARNING("You are banished and cannot reach the hivemind."))
if(banished)
to_chat(src, SPAN_WARNING("We are banished and cannot reach the hivemind."))
else
to_chat(src, SPAN_WARNING("We can't evolve."))
return FALSE

if(jobban_isbanned(src, JOB_XENOMORPH))//~who so genius to do this is?
Expand Down Expand Up @@ -269,7 +272,10 @@
return

if(lock_evolve)
to_chat(src, SPAN_WARNING("We are banished and cannot reach the hivemind."))
if(banished)
to_chat(src, SPAN_WARNING("We are banished and cannot reach the hivemind."))
else
to_chat(src, SPAN_WARNING("We can't deevolve."))
return FALSE


Expand Down
Loading