cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attack! (#7538)

Browse Source
This commit is contained in:
Shadow-Quill
2020-08-26 02:47:49 -05:00
committed by VirgoBot
parent 444677252c
commit da96910c5c
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/mob/holder.dm
View File

@@ -198,6 +198,7 @@ var/list/holder_mob_icon_cache = list()
to_chat(grabber, "<span class='notice'>You scoop up \the [src]!</span>") to_chat(grabber, "<span class='notice'>You scoop up \the [src]!</span>")
to_chat(src, "<span class='notice'>\The [grabber] scoops you up!</span>") to_chat(src, "<span class='notice'>\The [grabber] scoops you up!</span>")
add_attack_logs(grabber, H.held_mob, "Scooped up", FALSE) // Not important enough to notify admins, but still helpful.
H.sync(src) H.sync(src)
return H return H

1
code/modules/mob/mob_grab.dm
View File

@@ -261,6 +261,7 @@
state = GRAB_AGGRESSIVE state = GRAB_AGGRESSIVE
icon_state = "grabbed1" icon_state = "grabbed1"
hud.icon_state = "reinforce1" hud.icon_state = "reinforce1"
add_attack_logs(assailant, affecting, "Aggressively grabbed", FALSE) // Not important enough to notify admins, but still helpful.
else if(state < GRAB_NECK) else if(state < GRAB_NECK)
if(isslime(affecting)) if(isslime(affecting))
to_chat(assailant, "<span class='notice'>You squeeze [affecting], but nothing interesting happens.</span>") to_chat(assailant, "<span class='notice'>You squeeze [affecting], but nothing interesting happens.</span>")