Skip to content

Fix Garou transforming while resting #1102

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

Open
TheCarnalest wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix Garou transforming while resting #1102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd03354
Fix lying angle bug when transforming into a human while resting
TheCarnalest Jun 3, 2026
ffe5bf7
Fix Crinos and Lupus preference icons
TheCarnalest Jun 3, 2026
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
10 changes: 9 additions & 1 deletion modular_darkpack/modules/werewolf_the_apocalypse/code/species/transformation.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
if(istype(current_form, form_to_transform))
return
if(!force && !COOLDOWN_FINISHED(src, transform_cd))
to_chat(owner, span_warning("Your shifting is on cooldown for one turn."))
to_chat(owner, span_warning("Your shifting is on cooldown for [DisplayTimeText(COOLDOWN_TIMELEFT(src, transform_cd))]."))
return

if(HAS_TRAIT(owner, TRAIT_METAMORPH))
Expand Down Expand Up @@ -86,6 +86,14 @@

/datum/splat/werewolf/shifter/proc/transform_finish(form_to_transform, time_taken = DOGGY_ANIMATION_TIME)
animate(owner, transform = null, color = "#FFFFFF", time = time_taken * 0.1)

// Hacky fix for angle getting messed up when transforming into a human while resting
if (owner.body_position == LYING_DOWN && ispath(form_to_transform, /datum/species/human/shifter/homid))
var/previous_angle = owner.set_lying_angle(0)
owner.set_species(form_to_transform)
owner.set_lying_angle(previous_angle)
return

owner.set_species(form_to_transform)

/datum/splat/werewolf/shifter/proc/is_breed_form()
Expand Down
4 changes: 2 additions & 2 deletions modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/breeds/garou.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
breed_species = /datum/species/human/shifter/war

/datum/subsplat/werewolf/breed_form/garou/crinos/generation_pref_icon(datum/universal_icon/main_icon)
var/datum/universal_icon/breed_lupus = uni_icon('modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/lupus.dmi', "black")
var/datum/universal_icon/breed_lupus = uni_icon('modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/crinos.dmi', "black")
breed_lupus.scale(32, 32)
main_icon.blend_icon(breed_lupus, ICON_OVERLAY)

Expand All @@ -26,6 +26,6 @@
breed_species = /datum/species/human/shifter/feral

/datum/subsplat/werewolf/breed_form/garou/lupus/generation_pref_icon(datum/universal_icon/main_icon)
var/datum/universal_icon/breed_crinos = uni_icon('modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/crinos.dmi', "black")
var/datum/universal_icon/breed_crinos = uni_icon('modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/lupus.dmi', "black")
breed_crinos.scale(32, 32)
main_icon.blend_icon(breed_crinos, ICON_OVERLAY)