cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.

Browse Source 
This just adds some vars that the refactor will use. Putting this in a separate PR prevent the damage refactor PR from becoming too big (number of files changed) and hard to read and review.

Introduces the resistance_flags bitflag that replaces unacidable and burn_state.
Moves the armor var from item to /obj level and gives specific armor values to many objects, the armor list also gets two new armor types: fire and acid, which will be used in the refactor. the new fire and acid armor values are given to plenty of items.
This commit is contained in:
phil235
2016-09-27 22:33:08 +02:00
parent b84064412b
commit 2d2975f783
199 changed files with 562 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/subsystem/processing/objects.dm
View File

@@ -56,7 +56,7 @@ var/datum/subsystem/objects/SSobj
return
for(var/obj/burningobj in SSobj.burning)
if(burningobj && (burningobj.burn_state == ON_FIRE))
if(burningobj && (burningobj.resistance_flags & ON_FIRE))
if(burningobj.burn_world_time < world.time)
burningobj.burn()
else