cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] You can now unbuckle others from a borg (#5093)

Browse Source 
* You can now unbuckle others from a borg (#58570)

* buc

* yeah

* You can now unbuckle others from a borg

Co-authored-by: Seth Scherer <supernovaa41@protonmail.com>
This commit is contained in:
SkyratBot
2021-04-22 20:10:58 +01:00
committed by GitHub
co-authored by Seth Scherer
parent a8b96e0a45
commit 9ebee935cd
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/silicon_defense.dm
+13 -10
View File
@@ -64,17 +64,20 @@
. = FALSE
if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_HAND, user) & COMPONENT_CANCEL_ATTACK_CHAIN)
. = TRUE
if(user.combat_mode)
user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
playsound(src.loc, 'sound/effects/bang.ogg', 10, TRUE)
visible_message("<span class='danger'>[user] punches [src], but doesn't leave a dent!</span>", \
"<span class='warning'>[user] punches you, but doesn't leave a dent!</span>", null, COMBAT_MESSAGE_RANGE, user)
to_chat(user, "<span class='danger'>You punch [src], but don't leave a dent!</span>")
if(has_buckled_mobs() && !user.combat_mode)
user_unbuckle_mob(buckled_mobs[1], user)
else
visible_message("<span class='notice'>[user] pets [src].</span>", \
"<span class='notice'>[user] pets you.</span>", null, null, user)
to_chat(user, "<span class='notice'>You pet [src].</span>")
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT_RND, "pet_borg", /datum/mood_event/pet_borg)
if(user.combat_mode)
user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
playsound(src.loc, 'sound/effects/bang.ogg', 10, TRUE)
visible_message("<span class='danger'>[user] punches [src], but doesn't leave a dent!</span>", \
"<span class='warning'>[user] punches you, but doesn't leave a dent!</span>", null, COMBAT_MESSAGE_RANGE, user)
to_chat(user, "<span class='danger'>You punch [src], but don't leave a dent!</span>")
else
visible_message("<span class='notice'>[user] pets [src].</span>", \
"<span class='notice'>[user] pets you.</span>", null, null, user)
to_chat(user, "<span class='notice'>You pet [src].</span>")
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT_RND, "pet_borg", /datum/mood_event/pet_borg)
/mob/living/silicon/attack_drone(mob/living/simple_animal/drone/M)