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

Update weldingtool.dm

Browse Source
This commit is contained in:
Novacat
2020-03-08 03:25:18 -04:00
committed by GitHub
parent acc712e1d5
commit 3c06d62345
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/tools/weldingtool.dm
-4
View File
@@ -656,9 +656,6 @@
/obj/item/weapon/weldingtool/electric/mounted/cyborg
toolspeed = 0.5
<<<<<<< HEAD
#undef WELDER_FUEL_BURN_INTERVAL
=======
/obj/item/weapon/weldingtool/electric/mounted/exosuit
var/obj/item/mecha_parts/mecha_equipment/equip_mount = null
flame_intensity = 1
@@ -682,4 +679,3 @@
setWelding(FALSE, M.occupant)
#undef WELDER_FUEL_BURN_INTERVAL
>>>>>>> 51fd39f... Exosuit Expansion: Return of the Ripley (#6767)