Merge pull request #12245 from Fox-McCloud/universal-damage

Universal Object Damage

code/controllers/subsystem/acid.dm

@@ -0,0 +1,36 @@
+SUBSYSTEM_DEF(acid)
+	name = "Acid"
+	priority = FIRE_PRIORITY_ACID
+	flags = SS_NO_INIT|SS_BACKGROUND
+	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+
+	var/list/currentrun = list()
+	var/list/processing = list()
+
+/datum/controller/subsystem/acid/stat_entry()
+	..("P:[processing.len]")
+
+
+/datum/controller/subsystem/acid/fire(resumed = 0)
+	if(!resumed)
+		src.currentrun = processing.Copy()
+
+	//cache for sanic speed (lists are references anyways)
+	var/list/currentrun = src.currentrun
+
+	while(currentrun.len)
+		var/obj/O = currentrun[currentrun.len]
+		currentrun.len--
+		if(!O || QDELETED(O))
+			processing -= O
+			if(MC_TICK_CHECK)
+				return
+			continue
+
+		if(O.acid_level && O.acid_processing())
+		else
+			O.cut_overlay(GLOB.acid_overlay, TRUE)
+			processing -= O
+
+		if(MC_TICK_CHECK)
+			return

code/controllers/subsystem/fires.dm

@@ -27,11 +27,11 @@ SUBSYSTEM_DEF(fires)
 				return
 			continue
 
-		if(O.burn_state == ON_FIRE)
-			if(O.burn_world_time < world.time)
-				O.burn()
-		else
-			processing -= O
+		if(O.resistance_flags & ON_FIRE) //in case an object is extinguished while still in currentrun
+			if(!(O.resistance_flags & FIRE_PROOF))
+				O.take_damage(20, BURN, "fire", 0)
+			else
+				O.extinguish()
 
 		if(MC_TICK_CHECK)
 			return