Exosuit Expansion: Return of the Ripley (#6767)

* Expands further upon Exosuits.

* FixFix Inflatable Deployer

* Changelog, fix oversights.

* Burst.

* Default 0

code/modules/mob/_modifiers/fire.dm

@@ -0,0 +1,36 @@
+// Ignition, but confined to the modifier system.
+// This makes it more predictable and thus, easier to balance.
+/datum/modifier/fire
+	name = "on fire"
+	desc = "You are on fire! You will be harmed until the fire goes out or you extinguish it with water."
+	mob_overlay_state = "on_fire"
+
+	on_created_text = "<span class='danger'>You burst into flames!</span>"
+	on_expired_text = "<span class='warning'>The fire starts to fade.</span>"
+	stacks = MODIFIER_STACK_ALLOWED // Multiple instances will hurt a lot.
+	var/damage_per_tick = 5
+
+/datum/modifier/fire/intense
+	mob_overlay_state = "on_fire_intense"
+	damage_per_tick = 10
+
+/datum/modifier/fire/tick()
+	holder.inflict_heat_damage(damage_per_tick)
+
+/*
+ * Modifier used by projectiles, like the flamethrower, that rely heavily on fire_stacks to persist.
+ */
+
+/datum/modifier/fire/stack_managed/tick()
+	..()
+
+	if(!holder.fire_stacks || holder.fire_stacks < 0)
+		if(prob(10))
+			expire()
+
+	else if(holder.fire_stacks > 0)
+		holder.fire_stacks -= 1
+
+/datum/modifier/fire/stack_managed/intense
+	mob_overlay_state = "on_fire_intense"
+	damage_per_tick = 10

code/modules/mob/_modifiers/modifiers_misc.dm

@@ -224,28 +224,6 @@ the artifact triggers the rage.
 
 	accuracy_dispersion = 2			// A combination of fear and immense pain or damage reults in a twitching firing arm. Flee.
 
-
-
-// Ignition, but confined to the modifier system.
-// This makes it more predictable and thus, easier to balance.
-/datum/modifier/fire
-	name = "on fire"
-	desc = "You are on fire! You will be harmed until the fire goes out or you extinguish it with water."
-	mob_overlay_state = "on_fire"
-
-	on_created_text = "<span class='danger'>You combust into flames!</span>"
-	on_expired_text = "<span class='warning'>The fire starts to fade.</span>"
-	stacks = MODIFIER_STACK_ALLOWED // Multiple instances will hurt a lot.
-	var/damage_per_tick = 5
-
-/datum/modifier/fire/intense
-	mob_overlay_state = "on_fire_intense"
-	damage_per_tick = 10
-
-/datum/modifier/fire/tick()
-	holder.inflict_heat_damage(damage_per_tick)
-
-
 // Applied when near something very cold.
 // Reduces mobility, attack speed.
 /datum/modifier/chilled

code/modules/mob/living/damage_procs.dm

@@ -109,5 +109,9 @@
 	if(drowsy)		apply_effect(drowsy, DROWSY, blocked)
 	if(agony)		apply_effect(agony, AGONY, blocked)
 	if(flammable)	adjust_fire_stacks(flammable)
-	if(ignite)		IgniteMob()
+	if(ignite)
+		if(ignite >= 3)
+			add_modifier(/datum/modifier/fire/stack_managed/intense, 60 SECONDS)
+		else
+			add_modifier(/datum/modifier/fire/stack_managed, 45 * ignite SECONDS)
 	return 1