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

Pacifies all pets spawned by Xenobiology's Stabilized Gold #11350

Merged
merged 5 commits into from
Sep 1, 2024
Merged

Pacifies all pets spawned by Xenobiology's Stabilized Gold #11350

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad86d2c
changed stabilized gold intent to 'help'
aramix273 Aug 19, 2024
ceedb19
registered own proc on signal to cancel attack
aramix273 Aug 20, 2024
c586a40
replaced signal with pacifism trait, nulled damage
aramix273 Aug 20, 2024
e3d61b6
removes toggle mode verb from parrots and consistency changes
aramix273 Aug 20, 2024
874af8f
replaced hardcoded string with macro
aramix273 Aug 22, 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
4 changes: 4 additions & 0 deletions code/modules/research/xenobiology/crossbreeding/_status_effects.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,6 +938,10 @@
var/obj/item/slimecross/stabilized/gold/linked = linked_extract
if(QDELETED(familiar))
familiar = new linked.mob_type(get_turf(owner.loc))
familiar.a_intent = INTENT_HELP
ADD_TRAIT(familiar, TRAIT_PACIFISM, "stabilizedgold")
familiar.melee_damage = 0
familiar.remove_verb(/mob/living/simple_animal/parrot/proc/toggle_mode) // just in case
familiar.name = linked.mob_name
familiar.del_on_death = TRUE
familiar.copy_languages(owner, LANGUAGE_MASTER)
Expand Down
Loading