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

Deconflict

Browse Source
This commit is contained in:
variableundefined
2019-09-11 23:00:13 -04:00
parent 69537dd60c 4867e8d6b7
commit db211cfc54
122 changed files with 1161 additions and 846 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+1 -1
View File
@@ -25,7 +25,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
var/w_class = WEIGHT_CLASS_NORMAL
var/slot_flags = 0 //This is used to determine on which slots an item can fit.
pass_flags = PASSTABLE
pressure_resistance = 3
pressure_resistance = 4
// causeerrorheresoifixthis
var/obj/item/master = null