mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
Replaces live otie grabs with a different feature.
-Grabbing a live otie no longer does the classic "break sprite offset and piss off the mob" function. -Instead it now just leads to a disapproving growl and a loss of bonding if the grabber had befriended the thing before. -Grabbing a dead one does the old stuff tho so ya can still 'dispose' of the bodies or whatever. -Serious there's always someone who goes grabbing the nonhostile ones fgshjd :v
This commit is contained in:
@@ -247,7 +247,7 @@
|
|||||||
|
|
||||||
switch(M.a_intent)
|
switch(M.a_intent)
|
||||||
if(I_HELP)
|
if(I_HELP)
|
||||||
if (health > 0)
|
if(health > 0)
|
||||||
M.visible_message("<span class='notice'>[M] [response_help] \the [src].</span>")
|
M.visible_message("<span class='notice'>[M] [response_help] \the [src].</span>")
|
||||||
LoseTarget()
|
LoseTarget()
|
||||||
handle_stance(STANCE_IDLE)
|
handle_stance(STANCE_IDLE)
|
||||||
@@ -258,6 +258,29 @@
|
|||||||
faction = M.faction
|
faction = M.faction
|
||||||
sleep(1 SECOND)
|
sleep(1 SECOND)
|
||||||
|
|
||||||
|
if(I_GRAB)
|
||||||
|
if(health > 0)
|
||||||
|
audible_emote("growls disapprovingly at [M].")
|
||||||
|
if(friend == M)
|
||||||
|
friend = null
|
||||||
|
return
|
||||||
|
if(M == src)
|
||||||
|
return
|
||||||
|
if(!(status_flags & CANPUSH))
|
||||||
|
return
|
||||||
|
|
||||||
|
var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src)
|
||||||
|
|
||||||
|
M.put_in_active_hand(G)
|
||||||
|
|
||||||
|
G.synch()
|
||||||
|
G.affecting = src
|
||||||
|
LAssailant = M
|
||||||
|
|
||||||
|
M.visible_message("<span class='warning'>[M] has grabbed [src] passively!</span>")
|
||||||
|
M.do_attack_animation(src)
|
||||||
|
ai_log("attack_hand() I was grabbed by: [M]",2)
|
||||||
|
|
||||||
else
|
else
|
||||||
..()
|
..()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user