cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 15:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Standardize HULK.

Browse Source 
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/items/weapons/swords_axes_etc.dm
This commit is contained in:
Rob Nelson
2014-01-21 22:45:40 -05:00
committed by ZomgPonies
parent 5784cf61df
commit 22a2df1115
35 changed files with 62 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/grille.dm
+1 -1
View File
@@ -64,7 +64,7 @@
if(shock(user, 70))
return
if(HULK in user.mutations)
if(M_HULK in user.mutations)
health -= 5
else
health -= 3
code/game/objects/structures/tables_racks.dm
+4 -4
View File
@@ -380,7 +380,7 @@
destroy()
/obj/structure/table/attack_paw(mob/user)
if(HULK in user.mutations)
if(M_HULK in user.mutations)
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
visible_message("<span class='danger'>[user] smashes the [src] apart!</span>")
destroy()
@@ -398,7 +398,7 @@
/obj/structure/table/attack_hand(mob/user)
if(HULK in user.mutations)
if(M_HULK in user.mutations)
visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
destroy()
@@ -848,14 +848,14 @@
/obj/structure/table/attack_hand(mob/user)
if(HULK in user.mutations)
if(M_HULK in user.mutations)
visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
destroy()
/obj/structure/rack/attack_paw(mob/user)
if(HULK in user.mutations)
if(M_HULK in user.mutations)
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
destroy()
code/game/objects/structures/window.dm
+1 -1
View File
@@ -122,7 +122,7 @@
/obj/structure/window/attack_hand(mob/user as mob)
if(HULK in user.mutations)
if(M_HULK in user.mutations)
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
new /obj/item/weapon/shard(loc)