mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-07-11 00:03:55 +01:00
The 515 MegaPR early downport (#7783)
Co-authored-by: Selis <selis@xynolabs.com> Co-authored-by: Selis <sirlionfur@hotmail.de> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: SatinIsle <thesatinisle@gmail.com> Co-authored-by: Heroman <alesha3000@list.ru> Co-authored-by: Casey <a.roaming.shadow@gmail.com> Co-authored-by: Raeschen <rycoop29@gmail.com>
This commit is contained in:
@@ -220,9 +220,7 @@
|
||||
playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1)
|
||||
else //Shoot, it didn't work and now it's mad!!!
|
||||
S.ai_holder.go_wake()
|
||||
S.ai_holder.target = user
|
||||
S.ai_holder.track_target_position()
|
||||
S.ai_holder.set_stance(STANCE_FIGHT)
|
||||
S.ai_holder.give_target(user, urgent = TRUE)
|
||||
user.visible_message("\The [src] bonks into \the [S], angering it!")
|
||||
playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1)
|
||||
to_chat(user, "<span class='notice'>\The [src] clicks unsatisfyingly.</span>")
|
||||
|
||||
@@ -143,7 +143,7 @@
|
||||
unpetrify(deleting = TRUE)
|
||||
else
|
||||
visible_message("<span class='warning'>The [identifier] loses shape and crumbles into a pile of [material]!</span>")
|
||||
qdel(gargoyle)
|
||||
QDEL_NULL(gargoyle)
|
||||
. = ..()
|
||||
|
||||
/obj/structure/gargoyle/process()
|
||||
@@ -211,7 +211,7 @@
|
||||
alpha = 0
|
||||
gargoyle.visible_message("<span class='warning'>[gargoyle]'s skin rapidly reverts, returning them to normal!</span>", "<span class='warning'>Your skin reverts, freeing your movement once more![hurtmessage]</span>")
|
||||
gargoyle = null
|
||||
if (!deleting)
|
||||
if (deleting)
|
||||
qdel(src)
|
||||
|
||||
/obj/structure/gargoyle/return_air()
|
||||
|
||||
Reference in New Issue
Block a user