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

Changes hulk code. (#45866)

Browse Source
This commit is contained in:
nemvar
2019-08-17 00:55:27 -07:00
committed by Rob Bailey
parent 406161ba02
commit a40ee7d303
26 changed files with 117 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/grille.dm
+4 -5
View File
@@ -96,11 +96,10 @@
/obj/structure/grille/hulk_damage()
return 60
/obj/structure/grille/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
if(user.a_intent == INTENT_HARM)
if(!shock(user, 70))
..(user, 1)
return TRUE
/obj/structure/grille/attack_hulk(mob/living/carbon/human/user)
if(shock(user, 70))
return
. = ..()
/obj/structure/grille/attack_hand(mob/living/user)
. = ..()
code/game/objects/structures/window.dm
+1 -1
View File
@@ -136,7 +136,7 @@
/obj/structure/window/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
if(!can_be_reached(user))
return 1
return
. = ..()
/obj/structure/window/attack_hand(mob/user)