cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12215 from KillianKirilenko/8371-fix

Browse Source 
Wall Decon Merge Fix
This commit is contained in:
Casey
2022-02-13 16:36:02 -05:00
committed by GitHub
parent fe109a0972 8a8c5f1b1a
commit ee9321d7e0
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/wall_attacks.dm
-3
View File
@@ -240,10 +240,7 @@
return
// Basic dismantling.
<<<<<<< HEAD
=======
var/dismantle_toolspeed = 0
>>>>>>> 6489e47e1a7... Merge pull request #8371 from Atermonera/wall_deconstruction_fix
if(isnull(construction_stage) || !reinf_material)
var/cut_delay = 60 - material.cut_delay