Flammable Items, Abstractness, and hypnosis (#19267)

* Laser Eyes

* Update dna.dm

* Mecha

* Update positive_genes.dm

* These

* These 2

* yeh

* Rest of these

* Update turf.dm

* Update food.dm

* Some moar

* mooove

* Update vorestation.dme

* Update burning.dm

* firesuit

* flags

* HYPNOCOLOR

* xd

* no filter

* dc

* Update ore_bag.dm

* Update misc.dm

* Update misc.dm

code/game/mecha/components/_component.dm

@@ -17,7 +17,7 @@
 
 	var/integrity
 	var/integrity_danger_mod = 0.5	// Multiplier for comparison to max_integrity before problems start.
-	var/max_integrity = 100
+	max_integrity = 100
 
 	var/step_delay = 0
 

code/game/mecha/equipment/mecha_equipment.dm

@@ -12,7 +12,7 @@
 	var/equip_ready = TRUE
 	var/energy_drain = 0
 	var/obj/mecha/chassis = null
-	var/range = MELEE //bitflags
+	var/range = MECH_MELEE //bitflags
 	/// Bitflag. Used by exosuit fabricator to assign sub-categories based on which exosuits can equip this.
 	var/mech_flags = NONE
 	var/salvageable = TRUE
@@ -117,7 +117,7 @@
 	return range&RANGED
 
 /obj/item/mecha_parts/mecha_equipment/proc/is_melee()
-	return range&MELEE
+	return range&MECH_MELEE
 
 /obj/item/mecha_parts/mecha_equipment/proc/enable_special_checks(atom/target)
 	if(ispath(required_type))

code/game/mecha/equipment/tools/catapult.dm

@@ -5,7 +5,7 @@
 	origin_tech = list(TECH_BLUESPACE = 2, TECH_MAGNET = 3)
 	equip_cooldown = 10
 	energy_drain = 100
-	range = MELEE|RANGED
+	range = MECH_MELEE|RANGED
 	var/atom/movable/locked
 	var/mode = 1 //1 - gravsling 2 - gravpush
 

code/game/mecha/equipment/tools/extinguisher.dm

@@ -5,7 +5,7 @@
 	icon_state = "mecha_exting"
 	equip_cooldown = 5
 	energy_drain = 0
-	range = MELEE|RANGED
+	range = MECH_MELEE|RANGED
 	required_type = list(/obj/mecha/working)
 	var/spray_particles = 5
 	var/spray_amount = 5	//units of liquid per particle. 5 is enough to wet the floor - it's a big fire extinguisher, so should be fine

code/game/mecha/equipment/tools/generator.dm

@@ -5,7 +5,7 @@
 	origin_tech = list(TECH_PHORON = 2, TECH_POWER = 2, TECH_ENGINEERING = 1)
 	equip_cooldown = 10
 	energy_drain = 0
-	range = MELEE
+	range = MECH_MELEE
 	var/coeff = 100
 	var/obj/item/stack/material/fuel
 	var/fuel_type = /obj/item/stack/material/phoron

code/game/mecha/equipment/tools/inflatables.dm

@@ -5,7 +5,7 @@
 	origin_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3)
 	equip_cooldown = 3
 	energy_drain = 30
-	range = MELEE
+	range = MECH_MELEE
 	equip_type = EQUIP_UTILITY
 	ready_sound = 'sound/effects/spray.ogg'
 	required_type = list(/obj/mecha/working/ripley)

code/game/mecha/equipment/tools/orescanner.dm

@@ -5,7 +5,7 @@
 	origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2, TECH_POWER = 2)
 	equip_cooldown = 5
 	energy_drain = 30
-	range = MELEE|RANGED
+	range = MECH_MELEE|RANGED
 	equip_type = EQUIP_SPECIAL
 	ready_sound = 'sound/items/goggles_charge.ogg'
 	required_type = list(/obj/mecha/working/ripley)

code/game/mecha/equipment/tools/passenger.dm

@@ -4,7 +4,7 @@
 	icon_state = "mecha_passenger"
 	origin_tech = list(TECH_ENGINEERING = 1, TECH_BIO = 1)
 	energy_drain = 10
-	range = MELEE
+	range = MECH_MELEE
 	equip_cooldown = 20
 	var/mob/living/carbon/occupant = null
 	var/door_locked = 1

code/game/mecha/equipment/tools/powertool.dm

@@ -5,7 +5,7 @@
 	origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2, TECH_POWER = 2)
 	equip_cooldown = 3
 	energy_drain = 15
-	range = MELEE
+	range = MECH_MELEE
 	equip_type = EQUIP_UTILITY
 	ready_sound = 'sound/items/Ratchet.ogg'
 	required_type = list(/obj/mecha/working/ripley)

code/game/mecha/equipment/tools/rcd.dm

@@ -6,7 +6,7 @@
 	origin_tech = list(TECH_MATERIAL = 4, TECH_BLUESPACE = 3, TECH_MAGNET = 4, TECH_POWER = 4)
 	equip_cooldown = 10
 	energy_drain = 250
-	range = MELEE|RANGED
+	range = MECH_MELEE|RANGED
 	equip_type = EQUIP_SPECIAL
 	var/obj/item/rcd/electric/mounted/mecha/my_rcd = null
 

code/game/mecha/equipment/tools/sleeper.dm

@@ -5,7 +5,7 @@
 	icon_state = "sleeper_0"
 	origin_tech = list(TECH_DATA = 2, TECH_BIO = 3)
 	energy_drain = 20
-	range = MELEE
+	range = MECH_MELEE
 	equip_cooldown = 30
 	mech_flags = EXOSUIT_MODULE_MEDICAL
 	var/mob/living/carbon/human/occupant = null

code/game/mecha/equipment/tools/syringe_gun.dm

@@ -13,7 +13,7 @@
 	energy_drain = 10
 	var/mode = 0 //0 - fire syringe, 1 - analyze reagents.
 	var/datum/global_iterator/mech_synth/synth
-	range = MELEE|RANGED
+	range = MECH_MELEE|RANGED
 	equip_cooldown = 10
 	origin_tech = list(TECH_MATERIAL = 3, TECH_BIO = 4, TECH_MAGNET = 4, TECH_DATA = 3)
 	required_type = list(/obj/mecha/medical)
@@ -280,7 +280,7 @@
 	desc = "A small shoulder-mounted dronebay containing a rapid response drone capable of moderately stabilizing a patient near the exosuit."
 	icon_state = "mecha_dronebay"
 	origin_tech = list(TECH_PHORON = 3, TECH_MAGNET = 6, TECH_BIO = 5, TECH_DATA = 4)
-	range = MELEE|RANGED
+	range = MECH_MELEE|RANGED
 	equip_cooldown = 3 SECONDS
 	required_type = list(/obj/mecha/medical)
 
@@ -496,7 +496,7 @@
 	origin_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 5, TECH_BIO = 5)
 	equip_cooldown = 5 SECONDS
 	energy_drain = 100
-	range = MELEE
+	range = MECH_MELEE
 	equip_type = EQUIP_UTILITY
 	ready_sound = 'sound/weapons/flash.ogg'
 	required_type = list(/obj/mecha/medical)

code/game/mecha/equipment/tools/weldinglaser.dm

@@ -5,7 +5,7 @@
 	origin_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 3, TECH_POWER = 4, TECH_PHORON = 2)
 	equip_cooldown = 3
 	energy_drain = 15
-	range = MELEE
+	range = MECH_MELEE
 	equip_type = EQUIP_UTILITY
 	ready_sound = 'sound/items/Ratchet.ogg'
 	required_type = list(/obj/mecha/working/ripley)
@@ -27,8 +27,8 @@
 	..()
 
 	if(enable_special)
-		range = MELEE|RANGED
+		range = MECH_MELEE|RANGED
 		my_tool.reach = 7
 	else
-		range = MELEE
+		range = MECH_MELEE
 		my_tool.reach = 1