Screw commit history.

This commit is contained in:
Ghommie
2020-02-02 01:26:04 +01:00
parent b1a571bf2d
commit 95db5084ab
267 changed files with 2201 additions and 1848 deletions
+4 -2
View File
@@ -12,7 +12,7 @@
var/datum/armor/armor
var/obj_integrity //defaults to max_integrity
var/max_integrity = 500
var/integrity_failure = 0 //0 if we have no special broken behavior
var/integrity_failure = 0 //0 if we have no special broken behavior, otherwise is a percentage of at what point the obj breaks. 0.5 being 50%
var/resistance_flags = NONE // INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ON_FIRE | UNACIDABLE | ACID_PROOF
@@ -46,7 +46,6 @@
return ..()
/obj/Initialize()
. = ..()
if (islist(armor))
armor = getArmor(arglist(armor))
else if (!armor)
@@ -56,6 +55,9 @@
if(obj_integrity == null)
obj_integrity = max_integrity
. = ..() //Do this after, else mat datums is mad.
if (set_obj_flags)
var/flagslist = splittext(set_obj_flags,";")
var/list/string_to_objflag = GLOB.bitfields["obj_flags"]