diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 64117c66660..d35a7054973 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -530,9 +530,9 @@ About the new airlock wires panel:
if(src.isWireCut(AIRLOCK_WIRE_LIGHT))
t1 += text("Door bolt lights wire is cut.
\n")
else if(!src.lights)
- t1 += text("Door lights are off. Enable?
\n", src)
+ t1 += text("Door bolt lights are off. Enable?
\n", src)
else
- t1 += text("Door lights are on. Disable?
\n", src)
+ t1 += text("Door bolt lights are on. Disable?
\n", src)
if(src.isWireCut(AIRLOCK_WIRE_ELECTRIFY))
t1 += text("Electrification wire is cut.
\n")
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index a116645b9d5..96d7433cead 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -211,28 +211,54 @@
return
-/obj/structure/foamedmetal/attack_animal(var/mob/living/simple_animal/M)
- if(M.environment_smash >= 1)
- M.do_attack_animation(src)
- M << "You smash apart the foam wall."
+/obj/structure/foamedmetal/attack_animal(var/mob/living/simple_animal/user)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
+ if(user.environment_smash >= 1)
+ user.do_attack_animation(src)
+ user << "You smash apart the foam wall."
qdel(src)
return
/obj/structure/foamedmetal/attack_hulk(mob/living/carbon/human/user)
..(user, 1)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
if(prob(75 - metal*25))
user.visible_message("[user] smashes through the foamed metal!", \
"You smash through the metal foam wall!")
qdel(src)
return 1
+/obj/structure/foamedmetal/attack_alien(var/mob/living/carbon/alien/humanoid/user)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
+ if(prob(75 - metal*25))
+ user.visible_message("[user] smashes through the foamed metal!", \
+ "You smash through the metal foam wall!")
+ qdel(src)
+
+/obj/structure/foamedmetal/attack_slime(var/mob/living/simple_animal/slime/user)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
+ if(!user.is_adult)
+ attack_hand(user)
+ return
+ if(prob(75 - metal*25))
+ user.visible_message("[user] smashes through the foamed metal!", \
+ "You smash through the metal foam wall!")
+ qdel(src)
/obj/structure/foamedmetal/attack_hand(var/mob/user)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
user << "You hit the metal foam but bounce off it!"
/obj/structure/foamedmetal/attackby(var/obj/item/I, var/mob/user, params)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
if (istype(I, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = I
G.affecting.loc = src.loc
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index 301809bc8a2..aec87adc748 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -65,7 +65,6 @@
playsound(src, 'sound/items/Wirecutter.ogg', 100, 1)
src.d_state = 1
src.icon_state = "r_wall-1"
- new /obj/item/stack/rods( src )
user << "You cut the outer grille."
return 1
@@ -85,15 +84,15 @@
return 1
//REPAIRING (replacing the outer grille for cosmetic damage)
- else if(istype(W, /obj/item/stack/rods))
- var/obj/item/stack/rods/O = W
+ else if(istype(W, /obj/item/stack/sheet/metal))
+ var/obj/item/stack/sheet/metal/O = W
if (O.use(1))
src.d_state = 0
src.icon_state = "r_wall"
relativewall_neighbours() //call smoothwall stuff
user << "You replace the outer grille."
else
- user << "You need one rod to repair the wall!"
+ user << "Report this to a coder: metal stack had less than one sheet in it when trying to repair wall"
return 1
return 1
@@ -177,8 +176,7 @@
if( d_state == 5 && user.loc == T && user.get_active_hand() == WT )
src.d_state = 6
src.icon_state = "r_wall-6"
- new /obj/item/stack/rods( src )
- user << "The support rods drop out as you cut them loose from the frame."
+ user << "You slice through the support rods."
return 1
if( istype(W, /obj/item/weapon/gun/energy/plasmacutter) )
@@ -193,8 +191,7 @@
if( d_state == 5 && user.loc == T && user.get_active_hand() == W )
src.d_state = 6
src.icon_state = "r_wall-6"
- new /obj/item/stack/rods( src )
- user << "The support rods drop out as you cut them loose from the frame."
+ user << "You slice through the support rods."
return 1
if(6)