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

Xenomorphs now retain lisps if the body they bursted from had that trait #8214

Merged
merged 5 commits into from
Jan 24, 2025
+5 −2
Merged

Xenomorphs now retain lisps if the body they bursted from had that trait #8214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d02a387
i think this is an awesome feature
Jan 22, 2025
880699b
unintented
Jan 22, 2025
650a548
spaces
Jan 22, 2025
cfba412
morespaces
Jan 22, 2025
8c269c0
Merge branch 'master' into lisp
Red-byte3D Jan 22, 2025
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: 2 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/Embryo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,8 @@
window_flash(new_xeno.client)

SSround_recording.recorder.track_player(new_xeno)
if(HAS_TRAIT(affected_mob, TRAIT_LISPING))
ADD_TRAIT(new_xeno, TRAIT_LISPING, affected_mob)

to_chat(new_xeno, SPAN_XENOANNOUNCE("You are a xenomorph larva inside a host! Move to burst out of it!"))
to_chat(new_xeno, "<B>Your job is to spread the hive and protect the Queen. If there's no Queen, you can become the Queen yourself by evolving into a drone.</B>")
Expand Down
5 changes: 3 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 @@ -188,6 +188,7 @@
hive.living_xeno_queen.overwatch(new_xeno)

src.transfer_observers_to(new_xeno)
new_xeno._status_traits = src._status_traits

qdel(src)
new_xeno.xeno_jitter(25)
Expand Down Expand Up @@ -312,7 +313,7 @@
var/mob/living/carbon/xenomorph/new_xeno = transmute(newcaste)
if(new_xeno)
log_game("EVOLVE: [key_name(src)] de-evolved into [new_xeno].")

return

/mob/living/carbon/xenomorph/proc/transmute(newcaste)
Expand All @@ -324,7 +325,6 @@
var/level_to_switch_to = get_vision_level()
var/xeno_type = GLOB.RoleAuthority.get_caste_by_text(newcaste)
var/mob/living/carbon/xenomorph/new_xeno = new xeno_type(get_turf(src), src)

if(!istype(new_xeno))
//Something went horribly wrong
to_chat(src, SPAN_WARNING("Something went terribly wrong here. Your new xeno is null! Tell a coder immediately!"))
Expand Down Expand Up @@ -368,6 +368,7 @@
SPAN_XENODANGER("We regress into our previous form."))

transfer_observers_to(new_xeno)
new_xeno._status_traits = src._status_traits

if(GLOB.round_statistics && !new_xeno.statistic_exempt)
GLOB.round_statistics.track_new_participant(faction, -1) //so an evolved xeno doesn't count as two.
Expand Down
Loading