Skip to content

Small tweaks missed in previous PR. #143

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

Merged
MistakeNot4892 merged 1 commit into from
Aug 25, 2026
Merged

Small tweaks missed in previous PR. #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 mods/content/wyrd/wyrd_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
var/decl/anima/anima = GET_DECL(atype)
to_chat(user, anima.get_personal_anima_description(avalue, user.get_background_datum(/decl/background_category/faction)))

/*
/mob/living/verb/debug_anima_verb()
set name = "Debug Anima"
set category = "Debug"
Expand All @@ -51,3 +52,4 @@
add_ability(/decl/ability/wyrd/spell/flash)
add_ability(/decl/ability/wyrd/spell/gloom)
add_ability(/decl/ability/wyrd/spell/flare)
*/
7 changes: 2 additions & 5 deletions mods/content/wyrd/wyrdling_mask.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@
var/mob/living/_our_owner
VAR_PRIVATE/mob/living/_our_animal

/obj/item/clothing/mask/ghost_caul/proc/set_animal(mob/living/_new_animal)
_our_animal = _new_animal

/obj/item/clothing/mask/ghost_caul/get_preview_screen_locs()
var/static/list/override_preview_screen_locs = list(
"1" = "character_preview_map:1,4:36",
Expand Down Expand Up @@ -141,11 +138,11 @@

// Keep a reference to our human to avoid them getting GC'd in nullspace.
if(istype(target, mask.transformation_mob_type))
mask.set_animal(src)
mask._our_owner = src
drop_from_inventory(mask)
mask.forceMove(target)
else
mask.set_animal(null)
mask._our_owner = null
mask.forceMove(get_turf(target))
target.equip_to_slot_or_store_or_drop(mask, slot_wear_mask_str)

Expand Down
Loading