mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-23 03:57:48 +01:00
Merge pull request #12087 from VOREStation/upstream-merge-8371
[MIRROR] Fixes literally everything dismantling walls
This commit is contained in:
@@ -240,6 +240,7 @@
|
||||
return
|
||||
|
||||
// Basic dismantling.
|
||||
var/dismantle_toolspeed = 0
|
||||
if(isnull(construction_stage) || !reinf_material)
|
||||
|
||||
var/cut_delay = 60 - material.cut_delay
|
||||
@@ -259,6 +260,7 @@
|
||||
else if(istype(W,/obj/item/weapon/melee/energy/blade))
|
||||
dismantle_sound = "sparks"
|
||||
dismantle_verb = "slicing"
|
||||
dismantle_toolspeed = 1
|
||||
cut_delay *= 0.5
|
||||
else if(istype(W,/obj/item/weapon/pickaxe))
|
||||
var/obj/item/weapon/pickaxe/P = W
|
||||
@@ -272,7 +274,7 @@
|
||||
if(dismantle_sound)
|
||||
playsound(src, dismantle_sound, 100, 1)
|
||||
|
||||
if(cut_delay<0)
|
||||
if(cut_delay < 0)
|
||||
cut_delay = 0
|
||||
|
||||
if(!do_after(user,cut_delay * W.toolspeed))
|
||||
@@ -386,7 +388,7 @@
|
||||
construction_stage = 0
|
||||
user.update_examine_panel(src)
|
||||
update_icon()
|
||||
to_chat(user, "<span class='notice'>The slice through the support rods.</span>")
|
||||
to_chat(user, "<span class='notice'>You slice through the support rods.</span>")
|
||||
return
|
||||
if(0)
|
||||
if(W.is_crowbar())
|
||||
|
||||
Reference in New Issue
Block a user