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

Fixes Changeling Last resort + digi camo #11964

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
+2 −2
Draft

Fixes Changeling Last resort + digi camo #11964

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0340218
monkey fix
Geatish Nov 7, 2024
416199d
digi camo fix
Geatish Nov 30, 2024
cfffbe7
Revert "digi camo fix"
Geatish Nov 30, 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/elements/digital_camo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

/datum/element/digital_camo/proc/on_examine(datum/source, mob/user, list/examine_list)
SIGNAL_HANDLER
examine_list += "<span class='warning'>[source.p_their()] skin seems to be shifting and morphing like is moving around below it.</span>"
examine_list += "<span class='warning'>[source.p_their()] skin seems to be shifting and morphing like something is moving around below it.</span>"

/datum/element/digital_camo/proc/can_track(datum/source)
SIGNAL_HANDLER
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/examine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,4 @@
if(MOOD_LEVEL_HAPPY4 to INFINITY)
. += "[t_He] look[p_s()] ecstatic."
. += "</span>"
. = ..()
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/human/examine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@
"<a href='?src=[REF(src)];hud=s;add_comment=1;examine_time=[world.time]'>\[Add comment\]</a>"), "")
else if(isobserver(user) && traitstring)
. += "<span class='info'><b>Traits:</b> [traitstring]</span>"
. = ..()

/mob/living/proc/status_effect_examines(pronoun_replacement) //You can include this in any mob's examine() to show the examine texts of status effects!
var/list/dat = list()
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/simple_animal/hostile/headcrab.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@
time++
if(time >= EGG_INCUBATION_TIME)
Pop()
Remove(owner)
Remove(owner.loc)
qdel(src)

/obj/item/organ/body_egg/changeling_egg/proc/Pop()
var/mob/living/carbon/monkey/M = new(owner)
var/mob/living/carbon/monkey/M = new(owner.loc)

for(var/obj/item/organ/I in src)
I.Insert(M, 1)
Expand Down
Loading