shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7113 from Citadel-Station-13/upstream-merge-38500

Browse Source 
[MIRROR] Fixes attacking wooden walls
This commit is contained in:
LetterJay
2018-06-16 16:17:28 -05:00
committed by GitHub
parent 1a5021b9c5 902a234f56
commit 351f43a392
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/wall/mineral_walls.dm
+2 -2
View File
@@ -134,8 +134,8 @@
canSmoothWith = list(/turf/closed/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/closed/wall/mineral/wood/nonmetal)
/turf/closed/wall/mineral/wood/attackby(obj/item/W, mob/user)
var/duration = (48/W.force) * 2 //In seconds, for now.
if(W.sharpness)
if(W.sharpness && W.force)
var/duration = (48/W.force) * 2 //In seconds, for now.
if(istype(W, /obj/item/hatchet) || istype(W, /obj/item/twohanded/fireaxe))
duration /= 4 //Much better with hatchets and axes.
if(do_after(user, duration*10, target=src)) //Into deciseconds.