diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 699569bfe87..1de9e588ef1 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -259,22 +259,27 @@
/turf/simulated/wall/attack_hand(mob/user as mob)
user.changeNext_move(CLICK_CD_MELEE)
if (HULK in user.mutations)
- if (prob(40) || rotting)
- user << text("\blue You smash through the wall.")
+ if (prob(hardness) || rotting)
+ playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)
+ user << text("You smash through the wall.")
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
dismantle_wall(1)
return
else
- usr << text("\blue You punch the wall.")
- take_damage(rand(25, 75))
+ playsound(src, 'sound/effects/bang.ogg', 50, 1)
+ user << text("You punch the wall.")
return
if(rotting)
- user << "\blue The wall crumbles under your touch."
- dismantle_wall()
- return
+ if(hardness <= 10)
+ user << "This wall feels rather unstable."
+ return
+ else
+ user << "The wall crumbles under your touch."
+ dismantle_wall()
+ return
- user << "\blue You push the wall but nothing happens!"
+ user << "You push the wall but nothing happens!"
playsound(src, 'sound/weapons/Genhit.ogg', 25, 1)
src.add_fingerprint(user)
..()
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index c7b992ec9b0..1bba122d39e 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -7,34 +7,11 @@
explosion_block = 2
damage_cap = 200
max_temperature = 6000
-
+ hardness = 10
walltype = "rwall"
var/d_state = 0
-/turf/simulated/wall/r_wall/attack_hand(mob/user as mob)
- user.changeNext_move(CLICK_CD_MELEE)
- if (HULK in user.mutations)
- if (prob(10) || rotting)
- usr << text("\blue You smash through the wall.")
- usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
- dismantle_wall(1)
- return
- else
- usr << text("\blue You punch the wall.")
- return
-
- if(rotting)
- user << "\blue This wall feels rather unstable."
- return
-
- user << "\blue You push the wall but nothing happens!"
- playsound(src, 'sound/weapons/Genhit.ogg', 25, 1)
- src.add_fingerprint(user)
- ..()
- return
-
-
/turf/simulated/wall/r_wall/attackby(obj/item/W as obj, mob/user as mob, params)
user.changeNext_move(CLICK_CD_MELEE)
if (!user.IsAdvancedToolUser())
diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm
index fd8f3d79c6b..0888d940cfe 100644
--- a/code/modules/fish/fish_items.dm
+++ b/code/modules/fish/fish_items.dm
@@ -86,7 +86,7 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
src.bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/feederfish
- name = "shrimp"
+ name = "feeder fish"
desc = "A tiny feeder fish. Sure doesn't look very filling..."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "feederfish"
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index 92c52902a6a..96b0f22f29f 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index afd4192a2b3..b932b8acade 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ