cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compile fixes

Browse Source
This commit is contained in:
ZomgPonies
2014-01-25 12:40:47 -05:00
parent 2e5fc8a4fc
commit f084d49d24
3 changed files with 51 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/extinguisher.dm
-10
View File
@@ -14,16 +14,6 @@
force = 10
m_amt = 90
attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
<<<<<<< HEAD
var/list/reagents_to_log=list(
"fuel"= "welder fuel",
"plasma"= "plasma",
"pacid"= "polytrinic acid",
"sacid"= "sulphuric acid"
)
=======
>>>>>>> 6ff7901... Add additional extinguisher logging, transfer logging framework.
var/max_water = 50
var/last_use = 1.0
var/safety = 1