This commit is contained in:
silicons
2020-07-26 16:03:57 -07:00
parent bf4b2dfbf5
commit 791bfabc9b
+4 -2
View File
@@ -9,6 +9,8 @@
thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall
attack_hand_speed = 8
attack_hand_is_action = TRUE
baseturfs = /turf/open/floor/plating
@@ -118,6 +120,7 @@
/turf/closed/wall/attack_animal(mob/living/simple_animal/M)
if(!M.CheckActionCooldown(CLICK_CD_MELEE))
return
M.DelayNextAction()
M.do_attack_animation(src)
if((M.environment_smash & ENVIRONMENT_SMASH_WALLS) || (M.environment_smash & ENVIRONMENT_SMASH_RWALLS))
playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)
@@ -137,8 +140,6 @@
return TRUE
/turf/closed/wall/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
if(!user.CheckActionCooldown(CLICK_CD_MELEE))
return
to_chat(user, "<span class='notice'>You push the wall but nothing happens!</span>")
playsound(src, 'sound/weapons/genhit.ogg', 25, 1)
add_fingerprint(user)
@@ -154,6 +155,7 @@
if(!isturf(user.loc))
return //can't do this stuff whilst inside objects and such
user.DelayNextAction()
add_fingerprint(user)
var/turf/T = user.loc //get user's location for delay checks