diff --git a/code/defines/obj/toy.dm b/code/defines/obj/toy.dm index b82ff17903d..e47f11f7774 100644 --- a/code/defines/obj/toy.dm +++ b/code/defines/obj/toy.dm @@ -485,4 +485,17 @@ item_state = "balloon" else icon_state = "waterballoon-e" - item_state = "balloon-empty" \ No newline at end of file + 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") \ No newline at end of file diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 97b708a458d..db8bfa183a1 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/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)) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 7b8ef0713a2..bce88aa60be 100644 --- a/code/game/objects/structures/window.dm +++ b/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!" diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index c0af4e0b5b1..d9412c211b4 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/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 diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index 7fae172f950..d9af0bca241 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/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 diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 9b208888f95..e056e18e730 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/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 diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm index 6633c70211f..ac9cc775aeb 100644 --- a/code/modules/mob/screen.dm +++ b/code/modules/mob/screen.dm @@ -640,6 +640,7 @@ for(var/mob/O in viewers(CM)) O.show_message(text("\red [] manages to break the handcuffs!", 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 [] manages to break the legcuffs!", 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() diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm index 6f079f2a724..460398fd648 100644 --- a/maps/tgstation.2.0.9.dmm +++ b/maps/tgstation.2.0.9.dmm @@ -4305,7 +4305,7 @@ "bEO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/mob/living/simple_animal/mouse/brown/Tom,/turf/simulated/floor{tag = "icon-vault (SOUTHEAST)"; icon_state = "vault"; dir = 6},/area/security/nuke_storage) "bEP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light/small,/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/security/nuke_storage) "bEQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{tag = "icon-vault (SOUTHWEST)"; icon_state = "vault"; dir = 10},/area/security/nuke_storage) -"bER" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/obj/structure/safe,/obj/item/clothing/mask/pig,/obj/item/clothing/glasses/sunglasses/big,/obj/item/weapon/katana,/obj/item/weapon/cigpacket/dromedaryco,/obj/item/weapon/lighter/zippo,/obj/item/clothing/mask/owl_mask,/obj/item/toy/gun,/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/security/nuke_storage) +"bER" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/obj/structure/safe,/obj/item/clothing/mask/pig,/obj/item/clothing/glasses/sunglasses/big,/obj/item/weapon/cigpacket/dromedaryco,/obj/item/weapon/lighter/zippo,/obj/item/clothing/mask/owl_mask,/obj/item/toy/gun,/obj/item/toy/katana,/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/security/nuke_storage) "bES" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/manifold{color = "blue"; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/security/nuke_storage) "bET" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/hallway/primary/aft) "bEU" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/hallway/primary/aft)