Hulks now only yell when breaking shit. They have a 2/5 chance of yelling over the radio.

Replaced the vault katana with a replica.

(svn actually managed a map merge, if it's broken please just revert to r5064's map, and replace the katana in the vault with a replica)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5065 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/obj/toy.dm

@@ -485,4 +485,17 @@
 		item_state = "balloon"
 	else
 		icon_state = "waterballoon-e"
-		item_state = "balloon-empty"
+		item_state = "balloon-empty"
+
+/obj/item/toy/katana
+	name = "replica katana"
+	desc = "Woefully underpowered in D20."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "katana"
+	item_state = "katana"
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT | SLOT_BACK
+	force = 5
+	throwforce = 5
+	w_class = 3
+	attack_verb = list("attacked", "slashed", "stabbed", "sliced")

code/game/objects/structures/tables_racks.dm

@@ -243,6 +243,7 @@
 /obj/structure/table/attack_paw(mob/user as mob)
 	if ((HULK in usr.mutations))
 		usr << "\blue You destroy the table."
+		usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 		visible_message("\red [user] smashes the table apart!")
 		if(istype(src, /obj/structure/table/reinforced))
 			new /obj/item/weapon/table_parts/reinforced( src.loc )
@@ -296,6 +297,7 @@
 	if ((HULK in usr.mutations) || (SUPRSTR in usr.augmentations))
 		usr << "\blue You destroy the table."
 		visible_message("\red [user] smahes the table apart!")
+		usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 		if(istype(src, /obj/structure/table/reinforced))
 			new /obj/item/weapon/table_parts/reinforced( src.loc )
 		else if(istype(src, /obj/structure/table/woodentable))

code/game/objects/structures/window.dm

@@ -111,6 +111,7 @@
 /obj/structure/window/attack_hand()
 	if ((HULK in usr.mutations) || (SUPRSTR in usr.augmentations))
 		usr << "\blue You smash through the window."
+		usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 		for(var/mob/O in oviewers())
 			if ((O.client && !( O.blinded )))
 				O << "\red [usr] smashes through the window!"
@@ -124,6 +125,7 @@
 /obj/structure/window/attack_paw()
 	if ((HULK in usr.mutations))
 		usr << "\blue You smash through the window."
+		usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 		for(var/mob/O in oviewers())
 			if ((O.client && !( O.blinded )))
 				O << "\red [usr] smashes through the window!"

code/game/turfs/simulated/walls.dm

@@ -155,6 +155,7 @@
 	if ((HULK in user.mutations))
 		if (prob(40))
 			usr << text("\blue You smash through the wall.")
+			usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 			dismantle_wall(1)
 			return
 		else
@@ -185,6 +186,7 @@
 	if ((HULK in user.mutations) || (SUPRSTR in user.augmentations))
 		if (prob(40))
 			usr << text("\blue You smash through the wall.")
+			usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 			dismantle_wall(1)
 			return
 		else

code/game/turfs/simulated/walls_reinforced.dm

@@ -13,6 +13,7 @@
 	if ((HULK in user.mutations) || (SUPRSTR in user.augmentations))
 		if (prob(10))
 			usr << text("\blue You smash through the wall.")
+			usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 			dismantle_wall(1)
 			return
 		else

code/modules/mob/living/carbon/human/life.dm

@@ -208,9 +208,6 @@
 			Weaken(3)
 			emote("collapse")
 
-		if ((HULK in mutations) && health >= 25)
-			if (prob(3))
-				say(pick("HGH!", "PROTEIN!", "OH YEAH!", "HULK SMASH!", "HULK NOT LIKE BOOKS!", "HNNNNNNNNNGGGGGGH!", ))
 		if (radiation)
 			if (radiation > 100)
 				radiation = 100

code/modules/mob/screen.dm

@@ -640,6 +640,7 @@
 						for(var/mob/O in viewers(CM))
 							O.show_message(text("\red <B>[] manages to break the handcuffs!</B>", CM), 1)
 						CM << "\green You successfully break your handcuffs."
+						CM.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 						del(CM.handcuffed)
 						CM.handcuffed = null
 						CM.update_inv_handcuffed()
@@ -677,6 +678,7 @@
 						for(var/mob/O in viewers(CM))
 							O.show_message(text("\red <B>[] manages to break the legcuffs!</B>", CM), 1)
 						CM << "\green You successfully break your legcuffs."
+						CM.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 						del(CM.legcuffed)
 						CM.legcuffed = null
 						CM.update_inv_legcuffed()