Merge pull request #15558 from SandPoot/mechs-are-vehicles

/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
parent df7d834098 1bb76168c4
commit dee1db4a3a
385 changed files with 7186 additions and 7325 deletions
@@ -9,7 +9,7 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "d" = (
-/obj/mecha/working/ripley/mining,
+/obj/vehicle/sealed/mecha/working/ripley/mining,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "e" = (
@@ -102,7 +102,7 @@
 /turf/open/floor/mineral/titanium/yellow/airless,
 /area/ruin/space/has_grav/powered/mechtransport)
 "A" = (
-/obj/mecha/working/ripley,
+/obj/vehicle/sealed/mecha/working/ripley,
 /turf/open/floor/mineral/titanium/yellow/airless,
 /area/ruin/space/has_grav/powered/mechtransport)
 "B" = (
@@ -14451,7 +14451,7 @@
 /turf/open/floor/plasteel/dark,
 /area/awaymission/snowdin/post/mining_main/mechbay)
 "In" = (
-/obj/mecha/working/ripley/mining{
+/obj/vehicle/sealed/mecha/working/ripley/mining{
 	dir = 1;
 	icon_state = "ripley"
 	},
@@ -2039,7 +2039,7 @@
 	},
 /area/awaymission/caves/BMP_asteroid)
 "gC" = (
-/obj/mecha/working/ripley/mining,
+/obj/vehicle/sealed/mecha/working/ripley/mining,
 /turf/open/floor/plasteel/recharge_floor,
 /area/awaymission/caves/BMP_asteroid)
 "gD" = (
@@ -14452,7 +14452,7 @@
 /turf/open/floor/plasteel/dark,
 /area/awaymission/snowdin/post/mining_main/mechbay)
 "In" = (
-/obj/mecha/working/ripley/mining{
+/obj/vehicle/sealed/mecha/working/ripley/mining{
 	dir = 1
 	},
 /obj/effect/turf_decal/bot,
@@ -4981,7 +4981,7 @@
 /turf/open/floor/wood,
 /area/eventmap/inside)
 "aoJ" = (
-/obj/mecha/working/ripley/deathripley{
+/obj/vehicle/sealed/mecha/working/ripley/deathripley{
 	equipment_disabled = 1;
 	light_color = "#FAA019";
 	lights_power = 3
@@ -31,12 +31,21 @@
 #define COOLDOWN_OBJECTIVES	"objectives"
 #define COOLDOWN_OBJ_ADMIN_PING	"obj_admin_ping"

+
+//Mecha cooldowns
+#define COOLDOWN_MECHA_MESSAGE "mecha_message"
+#define COOLDOWN_MECHA_EQUIPMENT "mecha_equipment"
+#define COOLDOWN_MECHA_ARMOR "mecha_armor"
+#define COOLDOWN_MECHA_MELEE_ATTACK "mecha_melee"
+#define COOLDOWN_MECHA_SMOKE "mecha_smoke"
+
 //car cooldowns
 #define COOLDOWN_CAR_HONK "car_honk"

 //clown car cooldowns
 #define COOLDOWN_CLOWNCAR_RANDOMNESS "clown_car_randomness"

+
 //TIMER COOLDOWN MACROS

 #define COMSIG_CD_STOP(cd_index) "cooldown_[cd_index]"
@@ -527,7 +527,19 @@
 #define COMSIG_PROJECTILE_PREHIT "com_proj_prehit"				///sent to targets during the process_hit proc of projectiles

 #define COMSIG_PELLET_CLOUD_INIT "pellet_cloud_init"				// sent to targets during the process_hit proc of projectiles
+// /obj/vehicle/sealed/mecha signals
+// /sent from mecha action buttons to the mecha they're linked to
+#define COMSIG_MECHA_ACTION_TRIGGER "mecha_action_activate"

+///sent from clicking while you have no equipment selected. Sent before cooldown and adjacency checks, so you can use this for infinite range things if you want.
+#define COMSIG_MECHA_MELEE_CLICK "mecha_action_melee_click"
+	/// Prevents click from happening.
+	#define COMPONENT_CANCEL_MELEE_CLICK (1<<0)
+///sent from clicking while you have equipment selected.
+#define COMSIG_MECHA_EQUIPMENT_CLICK "mecha_action_equipment_click"
+	/// Prevents click from happening.
+	#define COMPONENT_CANCEL_EQUIPMENT_CLICK (1<<0)
+	
 // /mob/living/carbon/human signals
 #define COMSIG_HUMAN_MELEE_UNARMED_ATTACK "human_melee_unarmed_attack"			//from mob/living/carbon/human/UnarmedAttack(): (atom/target)
 #define COMSIG_HUMAN_MELEE_UNARMED_ATTACKBY "human_melee_unarmed_attackby"		//from mob/living/carbon/human/UnarmedAttack(): (mob/living/carbon/human/attacker)
@@ -207,7 +207,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(

 #define ismachinery(A) (istype(A, /obj/machinery))

-#define ismecha(A) (istype(A, /obj/mecha))
+#define ismecha(A) (istype(A, /obj/vehicle/sealed/mecha))

 #define is_cleanable(A) (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/rune)) //if something is cleanable

@@ -39,6 +39,7 @@
 #define LOG_ADMIN_PRIVATE (1 << 14)
 #define LOG_ASAY		(1 << 15)
 #define LOG_VIRUS		(1 << 16)
+#define LOG_MECHA (1 << 17)
 #define LOG_SHUTTLE		(1 << 18)
 #define LOG_VICTIM 		(1 << 19)

@@ -0,0 +1,31 @@
+#define MECHA_INT_FIRE (1<<0)
+#define MECHA_INT_TEMP_CONTROL (1<<1)
+#define MECHA_INT_SHORT_CIRCUIT (1<<2)
+#define MECHA_INT_TANK_BREACH (1<<3)
+#define MECHA_INT_CONTROL_LOST (1<<4)
+
+#define ADDING_ACCESS_POSSIBLE (1<<0)
+#define ADDING_MAINT_ACCESS_POSSIBLE (1<<1)
+#define CANSTRAFE (1<<2)
+#define LIGHTS_ON (1<<3)
+#define SILICON_PILOT (1<<4)
+#define IS_ENCLOSED (1<<5)
+#define HAS_LIGHTS (1<<6)
+#define QUIET_STEPS (1<<7)
+#define QUIET_TURNS (1<<8)
+///blocks using equipment and melee attacking.
+#define CANNOT_INTERACT (1<<9)
+/// posibrains can drive this mecha
+#define MMI_COMPATIBLE (1<<10)
+
+#define MECHA_MELEE (1 << 0)
+#define MECHA_RANGED (1 << 1)
+
+#define MECHA_FRONT_ARMOUR 1
+#define MECHA_SIDE_ARMOUR 2
+#define MECHA_BACK_ARMOUR 3
+
+#define MECHA_LOCKED 0
+#define MECHA_SECURE_BOLTS 1
+#define MECHA_LOOSE_BOLTS 2
+#define MECHA_OPEN_HATCH 3
@@ -230,7 +230,7 @@
 #define TRAIT_HUMAN_NO_RENDER			"human_no_render"
 #define TRAIT_TRASHCAN					"trashcan"
 ///Used for fireman carry to have mobe not be dropped when passing by a prone individual.
-#define TRAIT_BEING_CARRIED "being_carried"	
+#define TRAIT_BEING_CARRIED "being_carried"

 // mobility flag traits
 // IN THE FUTURE, IT WOULD BE NICE TO DO SOMETHING SIMILAR TO https://github.com/tgstation/tgstation/pull/48923/files (ofcourse not nearly the same because I have my.. thoughts on it)
@@ -11,6 +11,11 @@
 ///changing around settings and the like.
 #define VEHICLE_CONTROL_SETTINGS (1<<4)

+
+///ez define for giving a single pilot mech all the flags it needs.
+#define FULL_MECHA_CONTROL ALL
+
+
 //car_traits flags
 ///Will this car kidnap people by ramming into them?
 #define CAN_KIDNAP (1<<0)
@@ -77,6 +77,10 @@
 	if (CONFIG_GET(flag/log_game))
 		WRITE_LOG(GLOB.world_game_log, "GAME: [text]")

+/proc/log_mecha(text)
+	if (CONFIG_GET(flag/log_mecha))
+		WRITE_LOG(GLOB.world_mecha_log, "MECHA: [text]")
+
 /proc/log_virus(text)
 	if (CONFIG_GET(flag/log_virus))
 		WRITE_LOG(GLOB.world_virus_log, "VIRUS: [text]")
@@ -33,8 +33,8 @@ GLOBAL_VAR(query_debug_log)
 GLOBAL_PROTECT(query_debug_log)
 GLOBAL_VAR(world_job_debug_log)
 GLOBAL_PROTECT(world_job_debug_log)
-// GLOBAL_VAR(world_mecha_log)
-// GLOBAL_PROTECT(world_mecha_log)
+GLOBAL_VAR(world_mecha_log)
+GLOBAL_PROTECT(world_mecha_log)
 GLOBAL_VAR(world_virus_log)
 GLOBAL_PROTECT(world_virus_log)
 GLOBAL_VAR(world_asset_log)
@@ -55,11 +55,6 @@
 	if(modifiers["shift"] && modifiers["ctrl"])
 		CtrlShiftClickOn(A)
 		return
-	if(modifiers["middle"])
-		if(controlled_mech) //Are we piloting a mech? Placed here so the modifiers are not overridden.
-			controlled_mech.click_action(A, src, params) //Override AI normal click behavior.
-		return
-
 	if(modifiers["shift"])
 		ShiftClickOn(A)
 		return
@@ -82,11 +82,6 @@
 	if(!modifiers["catcher"] && A.IsObscured())
 		return

-	if(ismecha(loc))
-		var/obj/mecha/M = loc
-		M.click_action(A,src,params)
-		return TRUE
-
 	if(restrained())
 		DelayNextAction(CLICK_CD_HANDCUFFED)
 		return RestrainedClickOn(A)
@@ -349,7 +349,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 /// Simply checks if the other person is still in range
 /atom/movable/screen/alert/give/proc/check_in_range(atom/taker)
 	SIGNAL_HANDLER
-	
+
 	if(!offerer.CanReach(taker))
 		to_chat(owner, span_warning("You moved out of range of [offerer]!"))
 		owner.clear_alert("[offerer]")
@@ -820,7 +820,7 @@ so as to remain in compliance with the most up-to-date laws."
 		return FALSE
 	if(master && click_master)
 		return usr.client.Click(master, location, control, params)
-	
+
 	return TRUE

 /atom/movable/screen/alert/Destroy()
@@ -11,10 +11,6 @@
 	if(!modifiers["catcher"] && A.IsObscured())
 		return

-	if(ismecha(loc))
-		var/obj/mecha/M = loc
-		return M.click_action(A,src,params)
-
 	if(restrained())
 		DelayNextAction(CLICK_CD_HANDCUFFED)
 		return RestrainedClickOn(A)
@@ -381,14 +381,14 @@
 /*~~~~~~~~~~~~~~~~~~~~
 	BIG STOMPY MECHS
 ~~~~~~~~~~~~~~~~~~~~~*/
-/obj/mecha/proc/diag_hud_set_mechhealth()
+/obj/vehicle/sealed/mecha/proc/diag_hud_set_mechhealth()
 	var/image/holder = hud_list[DIAG_MECH_HUD]
 	var/icon/I = icon(icon, icon_state, dir)
 	holder.pixel_y = I.Height() - world.icon_size
 	holder.icon_state = "huddiag[RoundDiagBar(obj_integrity/max_integrity)]"


-/obj/mecha/proc/diag_hud_set_mechcell()
+/obj/vehicle/sealed/mecha/proc/diag_hud_set_mechcell()
 	var/image/holder = hud_list[DIAG_BATT_HUD]
 	var/icon/I = icon(icon, icon_state, dir)
 	holder.pixel_y = I.Height() - world.icon_size
@@ -399,7 +399,7 @@
 		holder.icon_state = "hudnobatt"


-/obj/mecha/proc/diag_hud_set_mechstat()
+/obj/vehicle/sealed/mecha/proc/diag_hud_set_mechstat()
 	var/image/holder = hud_list[DIAG_STAT_HUD]
 	var/icon/I = icon(icon, icon_state, dir)
 	holder.pixel_y = I.Height() - world.icon_size
@@ -407,7 +407,7 @@
 	if(internal_damage)
 		holder.icon_state = "hudwarn"

-/obj/mecha/proc/diag_hud_set_mechtracking() //Shows tracking beacons on the mech
+/obj/vehicle/sealed/mecha/proc/diag_hud_set_mechtracking() //Shows tracking beacons on the mech
 	var/image/holder = hud_list[DIAG_TRACK_HUD]
 	var/icon/I = icon(icon, icon_state, dir)
 	holder.pixel_y = I.Height() - world.icon_size
@@ -31,6 +31,10 @@
 /datum/config_entry/flag/log_game
 	config_entry_value = TRUE

+/// log mech data
+/datum/config_entry/flag/log_mecha
+	config_entry_value = TRUE
+
 /// log virology data
 /datum/config_entry/flag/log_virus
 	config_entry_value = TRUE
@@ -159,7 +159,7 @@ SUBSYSTEM_DEF(traumas)
 						/obj/item/storage/backpack/mime, /obj/item/reagent_containers/food/snacks/grown/banana/mime,
 						/obj/item/grown/bananapeel/mimanapeel, /obj/item/cartridge/virus/mime, /obj/item/clothing/shoes/sneakers/mime,
 						/obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret,
-						/obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)),
+						/obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/vehicle/sealed/mecha/combat/reticence)),

 					"cats" = typecacheof(list(/obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty,
 						/obj/item/clothing/head/collectable/kitty, /obj/item/melee/chainofcommand/tailwhip/kitty, /obj/item/stack/sheet/animalhide/cat)),
@@ -169,7 +169,7 @@ SUBSYSTEM_DEF(traumas)
 						/obj/structure/fluff/empty_sleeper/syndicate, /obj/item/implant/radio/syndicate, /obj/item/clothing/head/helmet/space/syndicate, /obj/machinery/nuclearbomb/syndicate, /obj/item/grenade/syndieminibomb, /obj/item/storage/backpack/duffelbag/syndie, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver,
 						/obj/item/gun/ballistic/automatic/shotgun/bulldog, /obj/item/gun/ballistic/automatic/c20r, /obj/item/gun/ballistic/automatic/m90, /obj/item/gun/ballistic/automatic/l6_saw, /obj/item/storage/belt/grenade/full, /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate, /obj/item/gun/energy/kinetic_accelerator/crossbow,
 						/obj/item/melee/transforming/energy/sword/saber, /obj/item/dualsaber, /obj/item/melee/powerfist, /obj/item/storage/box/syndie_kit, /obj/item/grenade/spawnergrenade/manhacks, /obj/item/grenade/chem_grenade/bioterrorfoam, /obj/item/reagent_containers/spray/chemsprayer/bioterror, /obj/item/ammo_box/magazine/m10mm,
-						/obj/item/ammo_box/magazine/pistolm9mm, /obj/item/ammo_box/a357, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/mm195x129, /obj/item/antag_spawner/nuke_ops, /obj/mecha/combat/gygax/dark, /obj/mecha/combat/marauder/mauler, /obj/item/soap/syndie, /obj/item/gun/syringe/syndicate, /obj/item/cartridge/virus/syndicate,
+						/obj/item/ammo_box/magazine/pistolm9mm, /obj/item/ammo_box/a357, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/mm195x129, /obj/item/antag_spawner/nuke_ops, /obj/vehicle/sealed/mecha/combat/gygax/dark, /obj/vehicle/sealed/mecha/combat/marauder/mauler, /obj/item/soap/syndie, /obj/item/gun/syringe/syndicate, /obj/item/cartridge/virus/syndicate,
 						/obj/item/cartridge/virus/frame, /obj/item/chameleon, /obj/item/storage/box/syndie_kit/cutouts, /obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/card/emag, /obj/item/storage/toolbox/syndicate, /obj/item/storage/book/bible/syndicate, /obj/item/encryptionkey/binary, /obj/item/encryptionkey/syndicate, /obj/item/aiModule/syndicate,
 						/obj/item/clothing/shoes/magboots/syndie, /obj/item/powersink, /obj/item/sbeacondrop, /obj/item/sbeacondrop/bomb, /obj/item/syndicatedetonator, /obj/item/shield/energy, /obj/item/assault_pod, /obj/item/slimepotion/slime/sentience/nuclear, /obj/item/stack/telecrystal, /obj/item/jammer, /obj/item/codespeak_manual/unlimited,
 						/obj/item/toy/cards/deck/syndicate, /obj/item/storage/secure/briefcase/syndie, /obj/item/storage/fancy/cigarettes/cigpack_syndicate, /obj/item/toy/syndicateballoon, /obj/item/clothing/gloves/fingerless/pugilist/rapid, /obj/item/paper/fluff/ruins/thederelict/syndie_mission, /obj/item/organ/cyberimp/eyes/hud/security/syndicate, /obj/item/clothing/head/HoS/syndicate,
@@ -1,5 +1,18 @@
 #define ARMORID "armor-[melee]-[bullet]-[laser]-[energy]-[bomb]-[bio]-[rad]-[fire]-[acid]-[magic]-[wound]"

+#define MELEE "melee"
+#define BULLET "bullet"
+#define LASER "laser"
+#define ENERGY "energy"
+#define BOMB "bomb"
+#define BIO "bio"
+#define RAD "rad"
+#define FIRE "fire"
+#define ACID "acid"
+#define MAGIC "magic"
+#define WOUND "wound"
+
+
 /proc/getArmor(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0, wound = 0)
 	. = locate(ARMORID)
 	if (!.)
@@ -56,7 +69,7 @@
 	return vars[rating]

 /datum/armor/proc/getList()
-	 return list("melee" = melee, "bullet" = bullet, "laser" = laser, "energy" = energy, "bomb" = bomb, "bio" = bio, "rad" = rad, "fire" = fire, "acid" = acid, "magic" = magic, "wound" = wound)
+	 return list(MELEE = melee, BULLET = bullet, LASER = laser, ENERGY = energy, BOMB = bomb, BIO = bio, RAD = rad, FIRE = fire, ACID = acid, MAGIC = magic, WOUND = wound)

 /datum/armor/proc/attachArmor(datum/armor/AA)
 	return getArmor(melee+AA.melee, bullet+AA.bullet, laser+AA.laser, energy+AA.energy, bomb+AA.bomb, bio+AA.bio, rad+AA.rad, fire+AA.fire, acid+AA.acid, magic+AA.magic, wound+AA.wound)
@@ -53,7 +53,7 @@
 	if(!(O.resistance_flags & ACID_PROOF))
 		if(prob(33))
 			playsound(O.loc, 'sound/items/welder.ogg', 150, 1)
-		O.take_damage(min(1 + round(sqrt(level)*0.3), 300), BURN, "acid", 0)
+		O.take_damage(min(1 + round(sqrt(level)*0.3), 300), BURN, ACID, 0)

 	level = max(level - (5 + 3*round(sqrt(level))), 0)
 	if(level <= 0)
@@ -2,7 +2,7 @@
 	var/amount = 0
 	var/maxamount = 3
 	var/upgrade_item = /obj/item/stack/sheet/animalhide/goliath_hide
-	var/datum/armor/added_armor = list("melee" = 10)
+	var/datum/armor/added_armor = list(MELEE = 10)
 	var/upgrade_name

 /datum/component/armor_plate/Initialize(_maxamount,obj/item/_upgrade_item,datum/armor/_added_armor)
@@ -12,7 +12,7 @@
 	RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine)
 	RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/applyplate)
 	RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, .proc/dropplates)
-	if(istype(parent, /obj/mecha/working/ripley))
+	if(istype(parent, /obj/vehicle/sealed/mecha/working/ripley))
 		RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/apply_mech_overlays)

 	if(_maxamount)
@@ -67,7 +67,7 @@
 	O.armor = O.armor.attachArmor(added_armor)

 	if(ismecha(O))
-		var/obj/mecha/R = O
+		var/obj/vehicle/sealed/mecha/R = O
 		R.update_icon()
 		to_chat(user, "<span class='info'>You strengthen [R], improving its resistance against melee, bullet and laser damage.</span>")
 	else
@@ -80,11 +80,11 @@
 		for(var/i in 1 to amount)
 			new upgrade_item(get_turf(parent))

-/datum/component/armor_plate/proc/apply_mech_overlays(obj/mecha/mech, list/overlays)
+/datum/component/armor_plate/proc/apply_mech_overlays(obj/vehicle/sealed/mecha/mech, list/overlays)
 	if(amount)
 		var/overlay_string = "ripley-g"
 		if(amount >= 3)
 			overlay_string += "-full"
-		if(!mech.occupant)
+		if(LAZYLEN(mech.occupants) < 1)
 			overlay_string += "-open"
 		overlays += overlay_string
@@ -152,7 +152,7 @@
 		to_chat(victim, "<span class='userdanger'>[weapon] sticks itself to your [limb.name]!</span>")

 	if(damage > 0)
-		var/armor = victim.run_armor_check(limb.body_zone, "melee", "Your armor has protected your [limb.name].", "Your armor has softened a hit to your [limb.name].",weapon.armour_penetration)
+		var/armor = victim.run_armor_check(limb.body_zone, MELEE, "Your armor has protected your [limb.name].", "Your armor has softened a hit to your [limb.name].",weapon.armour_penetration)
 		limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, blocked=armor, sharpness = weapon.get_sharpness())

 /// Called every time a carbon with a harmful embed moves, rolling a chance for the item to cause pain. The chance is halved if the carbon is crawling or walking.
@@ -145,7 +145,7 @@
 	return !is_mouth_covered()

 /mob/living/carbon/CanSpreadAirborneDisease()
-	return !((head && (head.flags_cover & HEADCOVERSMOUTH) && (head.armor.getRating("bio") >= 25)) || (wear_mask && (wear_mask.flags_cover & MASKCOVERSMOUTH) && (wear_mask.armor.getRating("bio") >= 25)))
+	return !((head && (head.flags_cover & HEADCOVERSMOUTH) && (head.armor.getRating(BIO) >= 25)) || (wear_mask && (wear_mask.flags_cover & MASKCOVERSMOUTH) && (wear_mask.armor.getRating(BIO) >= 25)))

 /mob/living/proc/set_shocked()
 	flags_1 |= SHOCKED_1
@@ -79,7 +79,7 @@
 	var/actual_chance = embed_chance

 	if(!weapon.isEmbedHarmless()) // all the armor in the world won't save you from a kick me sign
-		var/armor = max(victim.run_armor_check(hit_zone, "bullet", silent=TRUE), victim.run_armor_check(hit_zone, "bomb", silent=TRUE)) * 0.5 // we'll be nice and take the better of bullet and bomb armor, halved
+		var/armor = max(victim.run_armor_check(hit_zone, BULLET, silent=TRUE), victim.run_armor_check(hit_zone, BOMB, silent=TRUE)) * 0.5 // we'll be nice and take the better of bullet and bomb armor, halved

 		if(armor) // we only care about armor penetration if there's actually armor to penetrate
 			var/pen_mod = -armor + weapon.armour_penetration // even a little bit of armor can make a big difference for shrapnel with large negative armor pen
@@ -26,7 +26,7 @@
 		return TRUE

 	var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected))
-	var/armor_block = D.run_armor_check(affecting, "melee")
+	var/armor_block = D.run_armor_check(affecting, MELEE)

 	playsound(D.loc, A.dna.species.attack_sound, 25, 1, -1)

@@ -98,7 +98,7 @@

 /datum/martial_art/krav_maga/proc/leg_sweep(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	var/obj/item/bodypart/affecting = D.get_bodypart(BODY_ZONE_CHEST)
-	var/armor_block = D.run_armor_check(affecting, "melee")
+	var/armor_block = D.run_armor_check(affecting, MELEE)
 	var/damage = (damage_roll(A,D)*2 + 25)
 	if(!CHECK_MOBILITY(D, MOBILITY_STAND))
 		return FALSE
@@ -140,7 +140,7 @@

 /datum/martial_art/krav_maga/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
 	var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected))
-	var/armor_block = D.run_armor_check(affecting, "melee")
+	var/armor_block = D.run_armor_check(affecting, MELEE)
 	if(check_streak(A,D))
 		return TRUE
 	log_combat(A, D, "punched")
@@ -165,7 +165,7 @@
 	if(check_streak(A,D))
 		return TRUE
 	var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected))
-	var/armor_block = D.run_armor_check(affecting, "melee")
+	var/armor_block = D.run_armor_check(affecting, MELEE)
 	var/damage = damage_roll(A,D)
 	var/stunthreshold = A.dna.species.punchstunthreshold
 	if(CHECK_MOBILITY(D, MOBILITY_STAND))
@@ -233,4 +233,4 @@
 	heat_protection = HANDS
 	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
 	resistance_flags = NONE
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 50)
@@ -30,7 +30,7 @@ Simple datum which is instanced once per type and is used for every object of sa
 	///This is the amount of value per 1 unit of the material
 	var/value_per_unit = 0
 	///Armor modifiers, multiplies an items normal armor vars by these amounts.
-	var/armor_modifiers = list("melee" = 1, "bullet" = 1, "laser" = 1, "energy" = 1, "bomb" = 1, "bio" = 1, "rad" = 1, "fire" = 1, "acid" = 1)
+	var/armor_modifiers = list(MELEE = 1, BULLET = 1, LASER = 1, ENERGY = 1, BOMB = 1, BIO = 1, RAD = 1, FIRE = 1, ACID = 1)
 	///How beautiful is this material per unit.
 	var/beauty_modifier = 0
 	///Can be used to override the sound items make, lets add some SLOSHing.
@@ -18,7 +18,7 @@
 	sheet_type = /obj/item/stack/sheet/glass
 	value_per_unit = 0.0025
 	beauty_modifier = 0.05
-	armor_modifiers = list("melee" = 0.2, "bullet" = 0.2, "laser" = 0, "energy" = 1, "bomb" = 0, "bio" = 0.2, "rad" = 0.2, "fire" = 1, "acid" = 0.2) // yeah ok
+	armor_modifiers = list(MELEE = 0.2, BULLET = 0.2, LASER = 0, ENERGY = 1, BOMB = 0, BIO = 0.2, RAD = 0.2, FIRE = 1, ACID = 0.2) // yeah ok

 /*
 Color matrices are like regular colors but unlike with normal colors, you can go over 255 on a channel.
@@ -45,7 +45,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	sheet_type = /obj/item/stack/sheet/mineral/gold
 	value_per_unit = 0.0625
 	beauty_modifier = 0.15
-	armor_modifiers = list("melee" = 1.1, "bullet" = 1.1, "laser" = 1.15, "energy" = 1.15, "bomb" = 1, "bio" = 1, "rad" = 1, "fire" = 0.7, "acid" = 1.1)
+	armor_modifiers = list(MELEE = 1.1, BULLET = 1.1, LASER = 1.15, ENERGY = 1.15, BOMB = 1, BIO = 1, RAD = 1, FIRE = 0.7, ACID = 1.1)

 ///Small force increase, for diamond swords
 /datum/material/diamond
@@ -58,7 +58,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	sheet_type = /obj/item/stack/sheet/mineral/diamond
 	value_per_unit = 0.25
 	beauty_modifier = 0.3
-	armor_modifiers = list("melee" = 1.3, "bullet" = 1.3, "laser" = 0.6, "energy" = 1, "bomb" = 1.2, "bio" = 1, "rad" = 1, "fire" = 1, "acid" = 1)
+	armor_modifiers = list(MELEE = 1.3, BULLET = 1.3, LASER = 0.6, ENERGY = 1, BOMB = 1.2, BIO = 1, RAD = 1, FIRE = 1, ACID = 1)

 ///Is slightly radioactive
 /datum/material/uranium
@@ -69,7 +69,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	sheet_type = /obj/item/stack/sheet/mineral/uranium
 	value_per_unit = 0.05
 	beauty_modifier = 0.3 //It shines so beautiful
-	armor_modifiers = list("melee" = 1.5, "bullet" = 1.4, "laser" = 0.5, "energy" = 0.5, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 1, "acid" = 1)
+	armor_modifiers = list(MELEE = 1.5, BULLET = 1.4, LASER = 0.5, ENERGY = 0.5, BOMB = 0, BIO = 0, RAD = 0, FIRE = 1, ACID = 1)

 /datum/material/uranium/on_applied(atom/source, amount, material_flags)
 	. = ..()
@@ -90,7 +90,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	sheet_type = /obj/item/stack/sheet/mineral/plasma
 	value_per_unit = 0.1
 	beauty_modifier = 0.15
-	armor_modifiers = list("melee" = 1.4, "bullet" = 0.7, "laser" = 0, "energy" = 1.2, "bomb" = 0, "bio" = 1.2, "rad" = 1, "fire" = 0, "acid" = 0.5)
+	armor_modifiers = list(MELEE = 1.4, BULLET = 0.7, LASER = 0, ENERGY = 1.2, BOMB = 0, BIO = 1.2, RAD = 1, FIRE = 0, ACID = 0.5)

 /datum/material/plasma/on_applied(atom/source, amount, material_flags)
 	. = ..()
@@ -124,7 +124,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	sheet_type = /obj/item/stack/sheet/mineral/bananium
 	value_per_unit = 0.5
 	beauty_modifier = 0.5
-	armor_modifiers = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 100, "bio" = 0, "rad" = 0, "fire" = 10, "acid" = 0) //Clowns cant be blown away
+	armor_modifiers = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 100, BIO = 0, RAD = 0, FIRE = 10, ACID = 0) //Clowns cant be blown away

 /datum/material/bananium/on_applied(atom/source, amount, material_flags)
 	. = ..()
@@ -147,7 +147,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	sheet_type = /obj/item/stack/sheet/mineral/titanium
 	value_per_unit = 0.0625
 	beauty_modifier = 0.05
-	armor_modifiers = list("melee" = 1.35, "bullet" = 1.3, "laser" = 1.3, "energy" = 1.25, "bomb" = 1.25, "bio" = 1, "rad" = 1, "fire" = 0.7, "acid" = 1)
+	armor_modifiers = list(MELEE = 1.35, BULLET = 1.3, LASER = 1.3, ENERGY = 1.25, BOMB = 1.25, BIO = 1, RAD = 1, FIRE = 0.7, ACID = 1)

 /datum/material/runite
 	name = "runite"
@@ -157,7 +157,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
 	sheet_type = /obj/item/stack/sheet/mineral/runite
 	beauty_modifier = 0.5
-	armor_modifiers = list("melee" = 1.35, "bullet" = 2, "laser" = 0.5, "energy" = 1.25, "bomb" = 1.25, "bio" = 1, "rad" = 1, "fire" = 1.4, "acid" = 1) //rune is weak against magic lasers but strong against bullets. This is the combat triangle.
+	armor_modifiers = list(MELEE = 1.35, BULLET = 2, LASER = 0.5, ENERGY = 1.25, BOMB = 1.25, BIO = 1, RAD = 1, FIRE = 1.4, ACID = 1) //rune is weak against magic lasers but strong against bullets. This is the combat triangle.

 ///Force decrease
 /datum/material/plastic
@@ -168,7 +168,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	sheet_type = /obj/item/stack/sheet/plastic
 	value_per_unit = 0.0125
 	beauty_modifier = -0.01
-	armor_modifiers = list("melee" = 1.5, "bullet" = 1.1, "laser" = 0.3, "energy" = 0.5, "bomb" = 1, "bio" = 1, "rad" = 1, "fire" = 1.1, "acid" = 1)
+	armor_modifiers = list(MELEE = 1.5, BULLET = 1.1, LASER = 0.3, ENERGY = 0.5, BOMB = 1, BIO = 1, RAD = 1, FIRE = 1.1, ACID = 1)

 ///Force decrease and mushy sound effect. (Not yet implemented)
 /datum/material/biomass
@@ -187,7 +187,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
 	value_per_unit = 0.06
 	beauty_modifier = 0.1
-	armor_modifiers = list("melee" = 1.1, "bullet" = 1.1, "laser" = 0.4, "energy" = 0.4, "bomb" = 1, "bio" = 0.2, "rad" = 0, "fire" = 0, "acid" = 0.3)
+	armor_modifiers = list(MELEE = 1.1, BULLET = 1.1, LASER = 0.4, ENERGY = 0.4, BOMB = 1, BIO = 0.2, RAD = 0, FIRE = 0, ACID = 0.3)

 /datum/material/wood/on_applied_obj(obj/source, amount, material_flags)
 	. = ..()
@@ -211,7 +211,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	sheet_type = /obj/item/stack/sheet/mineral/adamantine
 	value_per_unit = 0.25
 	beauty_modifier = 0.4
-	armor_modifiers = list("melee" = 1.5, "bullet" = 1.5, "laser" = 1.3, "energy" = 1.3, "bomb" = 1, "bio" = 1, "rad" = 1, "fire" = 2.5, "acid" = 1)
+	armor_modifiers = list(MELEE = 1.5, BULLET = 1.5, LASER = 1.3, ENERGY = 1.3, BOMB = 1, BIO = 1, RAD = 1, FIRE = 2.5, ACID = 1)

 ///RPG Magic. (Admin only)
 /datum/material/mythril
@@ -222,7 +222,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	sheet_type = /obj/item/stack/sheet/mineral/mythril
 	value_per_unit = 0.75
 	beauty_modifier = 0.5
-	armor_modifiers = list("melee" = 2, "bullet" = 2, "laser" = 2, "energy" = 2, "bomb" = 2, "bio" = 2, "rad" = 2, "fire" = 2, "acid" = 2)
+	armor_modifiers = list(MELEE = 2, BULLET = 2, LASER = 2, ENERGY = 2, BOMB = 2, BIO = 2, RAD = 2, FIRE = 2, ACID = 2)

 /datum/material/mythril/on_applied_obj(atom/source, amount, material_flags)
 	. = ..()
@@ -244,7 +244,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	value_per_unit = 0.001
 	strength_modifier = 0.5
 	integrity_modifier = 0.1
-	armor_modifiers = list("melee" = 0.25, "bullet" = 0.25, "laser" = 1.25, "energy" = 0.25, "bomb" = 0.25, "bio" = 0.25, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5)
+	armor_modifiers = list(MELEE = 0.25, BULLET = 0.25, LASER = 1.25, ENERGY = 0.25, BOMB = 0.25, BIO = 0.25, RAD = 1.5, FIRE = 1.5, ACID = 1.5)
 	beauty_modifier = 0.25
 	turf_sound_override = FOOTSTEP_SAND
 	texture_layer_icon_state = "sand"
@@ -257,7 +257,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
 	sheet_type = /obj/item/stack/sheet/mineral/sandstone
 	value_per_unit = 0.0025
-	armor_modifiers = list("melee" = 0.5, "bullet" = 0.5, "laser" = 1.25, "energy" = 0.5, "bomb" = 0.5, "bio" = 0.25, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5)
+	armor_modifiers = list(MELEE = 0.5, BULLET = 0.5, LASER = 1.25, ENERGY = 0.5, BOMB = 0.5, BIO = 0.25, RAD = 1.5, FIRE = 1.5, ACID = 1.5)
 	beauty_modifier = 0.3
 	turf_sound_override = FOOTSTEP_WOOD
 	texture_layer_icon_state = "brick"
@@ -269,7 +269,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
 	sheet_type = /obj/item/stack/sheet/mineral/snow
 	value_per_unit = 0.0025
-	armor_modifiers = list("melee" = 0.25, "bullet" = 0.25, "laser" = 0.25, "energy" = 0.25, "bomb" = 0.25, "bio" = 0.25, "rad" = 1.5, "fire" = 0.25, "acid" = 1.5)
+	armor_modifiers = list(MELEE = 0.25, BULLET = 0.25, LASER = 0.25, ENERGY = 0.25, BOMB = 0.25, BIO = 0.25, RAD = 1.5, FIRE = 0.25, ACID = 1.5)
 	beauty_modifier = 0.3
 	turf_sound_override = FOOTSTEP_SAND
 	texture_layer_icon_state = "sand"
@@ -282,7 +282,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	strength_modifier = 1.2
 	sheet_type = /obj/item/stack/sheet/runed_metal
 	value_per_unit = 0.75
-	armor_modifiers = list("melee" = 1.2, "bullet" = 1.2, "laser" = 1, "energy" = 1, "bomb" = 1.2, "bio" = 1.2, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5)
+	armor_modifiers = list(MELEE = 1.2, BULLET = 1.2, LASER = 1, ENERGY = 1, BOMB = 1.2, BIO = 1.2, RAD = 1.5, FIRE = 1.5, ACID = 1.5)
 	beauty_modifier = -0.15
 	texture_layer_icon_state = "runed"

@@ -294,7 +294,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	strength_modifier = 1.3 // Replicant Alloy is very good for skull beatings..
 	sheet_type = /obj/item/stack/tile/brass
 	value_per_unit = 0.75
-	armor_modifiers = list("melee" = 1.4, "bullet" = 1.4, "laser" = 0, "energy" = 0, "bomb" = 1.4, "bio" = 1.2, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5) //But it has.. a few problems that can't easily be compensated for.
+	armor_modifiers = list(MELEE = 1.4, BULLET = 1.4, LASER = 0, ENERGY = 0, BOMB = 1.4, BIO = 1.2, RAD = 1.5, FIRE = 1.5, ACID = 1.5) //But it has.. a few problems that can't easily be compensated for.
 	beauty_modifier = 0.3 //It really beats the cold plain plating of the station, doesn't it?

 /datum/material/bronze
@@ -305,7 +305,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
 	sheet_type = /obj/item/stack/sheet/bronze
 	value_per_unit = 0.025
-	armor_modifiers = list("melee" = 1, "bullet" = 1, "laser" = 1, "energy" = 1, "bomb" = 1, "bio" = 1, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5)
+	armor_modifiers = list(MELEE = 1, BULLET = 1, LASER = 1, ENERGY = 1, BOMB = 1, BIO = 1, RAD = 1.5, FIRE = 1.5, ACID = 1.5)
 	beauty_modifier = 0.2

 /datum/material/paper
@@ -315,7 +315,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
 	sheet_type = /obj/item/stack/sheet/paperframes
 	value_per_unit = 0.0025
-	armor_modifiers = list("melee" = 0.1, "bullet" = 0.1, "laser" = 0.1, "energy" = 0.1, "bomb" = 0.1, "bio" = 0.1, "rad" = 1.5, "fire" = 0, "acid" = 1.5)
+	armor_modifiers = list(MELEE = 0.1, BULLET = 0.1, LASER = 0.1, ENERGY = 0.1, BOMB = 0.1, BIO = 0.1, RAD = 1.5, FIRE = 0, ACID = 1.5)
 	beauty_modifier = 0.3
 	turf_sound_override = FOOTSTEP_SAND
 	texture_layer_icon_state = "paper"
@@ -340,7 +340,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
 	sheet_type = /obj/item/stack/sheet/cardboard
 	value_per_unit = 0.003
-	armor_modifiers = list("melee" = 0.25, "bullet" = 0.25, "laser" = 0.25, "energy" = 0.25, "bomb" = 0.25, "bio" = 0.25, "rad" = 1.5, "fire" = 0, "acid" = 1.5)
+	armor_modifiers = list(MELEE = 0.25, BULLET = 0.25, LASER = 0.25, ENERGY = 0.25, BOMB = 0.25, BIO = 0.25, RAD = 1.5, FIRE = 0, ACID = 1.5)
 	beauty_modifier = -0.1

 /datum/material/cardboard/on_applied_obj(obj/source, amount, material_flags)
@@ -364,7 +364,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	sheet_type = /obj/item/stack/sheet/bone
 	strength_modifier = 1.05
 	value_per_unit = 0.05
-	armor_modifiers = list("melee" = 1.2, "bullet" = 0.75, "laser" = 0.75, "energy" = 1.2, "bomb" = 1, "bio" = 1, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5)
+	armor_modifiers = list(MELEE = 1.2, BULLET = 0.75, LASER = 0.75, ENERGY = 1.2, BOMB = 1, BIO = 1, RAD = 1.5, FIRE = 1.5, ACID = 1.5)
 	beauty_modifier = -0.2

 /datum/material/bamboo
@@ -374,7 +374,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
 	sheet_type = /obj/item/stack/sheet/mineral/bamboo
 	value_per_unit = 0.0025
-	armor_modifiers = list("melee" = 0.5, "bullet" = 0.5, "laser" = 0.5, "energy" = 0.5, "bomb" = 0.5, "bio" = 0.51, "rad" = 1.5, "fire" = 0.5, "acid" = 1.5)
+	armor_modifiers = list(MELEE = 0.5, BULLET = 0.5, LASER = 0.5, ENERGY = 0.5, BOMB = 0.5, BIO = 0.51, RAD = 1.5, FIRE = 0.5, ACID = 1.5)
 	beauty_modifier = 0.2
 	turf_sound_override = FOOTSTEP_WOOD
 	texture_layer_icon_state = "bamboo"
@@ -8,7 +8,7 @@
 	value_per_unit = 0.05
 	beauty_modifier = -0.3
 	strength_modifier = 0.7
-	armor_modifiers = list("melee" = 0.3, "bullet" = 0.3, "laser" = 1.2, "energy" = 1.2, "bomb" = 0.3, "bio" = 0, "rad" = 0.7, "fire" = 1, "acid" = 1)
+	armor_modifiers = list(MELEE = 0.3, BULLET = 0.3, LASER = 1.2, ENERGY = 1.2, BOMB = 0.3, BIO = 0, RAD = 0.7, FIRE = 1, ACID = 1)
 	item_sound_override = 'sound/effects/meatslap.ogg'
 	turf_sound_override = FOOTSTEP_MEAT
 	texture_layer_icon_state = "meat"
@@ -7,7 +7,7 @@
 	value_per_unit = 0.05
 	beauty_modifier = 0.1
 	strength_modifier = 0.7
-	armor_modifiers = list("melee" = 0.3, "bullet" = 0.3, "laser" = 1.2, "energy" = 1.2, "bomb" = 0.3, "bio" = 0, "rad" = 0.7, "fire" = 1, "acid" = 1)
+	armor_modifiers = list(MELEE = 0.3, BULLET = 0.3, LASER = 1.2, ENERGY = 1.2, BOMB = 0.3, BIO = 0, RAD = 0.7, FIRE = 1, ACID = 1)
 	item_sound_override = 'sound/effects/meatslap.ogg'
 	turf_sound_override = FOOTSTEP_MEAT
 	texture_layer_icon_state = "pizza"
@@ -27,6 +27,6 @@


 /datum/weather/acid_rain/weather_act(mob/living/L)
-	var/resist = L.getarmor(null, "acid")
+	var/resist = L.getarmor(null, ACID)
 	if(prob(max(0,100-resist)))
 		L.acid_act(20,20)
@@ -30,7 +30,7 @@
 	status_alarm(TRUE)

 /datum/weather/rad_storm/weather_act(mob/living/L)
-	var/resist = L.getarmor(null, "rad")
+	var/resist = L.getarmor(null, RAD)
 	var/ratio = 1 - (min(resist, 100) / 100)
 	L.rad_act(radiation_intensity * ratio)

@@ -267,7 +267,7 @@
 	var/a_incidence_s = abs(incidence_s)
 	if(a_incidence_s > 90 && a_incidence_s < 270)
 		return FALSE
-	if((P.flag in list("bullet", "bomb")) && P.ricochet_incidence_leeway)
+	if((P.flag in list(BULLET, BOMB)) && P.ricochet_incidence_leeway)
 		if((a_incidence_s < 90 && a_incidence_s < 90 - P.ricochet_incidence_leeway) || (a_incidence_s > 270 && a_incidence_s -270 > P.ricochet_incidence_leeway))
 			return
 	var/new_angle_s = SIMPLIFY_DEGREES(face_angle + incidence_s)
@@ -896,9 +896,6 @@
 	SEND_SIGNAL(src, COMSIG_ATOM_DIR_CHANGE, dir, newdir)
 	dir = newdir

-/atom/proc/mech_melee_attack(obj/mecha/M)
-	return
-
 //If a mob logouts/logins in side of an object you can use this proc
 /atom/proc/on_log(login)
 	if(loc)
@@ -1162,6 +1159,8 @@
 			log_game(log_text)
 		if(LOG_GAME)
 			log_game(log_text)
+		if(LOG_MECHA)
+			log_mecha(log_text)
 		if(LOG_SHUTTLE)
 			log_shuttle(log_text)
 		else
@@ -17,7 +17,7 @@
 	desc = "advanced clown shoes that protect the wearer and render them nearly immune to slipping on their own peels. They also squeak at 100% capacity."
 	clothing_flags = NOSLIP
 	slowdown = SHOES_SLOWDOWN
-	armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "energy" = 25, "bomb" = 50, "bio" = 10, "rad" = 0, "fire" = 70, "acid" = 50)
+	armor = list(MELEE = 25, BULLET = 25, LASER = 25, ENERGY = 25, BOMB = 50, BIO = 10, RAD = 0, FIRE = 70, ACID = 50)
 	strip_delay = 70
 	resistance_flags = NONE
 	permeability_coefficient = 0.05
@@ -28,7 +28,7 @@
 	name = "mk-honk combat shoes"
 	desc = "The culmination of years of clown combat research, these shoes leave a trail of chaos in their wake. They will slowly recharge themselves over time, or can be manually charged with bananium."
 	slowdown = SHOES_SLOWDOWN
-	armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "energy" = 25, "bomb" = 50, "bio" = 10, "rad" = 0, "fire" = 70, "acid" = 50)
+	armor = list(MELEE = 25, BULLET = 25, LASER = 25, ENERGY = 25, BOMB = 50, BIO = 10, RAD = 0, FIRE = 70, ACID = 50)
 	strip_delay = 70
 	resistance_flags = NONE
 	permeability_coefficient = 0.05
@@ -243,7 +243,7 @@
 	projectiles = 8
 	projectile_energy_cost = 1000

-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana/can_attach(obj/mecha/combat/honker/M)
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana/can_attach(obj/vehicle/sealed/mecha/combat/honker/M)
 	if(..())
 		if(istype(M))
 			return TRUE
@@ -261,42 +261,33 @@
 	equip_cooldown = 60
 	det_time = 20

-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache/can_attach(obj/mecha/combat/honker/M)
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache/can_attach(obj/vehicle/sealed/mecha/combat/honker/M)
 	if(..())
 		if(istype(M))
 			return TRUE
 	return FALSE

-/obj/mecha/combat/honker/dark
+/obj/vehicle/sealed/mecha/combat/honker/dark
 	desc = "Produced by \"Tyranny of Honk, INC\", this exosuit is designed as heavy clown-support. This one has been painted black for maximum fun. HONK!"
 	name = "\improper Dark H.O.N.K"
 	icon_state = "darkhonker"
 	max_integrity = 300
 	deflect_chance = 15
-	armor = list("melee" = 40, "bullet" = 40, "laser" = 50, "energy" = 35, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+	armor = list(MELEE = 40, BULLET = 40, LASER = 50, ENERGY = 35, BOMB = 20, BIO = 0, RAD = 0, FIRE = 100, ACID = 100)
 	max_temperature = 35000
 	operation_req_access = list(ACCESS_SYNDICATE)
 	internals_req_access = list(ACCESS_SYNDICATE)
 	wreckage = /obj/structure/mecha_wreckage/honker/dark
 	max_equip = 3

-/obj/mecha/combat/honker/dark/GrantActions(mob/living/user, human_occupant = 0)
-	..()
-	thrusters_action.Grant(user, src)
-
-
-/obj/mecha/combat/honker/dark/RemoveActions(mob/living/user, human_occupant = 0)
-	..()
-	thrusters_action.Remove(user)
-
-/obj/mecha/combat/honker/dark/add_cell(obj/item/stock_parts/cell/C)
+/obj/vehicle/sealed/mecha/combat/honker/dark/add_cell(obj/item/stock_parts/cell/C)
 	if(C)
 		C.forceMove(src)
 		cell = C
 		return
 	cell = new /obj/item/stock_parts/cell/hyper(src)

-/obj/mecha/combat/honker/dark/loaded/Initialize()
+/obj/vehicle/sealed/mecha/combat/honker/dark/loaded/Initialize()
 	. = ..()
 	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/honker()
 	ME.attach(src)
@@ -136,7 +136,7 @@ Class Procs:

 /obj/machinery/Initialize()
 	if(!armor)
-		armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
+		armor = list(MELEE = 25, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 70)
 	. = ..()
 	GLOB.machines += src

@@ -370,7 +370,7 @@ Class Procs:
 		user.DelayNextAction(CLICK_CD_MELEE)
 		user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
 		user.visible_message("<span class='danger'>[user.name] smashes against \the [src.name] with its paws.</span>", null, null, COMBAT_MESSAGE_RANGE)
-		take_damage(4, BRUTE, "melee", 1)
+		take_damage(4, BRUTE, MELEE, 1)

 /obj/machinery/attack_robot(mob/user)
 	if(!(interaction_flags_machine & INTERACT_MACHINE_ALLOW_SILICON) && !IsAdminGhost(user))
@@ -590,7 +590,7 @@ Class Procs:
 	if(prob(85) && (zap_flags & ZAP_MACHINE_EXPLOSIVE))
 		explosion(src, 1, 2, 4, flame_range = 2, adminlog = FALSE, smoke = FALSE)
 	else if(zap_flags & ZAP_OBJ_DAMAGE)
-		take_damage(power/2000, BURN, "energy")
+		take_damage(power/2000, BURN, ENERGY)
 		if(prob(40))
 			emp_act(50)

@@ -614,7 +614,7 @@ Class Procs:
 	AM.pixel_y = -8 + (round( . / 3)*8)

 /obj/machinery/rust_heretic_act()
-	take_damage(500, BRUTE, "melee", 1)
+	take_damage(500, BRUTE, MELEE, 1)

 /**
 * Alerts the AI that a hack is in progress.
@@ -6,7 +6,7 @@
 	layer = PROJECTILE_HIT_THRESHHOLD_LAYER
 	plane = FLOOR_PLANE
 	max_integrity = 200
-	armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
+	armor = list(MELEE = 50, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 30)

 	var/uses = 20
 	var/cooldown = 0
@@ -10,7 +10,7 @@
 	var/device_type = null
 	var/id = null
 	var/initialized_button = 0
-	armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 70)
+	armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 10, BIO = 100, RAD = 100, FIRE = 90, ACID = 70)
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 2
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
@@ -15,7 +15,7 @@

 	resistance_flags = FIRE_PROOF

-	armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 50)
+	armor = list(MELEE = 50, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, BIO = 0, RAD = 0, FIRE = 90, ACID = 50)
 	max_integrity = 100
 	integrity_failure = 0.5
 	var/list/network = list("ss13")
@@ -273,7 +273,7 @@
 	return ..()

 /obj/machinery/camera/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
-	if(damage_flag == "melee" && damage_amount < 12 && !(stat & BROKEN))
+	if(damage_flag == MELEE && damage_amount < 12 && !(stat & BROKEN))
 		return 0
 	. = ..()

@@ -8,7 +8,7 @@
 	active_power_usage = 300
 	max_integrity = 200
 	integrity_failure = 0.5
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 20)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 40, ACID = 20)
 	var/brightness_on = 1
 	var/icon_keyboard = "generic_key"
 	var/icon_screen = "generic"
@@ -101,10 +101,10 @@
 		switch(severity)
 			if(1)
 				if(prob(50))
-					obj_break("energy")
+					obj_break(ENERGY)
 			if(2)
 				if(prob(10))
-					obj_break("energy")
+					obj_break(ENERGY)

 /obj/machinery/computer/deconstruct(disassembled = TRUE, mob/user)
 	on_deconstruction()
@@ -6,7 +6,7 @@
 	name = "gas sensor"
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "gsensor1"
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 0)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 0)

 	var/on = TRUE

@@ -120,7 +120,7 @@
 	anchored = FALSE
 	max_integrity = 180
 	proj_pass_rate = 20
-	armor = list("melee" = 10, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 10, "acid" = 0)
+	armor = list(MELEE = 10, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 10, BIO = 100, RAD = 100, FIRE = 10, ACID = 0)

 	var/deploy_time = 40
 	var/deploy_message = TRUE
@@ -576,7 +576,7 @@
 	desc = "An airlock hastily corrupted by blood magic, it is unusually brittle in this state."
 	normal_integrity = 150
 	damage_deflection = 5
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0)

 //Pinion airlocks: Clockwork doors that only let servants of Ratvar through.
 /obj/machinery/door/airlock/clockwork
@@ -10,7 +10,7 @@
 	power_channel = ENVIRON
 	max_integrity = 350
 	damage_deflection = 10
-	armor = list("melee" = 30, "bullet" = 30, "laser" = 20, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 70)
+	armor = list(MELEE = 30, BULLET = 30, LASER = 20, ENERGY = 20, BOMB = 10, BIO = 100, RAD = 100, FIRE = 80, ACID = 70)
 	CanAtmosPass = ATMOS_PASS_DENSITY
 	flags_1 = PREVENT_CLICK_UNDER_1|DEFAULT_RICOCHET_1
 	ricochet_chance_mod = 0.8
@@ -107,19 +107,6 @@
 				return
 			bumpopen(M)
 			return
-
-	if(ismecha(AM))
-		var/obj/mecha/mecha = AM
-		if(density)
-			if(mecha.occupant)
-				if(world.time - mecha.occupant.last_bumped <= 10)
-					return
-				mecha.occupant.last_bumped = world.time
-			if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access)))
-				open()
-			else
-				do_animate("deny")
-		return
 	return

 /obj/machinery/door/Move()
@@ -362,7 +349,7 @@
 			C.bleed(DOOR_CRUSH_DAMAGE)
 		else
 			L.add_splatter_floor(location)
-	for(var/obj/mecha/M in get_turf(src))
+	for(var/obj/vehicle/sealed/mecha/M in get_turf(src))
 		M.take_damage(DOOR_CRUSH_DAMAGE)

 /obj/machinery/door/proc/autoclose()
@@ -21,7 +21,7 @@
 	layer = BELOW_OPEN_DOOR_LAYER
 	closingLayer = CLOSED_FIREDOOR_LAYER
 	assemblytype = /obj/structure/firelock_frame
-	armor = list("melee" = 30, "bullet" = 30, "laser" = 20, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 95, "acid" = 70)
+	armor = list(MELEE = 30, BULLET = 30, LASER = 20, ENERGY = 20, BOMB = 10, BIO = 100, RAD = 100, FIRE = 95, ACID = 70)
 	interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_REQUIRES_SILICON | INTERACT_MACHINE_OPEN
 	air_tight = TRUE
 	attack_hand_is_action = TRUE
@@ -6,7 +6,7 @@
 	explosion_block = 3
 	heat_proof = TRUE
 	max_integrity = 600
-	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
+	armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 100, BIO = 100, RAD = 100, FIRE = 100, ACID = 100)
 	resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | ACID_PROOF | LAVA_PROOF
 	damage_deflection = 70
 	var/password = "Swordfish"
@@ -13,7 +13,7 @@
 	heat_proof = TRUE
 	safe = FALSE
 	max_integrity = 600
-	armor = list("melee" = 50, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70)
+	armor = list(MELEE = 50, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 50, BIO = 100, RAD = 100, FIRE = 100, ACID = 70)
 	resistance_flags = FIRE_PROOF
 	damage_deflection = 70
 	poddoor = TRUE
@@ -5,7 +5,7 @@
 	icon = 'icons/obj/doors/shutters.dmi'
 	layer = SHUTTER_LAYER
 	closingLayer = SHUTTER_LAYER
-	armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 75, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70)
+	armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 75, BOMB = 25, BIO = 100, RAD = 100, FIRE = 100, ACID = 70)
 	damage_deflection = 20
 	max_integrity = 100

@@ -24,7 +24,7 @@
 	desc = "These shutters have an armoured frame; it looks like plasteel. These shutters look robust enough to survive explosions."
 	icon = 'icons/obj/doors/shutters_old.dmi'
 	icon_state = "closed"
-	armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 75, "bomb" = 30, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70)
+	armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 75, BOMB = 30, BIO = 100, RAD = 100, FIRE = 100, ACID = 70)
 	max_integrity = 300

 /obj/machinery/door/poddoor/shutters/old/preopen
@@ -9,7 +9,7 @@
 	var/base_state = "left"
 	max_integrity = 150 //If you change this, consider changing ../door/window/brigdoor/ max_integrity at the bottom of this .dm file
 	integrity_failure = 0
-	armor = list("melee" = 20, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 70, "acid" = 100)
+	armor = list(MELEE = 20, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 10, BIO = 100, RAD = 100, FIRE = 70, ACID = 100)
 	visible = FALSE
 	flags_1 = ON_BORDER_1|DEFAULT_RICOCHET_1
 	opacity = 0
@@ -77,11 +77,13 @@
 		return
 	if (!( ismob(AM) ))
 		if(ismecha(AM))
-			var/obj/mecha/mecha = AM
-			if(mecha.occupant && src.allowed(mecha.occupant))
-				open_and_close()
-			else
-				do_animate("deny")
+			var/obj/vehicle/sealed/mecha/mecha = AM
+			for(var/O in mecha.occupants)
+				var/mob/living/occupant = O
+				if(allowed(occupant))
+					open_and_close()
+					return
+			do_animate("deny")
 		return
 	if (!( SSticker ))
 		return
@@ -20,7 +20,7 @@
 	plane = ABOVE_WALL_PLANE
 	max_integrity = 250
 	integrity_failure = 0.4
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, RAD = 100, FIRE = 90, ACID = 30)
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 2
 	active_power_usage = 6
@@ -93,7 +93,7 @@
 		return flash()

 /obj/machinery/flasher/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
-	if(damage_flag == "melee" && damage_amount < 10) //any melee attack below 10 dmg does nothing
+	if(damage_flag == MELEE && damage_amount < 10) //any melee attack below 10 dmg does nothing
 		return 0
 	. = ..()

@@ -40,7 +40,7 @@ Possible to do for anyone motivated enough:
 	idle_power_usage = 5
 	active_power_usage = 100
 	max_integrity = 300
-	armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
+	armor = list(MELEE = 50, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 0)
 	circuit = /obj/item/circuitboard/machine/holopad
 	/// List of living mobs that use the holopad
 	var/list/masters
@@ -8,7 +8,7 @@
 	idle_power_usage = 2
 	active_power_usage = 4
 	max_integrity = 300
-	armor = list("melee" = 50, "bullet" = 30, "laser" = 70, "energy" = 50, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
+	armor = list(MELEE = 50, BULLET = 30, LASER = 70, ENERGY = 50, BOMB = 20, BIO = 0, RAD = 0, FIRE = 100, ACID = 70)
 	resistance_flags = FIRE_PROOF
 	var/id = null
 	var/on = FALSE
@@ -10,7 +10,7 @@
 	level = 1		// underfloor
 	layer = LOW_OBJ_LAYER
 	max_integrity = 500
-	armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 70, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
+	armor = list(MELEE = 70, BULLET = 70, LASER = 70, ENERGY = 70, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 80)

 	var/open = FALSE		// true if cover is open
 	var/locked = TRUE		// true if controls are locked
@@ -28,7 +28,7 @@
 	power_channel = EQUIP	//drains power from the EQUIPMENT channel
 	max_integrity = 160		//the turret's health
 	integrity_failure = 0.5
-	armor = list("melee" = 50, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
+	armor = list(MELEE = 50, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 30, BIO = 0, RAD = 0, FIRE = 90, ACID = 90)
 	/// Base turret icon state
 	base_icon_state = "standard"
 	/// Scan range of the turret for locating targets
@@ -478,10 +478,12 @@

 	for(var/A in GLOB.mechas_list)
 		if((get_dist(A, base) < scan_range) && can_see(base, A, scan_range))
-			var/obj/mecha/Mech = A
-			if(Mech.occupant && !in_faction(Mech.occupant)) //If there is a user and they're not in our faction
-				if(assess_perp(Mech.occupant) >= 4)
-					targets += Mech
+			var/obj/vehicle/sealed/mecha/mech = A
+			for(var/O in mech.occupants)
+				var/mob/living/occupant = O
+				if(!in_faction(occupant)) //If there is a user and they're not in our faction
+					if(assess_perp(occupant) >= 4)
+						targets += mech

 	if((turret_flags & TURRET_FLAG_SHOOT_ANOMALOUS) && GLOB.blobs.len && (mode == TURRET_LETHAL))
 		for(var/obj/structure/blob/B in view(scan_range, base))
@@ -774,7 +776,7 @@
 /obj/machinery/porta_turret/syndicate/energy/pirate
 	max_integrity = 260
 	integrity_failure = 0.08
-	armor = list("melee" = 50, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
+	armor = list(MELEE = 50, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 50, BIO = 0, RAD = 0, FIRE = 90, ACID = 90)

 /obj/machinery/porta_turret/syndicate/energy/raven
 	stun_projectile =  /obj/item/projectile/beam/laser
@@ -794,7 +796,7 @@
 	lethal_projectile = /obj/item/projectile/bullet/p50/penetrator/shuttle
 	lethal_projectile_sound = 'sound/weapons/gunshot_smg.ogg'
 	stun_projectile_sound = 'sound/weapons/gunshot_smg.ogg'
-	armor = list("melee" = 50, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 80, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
+	armor = list(MELEE = 50, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 80, BIO = 0, RAD = 0, FIRE = 90, ACID = 90)

 /obj/machinery/porta_turret/syndicate/pod/toolbox
 	max_integrity = 100
@@ -55,7 +55,7 @@ GLOBAL_LIST_EMPTY(allConsoles)
 	var/emergency //If an emergency has been called by this device. Acts as both a cooldown and lets the responder know where it the emergency was triggered from
 	var/receive_ore_updates = FALSE //If ore redemption machines will send an update when it receives new ores.
 	max_integrity = 300
-	armor = list("melee" = 70, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
+	armor = list(MELEE = 70, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 0, BIO = 0, RAD = 0, FIRE = 90, ACID = 90)

 /obj/machinery/requests_console/power_change()
 	..()
@@ -28,7 +28,7 @@
 	if(severity >= 70)
 		qdel(src)
 	else
-		take_damage(severity/1.3, BRUTE, "energy", 0)
+		take_damage(severity/1.3, BRUTE, ENERGY, 0)

 /obj/structure/emergency_shield/play_attack_sound(damage, damage_type = BRUTE, damage_flag = 0)
 	switch(damage_type)
@@ -22,7 +22,7 @@

 	density = TRUE
 	max_integrity = 400
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 30)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, BIO = 100, RAD = 100, FIRE = 100, ACID = 30)
 	layer = OBJ_LAYER
 	showpipe = TRUE

@@ -12,7 +12,7 @@
 	name = "space heater"
 	desc = "Made by Space Amish using traditional space techniques, this heater/cooler is guaranteed not to set the station on fire. Warranty void if used in engines."
 	max_integrity = 250
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 10)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, RAD = 100, FIRE = 80, ACID = 10)
 	circuit = /obj/item/circuitboard/machine/space_heater
 	var/obj/item/stock_parts/cell/cell
 	var/on = FALSE
@@ -14,7 +14,7 @@
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 10
 	active_power_usage = 100
-	armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
+	armor = list(MELEE = 25, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 70)
 	var/obj/item/stored

 /obj/machinery/blackbox_recorder/Initialize()
@@ -1,11 +0,0 @@
-/obj/mecha/combat
-	force = 30
-	internal_damage_threshold = 50
-	armor = list("melee" = 30, "bullet" = 30, "laser" = 15, "energy" = 20, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
-	mouse_pointer = 'icons/mecha/mecha_mouse.dmi'
-
-/obj/mecha/combat/proc/max_ammo() //Max the ammo stored for Nuke Ops mechs, or anyone else that calls this
-	for(var/obj/item/I in equipment)
-		if(istype(I, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/))
-			var/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/gun = I
-			gun.projectiles_cache = gun.projectiles_cache_max
@@ -1,21 +0,0 @@
-/obj/mecha/combat/durand
-	desc = "An aging combat exosuit utilized by the Nanotrasen corporation. Originally developed to combat hostile alien lifeforms."
-	name = "\improper Durand"
-	icon_state = "durand"
-	step_in = 4
-	dir_in = 1 //Facing North.
-	max_integrity = 400
-	deflect_chance = 20
-	armor = list("melee" = 40, "bullet" = 35, "laser" = 15, "energy" = 10, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
-	max_temperature = 30000
-	infra_luminosity = 8
-	force = 40
-	wreckage = /obj/structure/mecha_wreckage/durand
-
-/obj/mecha/combat/durand/GrantActions(mob/living/user, human_occupant = 0)
-	..()
-	defense_action.Grant(user, src)
-
-/obj/mecha/combat/durand/RemoveActions(mob/living/user, human_occupant = 0)
-	..()
-	defense_action.Remove(user)
@@ -1,68 +0,0 @@
-/obj/mecha/combat/gygax
-	desc = "A lightweight, security exosuit. Popular among private and corporate security."
-	name = "\improper Gygax"
-	icon_state = "gygax"
-	step_in = 3
-	dir_in = 1 //Facing North.
-	max_integrity = 250
-	deflect_chance = 5
-	force = 20
-	armor = list("melee" = 25, "bullet" = 20, "laser" = 30, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
-	max_temperature = 25000
-	infra_luminosity = 6
-	wreckage = /obj/structure/mecha_wreckage/gygax
-	internal_damage_threshold = 35
-	max_equip = 3
-	step_energy_drain = 3
-	leg_overload_coeff = 300
-
-/obj/mecha/combat/gygax/dark
-	desc = "A lightweight exosuit, painted in a dark scheme. This model appears to have some modifications."
-	name = "\improper Dark Gygax"
-	icon_state = "darkgygax"
-	max_integrity = 300
-	deflect_chance = 15
-	force = 25
-	armor = list("melee" = 40, "bullet" = 40, "laser" = 50, "energy" = 35, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
-	max_temperature = 35000
-	leg_overload_coeff = 100
-	operation_req_access = list(ACCESS_SYNDICATE)
-	internals_req_access = list(ACCESS_SYNDICATE)
-	wreckage = /obj/structure/mecha_wreckage/gygax/dark
-	max_equip = 4
-
-/obj/mecha/combat/gygax/dark/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/teleporter
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay
-	ME.attach(src)
-	max_ammo()
-
-/obj/mecha/combat/gygax/dark/add_cell(obj/item/stock_parts/cell/C=null)
-	if(C)
-		C.forceMove(src)
-		cell = C
-		return
-	cell = new /obj/item/stock_parts/cell/hyper(src)
-
-/obj/mecha/combat/gygax/GrantActions(mob/living/user, human_occupant = 0)
-	..()
-	overload_action.Grant(user, src)
-
-/obj/mecha/combat/gygax/dark/GrantActions(mob/living/user, human_occupant = 0)
-	..()
-	thrusters_action.Grant(user, src)
-
-
-/obj/mecha/combat/gygax/RemoveActions(mob/living/user, human_occupant = 0)
-	..()
-	overload_action.Remove(user)
-
-/obj/mecha/combat/gygax/dark/RemoveActions(mob/living/user, human_occupant = 0)
-	..()
-	thrusters_action.Remove(user)
@@ -1,29 +0,0 @@
-/obj/mecha/combat/phazon
-	desc = "This is a Phazon exosuit. The pinnacle of scientific research and pride of Nanotrasen, it uses cutting edge bluespace technology and expensive materials."
-	name = "\improper Phazon"
-	icon_state = "phazon"
-	step_in = 2
-	dir_in = 2 //Facing South.
-	step_energy_drain = 3
-	max_integrity = 200
-	deflect_chance = 30
-	armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
-	max_temperature = 25000
-	infra_luminosity = 3
-	wreckage = /obj/structure/mecha_wreckage/phazon
-	add_req_access = 1
-	internal_damage_threshold = 25
-	force = 15
-	max_equip = 3
-	phase_state = "phazon-phase"
-
-/obj/mecha/combat/phazon/GrantActions(mob/living/user, human_occupant = 0)
-	..()
-	switch_damtype_action.Grant(user, src)
-	phasing_action.Grant(user, src)
-
-
-/obj/mecha/combat/phazon/RemoveActions(mob/living/user, human_occupant = 0)
-	..()
-	switch_damtype_action.Remove(user)
-	phasing_action.Remove(user)
@@ -1,171 +0,0 @@
-//DO NOT ADD MECHA PARTS TO THE GAME WITH THE DEFAULT "SPRITE ME" SPRITE!
-//I'm annoyed I even have to tell you this! SPRITE FIRST, then commit.
-
-/obj/item/mecha_parts/mecha_equipment
-	name = "mecha equipment"
-	icon = 'icons/mecha/mecha_equipment.dmi'
-	icon_state = "mecha_equip"
-	force = 5
-	max_integrity = 300
-	var/equip_cooldown = 0 // cooldown after use
-	var/equip_ready = 1 //whether the equipment is ready for use. (or deactivated/activated for static stuff)
-	var/energy_drain = 0
-	var/obj/mecha/chassis = null
-	/// Bitflag. Determines the range of the equipment.
-	var/range = MELEE
-	/// Bitflag. Used by exosuit fabricator to assign sub-categories based on which exosuits can equip this.
-	var/mech_flags = NONE
-	var/salvageable = 1
-	//var/detachable = TRUE // Set to FALSE for built-in equipment that cannot be removed
-	var/selectable = 1	// Set to 0 for passive equipment such as mining scanner or armor plates
-	var/harmful = FALSE //Controls if equipment can be used to attack by a pacifist.
-	//var/destroy_sound = 'sound/mecha/critdestr.ogg'
-
-/obj/item/mecha_parts/mecha_equipment/proc/update_chassis_page()
-	if(chassis)
-		send_byjax(chassis.occupant,"exosuit.browser","eq_list",chassis.get_equipment_list())
-		send_byjax(chassis.occupant,"exosuit.browser","equipment_menu",chassis.get_equipment_menu(),"dropdowns")
-		return 1
-	return
-
-/obj/item/mecha_parts/mecha_equipment/proc/update_equip_info()
-	if(chassis)
-		send_byjax(chassis.occupant,"exosuit.browser","[REF(src)]",get_equip_info())
-		return 1
-	return
-
-/obj/item/mecha_parts/mecha_equipment/Destroy()
-	if(chassis)
-		chassis.equipment -= src
-		if(chassis.selected == src)
-			chassis.selected = null
-		src.update_chassis_page()
-		//log_message("[src] is destroyed.", LOG_MECHA)
-		chassis.log_append_to_last("[src] is destroyed.",1)
-		if(chassis.occupant)
-			chassis.occupant_message("<span class='danger'>[src] is destroyed!</span>")
-			SEND_SOUND(chassis.occupant, sound(istype(src, /obj/item/mecha_parts/mecha_equipment/weapon) ? 'sound/mecha/weapdestr.ogg' : 'sound/mecha/critdestr.ogg', volume=50))
-			//chassis.occupant.playsound_local(chassis, destroy_sound, 50)
-		//if(!detachable) //If we're a built-in nondetachable equipment, let's lock up the slot that we were in.
-		//	chassis.max_equip--
-		chassis = null
-	return ..()
-
-/obj/item/mecha_parts/mecha_equipment/proc/critfail()
-	if(chassis)
-		mecha_log_message("Critical failure", color="red")
-
-/obj/item/mecha_parts/mecha_equipment/proc/get_equip_info()
-	if(!chassis)
-		return
-	var/txt = "<span style=\"color:[equip_ready?"#0f0":"#f00"];\">*</span>&nbsp;"
-	if(chassis.selected == src)
-		txt += "<b>[src.name]</b>"
-	else if(selectable)
-		txt += "<a href='?src=[REF(chassis)];select_equip=[REF(src)]'>[src.name]</a>"
-	else
-		txt += "[src.name]"
-
-	return txt
-
-/obj/item/mecha_parts/mecha_equipment/proc/is_ranged()//add a distance restricted equipment. Why not?
-	return range&RANGED //rename to MECHA_RANGE and MECHA_MELEE
-
-/obj/item/mecha_parts/mecha_equipment/proc/is_melee()
-	return range&MELEE
-
-
-/obj/item/mecha_parts/mecha_equipment/proc/action_checks(atom/target)
-	if(!target)
-		return 0
-	if(!chassis)
-		return 0
-	if(!equip_ready)
-		return 0
-	if(energy_drain && !chassis.has_charge(energy_drain))
-		return 0
-	if(crit_fail)
-		return 0
-	if(chassis.equipment_disabled)
-		to_chat(chassis.occupant, "<span=warn>Error -- Equipment control unit is unresponsive.</span>")
-		return 0
-	return 1
-
-/obj/item/mecha_parts/mecha_equipment/proc/action(atom/target)
-	return 0
-
-/obj/item/mecha_parts/mecha_equipment/proc/start_cooldown()
-	set_ready_state(0)
-	chassis.use_power(energy_drain)
-	addtimer(CALLBACK(src, .proc/set_ready_state, 1), equip_cooldown)
-
-/obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(atom/target)
-	if(!chassis)
-		return
-	var/C = chassis.loc
-	set_ready_state(0)
-	chassis.use_power(energy_drain)
-	. = do_after(chassis.occupant, equip_cooldown, target=target)
-	set_ready_state(1)
-	if(!chassis || 	chassis.loc != C || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir))
-		return 0
-
-/obj/item/mecha_parts/mecha_equipment/proc/do_after_mecha(atom/target, delay)
-	if(!chassis)
-		return
-	var/C = chassis.loc
-	. = do_after(chassis.occupant, delay, target=target)
-	if(!chassis || 	chassis.loc != C || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir))
-		return 0
-
-/obj/item/mecha_parts/mecha_equipment/proc/can_attach(obj/mecha/M)
-	if(M.equipment.len<M.max_equip)
-		return 1
-
-/obj/item/mecha_parts/mecha_equipment/proc/attach(obj/mecha/M)
-	M.equipment += src
-	chassis = M
-	forceMove(M)
-	M.mecha_log_message("[src] initialized.")
-	src.update_chassis_page()
-	return
-
-/obj/item/mecha_parts/mecha_equipment/proc/detach(atom/moveto=null)
-	moveto = moveto || get_turf(chassis)
-	if(src.Move(moveto))
-		chassis.equipment -= src
-		if(chassis.selected == src)
-			chassis.selected = null
-		update_chassis_page()
-		chassis.mecha_log_message("[src] removed from equipment.")
-		chassis = null
-		set_ready_state(1)
-	return
-
-
-/obj/item/mecha_parts/mecha_equipment/Topic(href,href_list)
-	if(href_list["detach"])
-		detach()
-
-/obj/item/mecha_parts/mecha_equipment/proc/set_ready_state(state)
-	equip_ready = state
-	if(chassis)
-		send_byjax(chassis.occupant,"exosuit.browser","[REF(src)]",src.get_equip_info())
-	return
-
-/obj/item/mecha_parts/mecha_equipment/proc/occupant_message(message)
-	if(chassis)
-		chassis.occupant_message("[icon2html(src, chassis.occupant)] [message]")
-	return
-
-/obj/item/mecha_parts/mecha_equipment/proc/mecha_log_message(message, color) //on tg this just overrides log_message
-	log_message(message, LOG_GAME, color)			//pass to default admin logging too
-	if(chassis)
-		chassis.mecha_log_message(message, color)		//and pass to our chassis
-
-//Used for reloading weapons/tools etc. that use some form of resource
-/obj/item/mecha_parts/mecha_equipment/proc/rearm()
-	return 0
-
-/obj/item/mecha_parts/mecha_equipment/proc/needs_rearm()
-	return 0
@@ -1,480 +0,0 @@
-
-//Hydraulic clamp, Kill clamp, Extinguisher, RCD, Cable layer.
-
-
-/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp
-	name = "hydraulic clamp"
-	desc = "Equipment for engineering exosuits. Lifts objects and loads them into cargo."
-	icon_state = "mecha_clamp"
-	equip_cooldown = 15
-	energy_drain = 10
-	tool_behaviour = TOOL_RETRACTOR
-	toolspeed = 0.8
-	var/dam_force = 20
-	var/obj/mecha/working/ripley/cargo_holder
-	harmful = TRUE
-	mech_flags = EXOSUIT_MODULE_RIPLEY
-
-/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/can_attach(obj/mecha/working/ripley/M as obj)
-	if(..())
-		if(istype(M))
-			return 1
-	return 0
-
-/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/attach(obj/mecha/M as obj)
-	..()
-	cargo_holder = M
-	return
-
-/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/detach(atom/moveto = null)
-	..()
-	cargo_holder = null
-
-/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/action(atom/target)
-	if(!action_checks(target))
-		return
-	if(!cargo_holder)
-		return
-	if(ismecha(target))
-		var/obj/mecha/M = target
-		var/have_ammo
-		for(var/obj/item/mecha_ammo/box in cargo_holder.cargo)
-			if(istype(box, /obj/item/mecha_ammo) && box.rounds)
-				have_ammo = TRUE
-				if(M.ammo_resupply(box, chassis.occupant, TRUE))
-					return
-		if(have_ammo)
-			to_chat(chassis.occupant, "No further supplies can be provided to [M].")
-		else
-			to_chat(chassis.occupant, "No providable supplies found in cargo hold")
-		return
-	if(isobj(target))
-		var/obj/O = target
-		if(!O.anchored)
-			if(cargo_holder.cargo.len < cargo_holder.cargo_capacity)
-				chassis.visible_message("[chassis] lifts [target] and starts to load it into cargo compartment.")
-				O.anchored = TRUE
-				if(do_after_cooldown(target))
-					cargo_holder.cargo += O
-					O.forceMove(chassis)
-					O.anchored = FALSE
-					occupant_message("<span class='notice'>[target] successfully loaded.</span>")
-					mecha_log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]")
-				else
-					O.anchored = initial(O.anchored)
-			else
-				occupant_message("<span class='warning'>Not enough room in cargo compartment!</span>")
-		else
-			occupant_message("<span class='warning'>[target] is firmly secured!</span>")
-
-	else if(isliving(target))
-		var/mob/living/M = target
-		if(M.stat == DEAD)
-			return
-		if(chassis.occupant.a_intent == INTENT_HARM)
-			M.take_overall_damage(dam_force)
-			if(!M)
-				return
-			M.adjustOxyLoss(round(dam_force/2))
-			M.updatehealth()
-			target.visible_message("<span class='danger'>[chassis] squeezes [target].</span>", \
-								"<span class='userdanger'>[chassis] squeezes [target].</span>",\
-								"<span class='italics'>You hear something crack.</span>")
-			log_combat(chassis.occupant, M, "attacked", "[name]", "(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYE: [uppertext(damtype)])")
-		else
-			step_away(M,chassis)
-			occupant_message("You push [target] out of the way.")
-			chassis.visible_message("[chassis] pushes [target] out of the way.")
-		return 1
-
-
-
-//This is pretty much just for the death-ripley
-/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/kill
-	name = "\improper KILL CLAMP"
-	desc = "They won't know what clamped them!"
-	energy_drain = 0
-	dam_force = 0
-	var/real_clamp = FALSE
-
-/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/kill/real
-	desc = "They won't know what clamped them! This time for real!"
-	energy_drain = 10
-	dam_force = 20
-	real_clamp = TRUE
-
-/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/kill/action(atom/target)
-	if(!action_checks(target))
-		return
-	if(!cargo_holder)
-		return
-	if(isobj(target))
-		var/obj/O = target
-		if(!O.anchored)
-			if(cargo_holder.cargo.len < cargo_holder.cargo_capacity)
-				chassis.visible_message("[chassis] lifts [target] and starts to load it into cargo compartment.")
-				O.anchored = TRUE
-				if(do_after_cooldown(target))
-					cargo_holder.cargo += O
-					O.forceMove(chassis)
-					O.anchored = FALSE
-					occupant_message("<span class='notice'>[target] successfully loaded.</span>")
-					mecha_log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]")
-				else
-					O.anchored = initial(O.anchored)
-			else
-				occupant_message("<span class='warning'>Not enough room in cargo compartment!</span>")
-		else
-			occupant_message("<span class='warning'>[target] is firmly secured!</span>")
-
-	else if(isliving(target))
-		var/mob/living/M = target
-		if(M.stat == DEAD)
-			return
-		if(chassis.occupant.a_intent == INTENT_HARM)
-			if(real_clamp)
-				M.take_overall_damage(dam_force)
-				if(!M)
-					return
-				M.adjustOxyLoss(round(dam_force/2))
-				M.updatehealth()
-				target.visible_message("<span class='danger'>[chassis] destroys [target] in an unholy fury.</span>", \
-									"<span class='userdanger'>[chassis] destroys [target] in an unholy fury.</span>")
-				log_combat(chassis.occupant, M, "attacked", "[name]", "(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYE: [uppertext(damtype)])")
-			else
-				target.visible_message("<span class='danger'>[chassis] destroys [target] in an unholy fury.</span>", \
-									"<span class='userdanger'>[chassis] destroys [target] in an unholy fury.</span>")
-		else if(chassis.occupant.a_intent == INTENT_DISARM)
-			if(real_clamp)
-				var/mob/living/carbon/C = target
-				var/play_sound = FALSE
-				var/limbs_gone = ""
-				var/obj/item/bodypart/affected = C.get_bodypart(BODY_ZONE_L_ARM)
-				if(affected != null)
-					affected.dismember(damtype)
-					play_sound = TRUE
-					limbs_gone = ", [affected]"
-				affected = C.get_bodypart(BODY_ZONE_R_ARM)
-				if(affected != null)
-					affected.dismember(damtype)
-					play_sound = TRUE
-					limbs_gone = "[limbs_gone], [affected]"
-				if(play_sound)
-					playsound(src, get_dismember_sound(), 80, TRUE)
-					target.visible_message("<span class='danger'>[chassis] rips [target]'s arms off.</span>", \
-								   "<span class='userdanger'>[chassis] rips [target]'s arms off.</span>")
-					log_combat(chassis.occupant, M, "dismembered of[limbs_gone],", "[name]", "(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYE: [uppertext(damtype)])")
-			else
-				target.visible_message("<span class='danger'>[chassis] rips [target]'s arms off.</span>", \
-								   "<span class='userdanger'>[chassis] rips [target]'s arms off.</span>")
-		else
-			step_away(M,chassis)
-			target.visible_message("[chassis] tosses [target] like a piece of paper.")
-		return 1
-
-
-
-/obj/item/mecha_parts/mecha_equipment/extinguisher
-	name = "exosuit extinguisher"
-	desc = "Equipment for engineering exosuits. A rapid-firing high capacity fire extinguisher."
-	icon_state = "mecha_exting"
-	equip_cooldown = 5
-	energy_drain = 0
-	range = MELEE|RANGED
-	mech_flags = EXOSUIT_MODULE_WORKING
-
-/obj/item/mecha_parts/mecha_equipment/extinguisher/Initialize()
-	. = ..()
-	create_reagents(1000)
-	reagents.add_reagent(/datum/reagent/water, 1000)
-
-/obj/item/mecha_parts/mecha_equipment/extinguisher/action(atom/target) //copypasted from extinguisher. TODO: Rewrite from scratch.
-	if(!action_checks(target) || get_dist(chassis, target)>3)
-		return
-
-	if(istype(target, /obj/structure/reagent_dispensers/watertank) && get_dist(chassis,target) <= 1)
-		var/obj/structure/reagent_dispensers/watertank/WT = target
-		WT.reagents.trans_to(src, 1000)
-		occupant_message("<span class='notice'>Extinguisher refilled.</span>")
-		playsound(chassis, 'sound/effects/refill.ogg', 50, 1, -6)
-	else
-		if(reagents.total_volume > 0)
-			playsound(chassis, 'sound/effects/extinguish.ogg', 75, 1, -3)
-			var/direction = get_dir(chassis,target)
-			var/turf/T = get_turf(target)
-			var/turf/T1 = get_step(T,turn(direction, 90))
-			var/turf/T2 = get_step(T,turn(direction, -90))
-
-			var/list/the_targets = list(T,T1,T2)
-			spawn(0)
-				for(var/a=0, a<5, a++)
-					var/obj/effect/particle_effect/water/W = new /obj/effect/particle_effect/water(get_turf(chassis))
-					if(!W)
-						return
-					var/turf/my_target = pick(the_targets)
-					var/datum/reagents/R = new/datum/reagents(5)
-					W.reagents = R
-					R.my_atom = W
-					reagents.trans_to(W,1)
-					for(var/b=0, b<4, b++)
-						if(!W)
-							return
-						step_towards(W,my_target)
-						if(!W)
-							return
-						var/turf/W_turf = get_turf(W)
-						W.reagents.reaction(W_turf)
-						for(var/atom/atm in W_turf)
-							W.reagents.reaction(atm)
-						if(W.loc == my_target)
-							break
-						sleep(2)
-		return 1
-
-/obj/item/mecha_parts/mecha_equipment/extinguisher/get_equip_info()
-	return "[..()] \[[src.reagents.total_volume]\]"
-
-/obj/item/mecha_parts/mecha_equipment/extinguisher/can_attach(obj/mecha/working/M as obj)
-	if(..())
-		if(istype(M))
-			return 1
-	return 0
-
-
-
-/obj/item/mecha_parts/mecha_equipment/rcd
-	name = "mounted RCD"
-	desc = "An exosuit-mounted Rapid Construction Device."
-	icon_state = "mecha_rcd"
-	equip_cooldown = 10
-	energy_drain = 250
-	range = MELEE|RANGED
-	item_flags = NO_MAT_REDEMPTION
-	var/mode = 0 //0 - deconstruct, 1 - wall or floor, 2 - airlock.
-
-/obj/item/mecha_parts/mecha_equipment/rcd/Initialize()
-	. = ..()
-	GLOB.rcd_list += src
-
-/obj/item/mecha_parts/mecha_equipment/rcd/Destroy()
-	GLOB.rcd_list -= src
-	return ..()
-
-/obj/item/mecha_parts/mecha_equipment/rcd/action(atom/target)
-	if(istype(target, /turf/open/space/transit))//>implying these are ever made -Sieve
-		return
-
-	if(!isturf(target) && !istype(target, /obj/machinery/door/airlock))
-		target = get_turf(target)
-	if(!action_checks(target) || get_dist(chassis, target)>3)
-		return
-	playsound(chassis, 'sound/machines/click.ogg', 50, 1)
-
-	switch(mode)
-		if(0)
-			if(iswallturf(target))
-				var/turf/closed/wall/W = target
-				occupant_message("Deconstructing [W]...")
-				if(do_after_cooldown(W))
-					chassis.spark_system.start()
-					W.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
-					playsound(W, 'sound/items/deconstruct.ogg', 50, 1)
-			else if(isfloorturf(target))
-				var/turf/open/floor/F = target
-				occupant_message("Deconstructing [F]...")
-				if(do_after_cooldown(target))
-					chassis.spark_system.start()
-					F.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
-					playsound(F, 'sound/items/deconstruct.ogg', 50, 1)
-			else if (istype(target, /obj/machinery/door/airlock))
-				occupant_message("Deconstructing [target]...")
-				if(do_after_cooldown(target))
-					chassis.spark_system.start()
-					qdel(target)
-					playsound(target, 'sound/items/deconstruct.ogg', 50, 1)
-		if(1)
-			if(isspaceturf(target))
-				var/turf/open/space/S = target
-				occupant_message("Building Floor...")
-				if(do_after_cooldown(S))
-					S.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
-					playsound(S, 'sound/items/deconstruct.ogg', 50, 1)
-					chassis.spark_system.start()
-			else if(isfloorturf(target))
-				var/turf/open/floor/F = target
-				occupant_message("Building Wall...")
-				if(do_after_cooldown(F))
-					F.PlaceOnTop(/turf/closed/wall)
-					playsound(F, 'sound/items/deconstruct.ogg', 50, 1)
-					chassis.spark_system.start()
-		if(2)
-			if(isfloorturf(target))
-				occupant_message("Building Airlock...")
-				if(do_after_cooldown(target))
-					chassis.spark_system.start()
-					var/obj/machinery/door/airlock/T = new /obj/machinery/door/airlock(target)
-					T.autoclose = TRUE
-					playsound(target, 'sound/items/deconstruct.ogg', 50, 1)
-					playsound(target, 'sound/effects/sparks2.ogg', 50, 1)
-
-
-
-/obj/item/mecha_parts/mecha_equipment/rcd/do_after_cooldown(var/atom/target)
-	. = ..()
-
-/obj/item/mecha_parts/mecha_equipment/rcd/Topic(href,href_list)
-	..()
-	if(href_list["mode"])
-		mode = text2num(href_list["mode"])
-		switch(mode)
-			if(0)
-				occupant_message("Switched RCD to Deconstruct.")
-				energy_drain = initial(energy_drain)
-			if(1)
-				occupant_message("Switched RCD to Construct.")
-				energy_drain = 2*initial(energy_drain)
-			if(2)
-				occupant_message("Switched RCD to Construct Airlock.")
-				energy_drain = 2*initial(energy_drain)
-	return
-
-/obj/item/mecha_parts/mecha_equipment/rcd/get_equip_info()
-	return "[..()] \[<a href='?src=[REF(src)];mode=0'>D</a>|<a href='?src=[REF(src)];mode=1'>C</a>|<a href='?src=[REF(src)];mode=2'>A</a>\]"
-
-
-
-
-/obj/item/mecha_parts/mecha_equipment/cable_layer
-	name = "cable layer"
-	desc = "Equipment for engineering exosuits. Lays cable along the exosuit's path."
-	icon_state = "mecha_wire"
-	var/datum/callback/event
-	var/turf/old_turf
-	var/obj/structure/cable/last_piece
-	var/obj/item/stack/cable_coil/cable
-	var/max_cable = 1000
-
-/obj/item/mecha_parts/mecha_equipment/cable_layer/Initialize()
-	. = ..()
-	cable = new(src, 0)
-
-/obj/item/mecha_parts/mecha_equipment/cable_layer/can_attach(obj/mecha/working/M)
-	if(..())
-		if(istype(M))
-			return 1
-	return 0
-
-/obj/item/mecha_parts/mecha_equipment/cable_layer/attach()
-	..()
-	event = chassis.events.addEvent("onMove", CALLBACK(src, .proc/layCable))
-	return
-
-/obj/item/mecha_parts/mecha_equipment/cable_layer/detach()
-	chassis.events.clearEvent("onMove",event)
-	return ..()
-
-/obj/item/mecha_parts/mecha_equipment/cable_layer/Destroy()
-	if(chassis)
-		chassis.events.clearEvent("onMove",event)
-	return ..()
-
-/obj/item/mecha_parts/mecha_equipment/cable_layer/action(var/obj/item/stack/cable_coil/target)
-	if(!action_checks(target))
-		return
-	if(istype(target) && target.amount)
-		var/cur_amount = cable? cable.amount : 0
-		var/to_load = max(max_cable - cur_amount,0)
-		if(to_load)
-			to_load = min(target.amount, to_load)
-			if(!cable)
-				cable = new(src, 0)
-			cable.amount += to_load
-			target.use(to_load)
-			occupant_message("<span class='notice'>[to_load] meters of cable successfully loaded.</span>")
-			send_byjax(chassis.occupant,"exosuit.browser","[REF(src)]",src.get_equip_info())
-		else
-			occupant_message("<span class='warning'>Reel is full.</span>")
-	else
-		occupant_message("<span class='warning'>Unable to load [target] - no cable found.</span>")
-
-
-/obj/item/mecha_parts/mecha_equipment/cable_layer/Topic(href,href_list)
-	..()
-	if(href_list["toggle"])
-		set_ready_state(!equip_ready)
-		occupant_message("[src] [equip_ready?"dea":"a"]ctivated.")
-		mecha_log_message("[equip_ready?"Dea":"A"]ctivated.")
-		return
-	if(href_list["cut"])
-		if(cable && cable.amount)
-			var/m = round(input(chassis.occupant,"Please specify the length of cable to cut","Cut cable",min(cable.amount,30)) as num, 1)
-			m = min(m, cable.amount)
-			if(m)
-				use_cable(m)
-				new /obj/item/stack/cable_coil(get_turf(chassis), m)
-		else
-			occupant_message("There's no more cable on the reel.")
-	return
-
-/obj/item/mecha_parts/mecha_equipment/cable_layer/get_equip_info()
-	var/output = ..()
-	if(output)
-		return "[output] \[Cable: [cable ? cable.amount : 0] m\][(cable && cable.amount) ? "- <a href='?src=[REF(src)];toggle=1'>[!equip_ready?"Dea":"A"]ctivate</a>|<a href='?src=[REF(src)];cut=1'>Cut</a>" : null]"
-	return
-
-/obj/item/mecha_parts/mecha_equipment/cable_layer/proc/use_cable(amount)
-	if(!cable || cable.amount<1)
-		set_ready_state(1)
-		occupant_message("Cable depleted, [src] deactivated.")
-		mecha_log_message("Cable depleted, [src] deactivated.")
-		return
-	if(cable.amount < amount)
-		occupant_message("No enough cable to finish the task.")
-		return
-	cable.use(amount)
-	update_equip_info()
-	return 1
-
-/obj/item/mecha_parts/mecha_equipment/cable_layer/proc/reset()
-	last_piece = null
-
-/obj/item/mecha_parts/mecha_equipment/cable_layer/proc/dismantleFloor(var/turf/new_turf)
-	if(isfloorturf(new_turf))
-		var/turf/open/floor/T = new_turf
-		if(!isplatingturf(T))
-			if(!T.broken && !T.burnt)
-				new T.floor_tile(T)
-			T.make_plating()
-	return !new_turf.intact
-
-/obj/item/mecha_parts/mecha_equipment/cable_layer/proc/layCable(var/turf/new_turf)
-	if(equip_ready || !istype(new_turf) || !dismantleFloor(new_turf))
-		return reset()
-	var/fdirn = turn(chassis.dir,180)
-	for(var/obj/structure/cable/LC in new_turf)		// check to make sure there's not a cable there already
-		if(LC.d1 == fdirn || LC.d2 == fdirn)
-			return reset()
-	if(!use_cable(1))
-		return reset()
-	var/obj/structure/cable/NC = new(new_turf, "red")
-	NC.d1 = 0
-	NC.d2 = fdirn
-	NC.update_icon()
-
-	var/datum/powernet/PN
-	if(last_piece && last_piece.d2 != chassis.dir)
-		last_piece.d1 = min(last_piece.d2, chassis.dir)
-		last_piece.d2 = max(last_piece.d2, chassis.dir)
-		last_piece.update_icon()
-		PN = last_piece.powernet
-
-	if(!PN)
-		PN = new()
-		GLOB.powernets += PN
-	NC.powernet = PN
-	PN.cables += NC
-	NC.mergeConnectedNetworks(NC.d2)
-
-	//NC.mergeConnectedNetworksOnTurf()
-	last_piece = NC
-	return 1
@@ -1,285 +0,0 @@
-//////////////////////////////////////// Action Buttons ///////////////////////////////////////////////
-
-/obj/mecha/proc/GrantActions(mob/living/user, human_occupant = 0)
-	if(human_occupant)
-		eject_action.Grant(user, src)
-	internals_action.Grant(user, src)
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	strafing_action.Grant(user, src)
-
-
-/obj/mecha/proc/RemoveActions(mob/living/user, human_occupant = 0)
-	if(human_occupant)
-		eject_action.Remove(user)
-	internals_action.Remove(user)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	strafing_action.Remove(user)
-
-
-/datum/action/innate/mecha
-	check_flags = AB_CHECK_RESTRAINED | AB_CHECK_STUN | AB_CHECK_CONSCIOUS
-	icon_icon = 'icons/mob/actions/actions_mecha.dmi'
-	var/obj/mecha/chassis
-
-/datum/action/innate/mecha/Grant(mob/living/L, obj/mecha/M)
-	if(M)
-		chassis = M
-	..()
-
-/datum/action/innate/mecha/Destroy()
-	chassis = null
-	return ..()
-
-/datum/action/innate/mecha/mech_eject
-	name = "Eject From Mech"
-	button_icon_state = "mech_eject"
-
-/datum/action/innate/mecha/mech_eject/Activate()
-	if(!owner)
-		return
-	if(!chassis || chassis.occupant != owner)
-		return
-	chassis.go_out()
-
-
-/datum/action/innate/mecha/mech_toggle_internals
-	name = "Toggle Internal Airtank Usage"
-	button_icon_state = "mech_internals_off"
-
-/datum/action/innate/mecha/mech_toggle_internals/Activate()
-	if(!owner || !chassis || chassis.occupant != owner)
-		return
-	chassis.use_internal_tank = !chassis.use_internal_tank
-	button_icon_state = "mech_internals_[chassis.use_internal_tank ? "on" : "off"]"
-	chassis.occupant_message("Now taking air from [chassis.use_internal_tank?"internal airtank":"environment"].")
-	chassis.mecha_log_message("Now taking air from [chassis.use_internal_tank?"internal airtank":"environment"].")
-	UpdateButtonIcon()
-
-/datum/action/innate/mecha/mech_cycle_equip
-	name = "Cycle Equipment"
-	button_icon_state = "mech_cycle_equip_off"
-
-/datum/action/innate/mecha/mech_cycle_equip/Activate()
-	if(!owner || !chassis || chassis.occupant != owner)
-		return
-
-	var/list/available_equipment = list()
-	for(var/obj/item/mecha_parts/mecha_equipment/M in chassis.equipment)
-		if(M.selectable)
-			available_equipment += M
-
-	if(available_equipment.len == 0)
-		chassis.occupant_message("No equipment available.")
-		return
-	if(!chassis.selected)
-		chassis.selected = available_equipment[1]
-		chassis.occupant_message("You select [chassis.selected]")
-		send_byjax(chassis.occupant,"exosuit.browser","eq_list",chassis.get_equipment_list())
-		button_icon_state = "mech_cycle_equip_on"
-		UpdateButtonIcon()
-		return
-	var/number = 0
-	for(var/A in available_equipment)
-		number++
-		if(A == chassis.selected)
-			if(available_equipment.len == number)
-				chassis.selected = null
-				chassis.occupant_message("You switch to no equipment")
-				button_icon_state = "mech_cycle_equip_off"
-			else
-				chassis.selected = available_equipment[number+1]
-				chassis.occupant_message("You switch to [chassis.selected]")
-				button_icon_state = "mech_cycle_equip_on"
-			send_byjax(chassis.occupant,"exosuit.browser","eq_list",chassis.get_equipment_list())
-			UpdateButtonIcon()
-			return
-
-
-/datum/action/innate/mecha/mech_toggle_lights
-	name = "Toggle Lights"
-	button_icon_state = "mech_lights_off"
-
-/datum/action/innate/mecha/mech_toggle_lights/Activate()
-	if(!owner || !chassis || chassis.occupant != owner)
-		return
-	chassis.lights = !chassis.lights
-	if(chassis.lights)
-		chassis.set_light(chassis.lights_power)
-		button_icon_state = "mech_lights_on"
-	else
-		chassis.set_light(-chassis.lights_power)
-		button_icon_state = "mech_lights_off"
-	chassis.occupant_message("Toggled lights [chassis.lights?"on":"off"].")
-	chassis.mecha_log_message("Toggled lights [chassis.lights?"on":"off"].")
-	UpdateButtonIcon()
-
-/datum/action/innate/mecha/mech_view_stats
-	name = "View Stats"
-	button_icon_state = "mech_view_stats"
-
-/datum/action/innate/mecha/mech_view_stats/Activate()
-	if(!owner || !chassis || chassis.occupant != owner)
-		return
-	chassis.occupant << browse(chassis.get_stats_html(), "window=exosuit")
-
-
-/datum/action/innate/mecha/strafe
-	name = "Toggle Strafing. Disabled when Alt is held."
-	button_icon_state = "strafe"
-
-/datum/action/innate/mecha/strafe/Activate()
-	if(!owner || !chassis || chassis.occupant != owner)
-		return
-
-	chassis.toggle_strafe()
-
-/obj/mecha/AltClick(mob/living/user)
-	. = ..()
-	if((user == occupant) && user.canUseTopic(src))
-		toggle_strafe()
-		return TRUE
-
-/obj/mecha/proc/toggle_strafe()
-	strafe = !strafe
-
-	occupant_message("Toggled strafing mode [strafe?"on":"off"].")
-	mecha_log_message("Toggled strafing mode [strafe?"on":"off"].")
-	strafing_action.UpdateButtonIcon()
-
-//////////////////////////////////////// Specific Ability Actions  ///////////////////////////////////////////////
-//Need to be granted by the mech type, Not default abilities.
-
-/datum/action/innate/mecha/mech_toggle_thrusters
-	name = "Toggle Thrusters"
-	button_icon_state = "mech_thrusters_off"
-
-/datum/action/innate/mecha/mech_toggle_thrusters/Activate()
-	if(!owner || !chassis || chassis.occupant != owner)
-		return
-	if(chassis.get_charge() > 0)
-		chassis.thrusters_active = !chassis.thrusters_active
-		button_icon_state = "mech_thrusters_[chassis.thrusters_active ? "on" : "off"]"
-		chassis.mecha_log_message("Toggled thrusters.")
-		chassis.occupant_message("<font color='[chassis.thrusters_active ?"blue":"red"]'>Thrusters [chassis.thrusters_active ?"en":"dis"]abled.")
-
-
-/datum/action/innate/mecha/mech_defence_mode
-	name = "Toggle Defence Mode"
-	button_icon_state = "mech_defense_mode_off"
-
-/datum/action/innate/mecha/mech_defence_mode/Activate(forced_state = null)
-	if(!owner || !chassis || chassis.occupant != owner)
-		return
-	if(!isnull(forced_state))
-		chassis.defence_mode = forced_state
-	else
-		chassis.defence_mode = !chassis.defence_mode
-	button_icon_state = "mech_defense_mode_[chassis.defence_mode ? "on" : "off"]"
-	if(chassis.defence_mode)
-		chassis.deflect_chance = chassis.defence_mode_deflect_chance
-		chassis.occupant_message("<span class='notice'>You enable [chassis] defence mode.</span>")
-	else
-		chassis.deflect_chance = initial(chassis.deflect_chance)
-		chassis.occupant_message("<span class='danger'>You disable [chassis] defence mode.</span>")
-	chassis.mecha_log_message("Toggled defence mode.")
-	UpdateButtonIcon()
-
-/datum/action/innate/mecha/mech_overload_mode
-	name = "Toggle leg actuators overload"
-	button_icon_state = "mech_overload_off"
-
-/datum/action/innate/mecha/mech_overload_mode/Activate(forced_state = null)
-	if(!owner || !chassis || chassis.occupant != owner)
-		return
-	if(!isnull(forced_state))
-		chassis.leg_overload_mode = forced_state
-	else
-		chassis.leg_overload_mode = !chassis.leg_overload_mode
-	button_icon_state = "mech_overload_[chassis.leg_overload_mode ? "on" : "off"]"
-	chassis.mecha_log_message("Toggled leg actuators overload.")
-	if(chassis.leg_overload_mode)
-		chassis.leg_overload_mode = 1
-		chassis.bumpsmash = 1
-		chassis.step_in = min(1, round(chassis.step_in/2))
-		chassis.step_energy_drain = max(chassis.overload_step_energy_drain_min,chassis.step_energy_drain*chassis.leg_overload_coeff)
-		chassis.occupant_message("<span class='danger'>You enable leg actuators overload.</span>")
-	else
-		chassis.leg_overload_mode = 0
-		chassis.bumpsmash = 0
-		chassis.step_in = initial(chassis.step_in)
-		chassis.step_energy_drain = chassis.normal_step_energy_drain
-		chassis.occupant_message("<span class='notice'>You disable leg actuators overload.</span>")
-	UpdateButtonIcon()
-
-/datum/action/innate/mecha/mech_smoke
-	name = "Smoke"
-	button_icon_state = "mech_smoke"
-
-/datum/action/innate/mecha/mech_smoke/Activate()
-	if(!owner || !chassis || chassis.occupant != owner)
-		return
-	if(chassis.smoke_ready && chassis.smoke>0)
-		chassis.smoke_system.start()
-		chassis.smoke--
-		chassis.smoke_ready = 0
-		spawn(chassis.smoke_cooldown)
-			chassis.smoke_ready = 1
-
-
-/datum/action/innate/mecha/mech_zoom
-	name = "Zoom"
-	button_icon_state = "mech_zoom_off"
-
-/datum/action/innate/mecha/mech_zoom/Activate()
-	if(!owner || !chassis || chassis.occupant != owner)
-		return
-	if(owner.client)
-		chassis.zoom_mode = !chassis.zoom_mode
-		button_icon_state = "mech_zoom_[chassis.zoom_mode ? "on" : "off"]"
-		chassis.mecha_log_message("Toggled zoom mode.")
-		chassis.occupant_message("<font color='[chassis.zoom_mode?"blue":"red"]'>Zoom mode [chassis.zoom_mode?"en":"dis"]abled.</font>")
-		if(chassis.zoom_mode)
-			owner.client.view_size.setTo(4.5)
-			SEND_SOUND(owner, sound('sound/mecha/imag_enh.ogg',volume=50))
-		else
-			owner.client.view_size.resetToDefault() 
-		UpdateButtonIcon()
-
-/datum/action/innate/mecha/mech_switch_damtype
-	name = "Reconfigure arm microtool arrays"
-	button_icon_state = "mech_damtype_brute"
-
-/datum/action/innate/mecha/mech_switch_damtype/Activate()
-	if(!owner || !chassis || chassis.occupant != owner)
-		return
-	var/new_damtype
-	switch(chassis.damtype)
-		if("tox")
-			new_damtype = "brute"
-			chassis.occupant_message("Your exosuit's hands form into fists.")
-		if("brute")
-			new_damtype = "fire"
-			chassis.occupant_message("A torch tip extends from your exosuit's hand, glowing red.")
-		if("fire")
-			new_damtype = "tox"
-			chassis.occupant_message("A bone-chillingly thick plasteel needle protracts from the exosuit's palm.")
-	chassis.damtype = new_damtype
-	button_icon_state = "mech_damtype_[new_damtype]"
-	playsound(src, 'sound/mecha/mechmove01.ogg', 50, 1)
-	UpdateButtonIcon()
-
-/datum/action/innate/mecha/mech_toggle_phasing
-	name = "Toggle Phasing"
-	button_icon_state = "mech_phasing_off"
-
-/datum/action/innate/mecha/mech_toggle_phasing/Activate()
-	if(!owner || !chassis || chassis.occupant != owner)
-		return
-	chassis.phasing = !chassis.phasing
-	button_icon_state = "mech_phasing_[chassis.phasing ? "on" : "off"]"
-	chassis.occupant_message("<font color=\"[chassis.phasing?"#00f\">En":"#f00\">Dis"]abled phasing.</font>")
-	UpdateButtonIcon()
@@ -1,334 +0,0 @@
-/obj/mecha/proc/get_armour_facing(relative_dir)
-	switch(relative_dir)
-		if(180) // BACKSTAB!
-			return facing_modifiers[BACK_ARMOUR]
-		if(0, 45) // direct or 45 degrees off
-			return facing_modifiers[FRONT_ARMOUR]
-	return facing_modifiers[SIDE_ARMOUR] //if its not a front hit or back hit then assume its from the side
-
-/obj/mecha/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
-	. = ..()
-	if(. && obj_integrity > 0)
-		spark_system.start()
-		switch(damage_flag)
-			if("fire")
-				check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL))
-			if("melee")
-				check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
-			else
-				check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT))
-		if(. >= 5 || prob(33))
-			occupant_message("<span class='userdanger'>Taking damage!</span>")
-		log_append_to_last("Took [damage_amount] points of damage. Damage type: \"[damage_type]\".",1)
-
-/obj/mecha/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
-	. = ..()
-	if(!damage_amount)
-		return 0
-	var/booster_deflection_modifier = 1
-	var/booster_damage_modifier = 1
-	if(damage_flag == "bullet" || damage_flag == "laser" || damage_flag == "energy")
-		for(var/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/B in equipment)
-			if(B.projectile_react())
-				booster_deflection_modifier = B.deflect_coeff
-				booster_damage_modifier = B.damage_coeff
-				break
-	else if(damage_flag == "melee")
-		for(var/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/B in equipment)
-			if(B.attack_react())
-				booster_deflection_modifier *= B.deflect_coeff
-				booster_damage_modifier *= B.damage_coeff
-				break
-
-	if(attack_dir)
-		var/facing_modifier = get_armour_facing(abs(dir2angle(dir) - dir2angle(attack_dir)))
-		booster_damage_modifier /= facing_modifier
-		booster_deflection_modifier *= facing_modifier
-	if(prob(deflect_chance * booster_deflection_modifier))
-		visible_message("<span class='danger'>[src]'s armour deflects the attack!</span>")
-		log_append_to_last("Armor saved.")
-		return 0
-	if(.)
-		. *= booster_damage_modifier
-
-
-/obj/mecha/on_attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
-	user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
-	playsound(loc, 'sound/weapons/tap.ogg', 40, 1, -1)
-	user.visible_message("<span class='danger'>[user] hits [name]. Nothing happens</span>", null, null, COMBAT_MESSAGE_RANGE)
-	mecha_log_message("Attack by hand/paw. Attacker - [user].", color="red")
-	log_append_to_last("Armor saved.")
-
-/obj/mecha/attack_paw(mob/user as mob)
-	return attack_hand(user)
-
-
-/obj/mecha/attack_alien(mob/living/user)
-	mecha_log_message("Attack by alien. Attacker - [user].", color="red")
-	playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1)
-	attack_generic(user, 15, BRUTE, "melee", 0)
-
-/obj/mecha/attack_animal(mob/living/simple_animal/user)
-	mecha_log_message("Attack by simple animal. Attacker - [user].", color="red")
-	if(!user.melee_damage_upper && !user.obj_damage)
-		user.emote("custom", message = "[user.friendly_verb_continuous] [src].")
-		return 0
-	else
-		var/play_soundeffect = 1
-		if(user.environment_smash)
-			play_soundeffect = 0
-			playsound(src, 'sound/effects/bang.ogg', 50, 1)
-		var/animal_damage = rand(user.melee_damage_lower,user.melee_damage_upper)
-		if(user.obj_damage)
-			animal_damage = user.obj_damage
-		animal_damage = min(animal_damage, 20*user.environment_smash)
-		attack_generic(user, animal_damage, user.melee_damage_type, "melee", play_soundeffect)
-		log_combat(user, src, "attacked")
-		return 1
-
-
-/obj/mecha/hulk_damage()
-	return 15
-
-/obj/mecha/attack_hulk(mob/living/carbon/human/user)
-	. = ..()
-	if(.)
-		mecha_log_message("Attack by hulk. Attacker - [user].", color="red")
-		log_combat(user, src, "punched", "hulk powers")
-
-/obj/mecha/blob_act(obj/structure/blob/B)
-	take_damage(30, BRUTE, "melee", 0, get_dir(src, B))
-
-/obj/mecha/attack_tk()
-	return
-
-/obj/mecha/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) //wrapper
-	mecha_log_message("Hit by [AM].", color="red")
-	. = ..()
-
-
-/obj/mecha/bullet_act(obj/item/projectile/Proj) //wrapper
-	mecha_log_message("Hit by projectile. Type: [Proj.name]([Proj.flag]).", color="red")
-	. = ..()
-
-/obj/mecha/ex_act(severity, target, origin)
-	mecha_log_message("Affected by explosion of severity: [severity].", color="red")
-	if(prob(deflect_chance))
-		severity++
-		log_append_to_last("Armor saved, changing severity to [severity].")
-	. = ..()
-
-/obj/mecha/contents_explosion(severity, target, origin)
-	severity++
-	for(var/X in equipment)
-		var/obj/item/mecha_parts/mecha_equipment/ME = X
-		ME.ex_act(severity, target, origin)
-	for(var/Y in trackers)
-		var/obj/item/mecha_parts/mecha_tracking/MT = Y
-		MT.ex_act(severity, target, origin)
-	if(occupant)
-		occupant.ex_act(severity, target, origin)
-
-/obj/mecha/handle_atom_del(atom/A)
-	if(A == occupant)
-		occupant = null
-		icon_state = initial(icon_state)+"-open"
-		setDir(dir_in)
-
-/obj/mecha/emp_act(severity)
-	. = ..()
-	if (. & EMP_PROTECT_SELF)
-		return
-	if(get_charge())
-		use_power((cell.charge/3)*(severity*0.005))
-		take_damage(severity/3, BURN, "energy", 1)
-	mecha_log_message("EMP detected", color="red")
-
-	if(istype(src, /obj/mecha/combat))
-		mouse_pointer = 'icons/mecha/mecha_mouse-disable.dmi'
-		occupant?.update_mouse_pointer()
-	if(!equipment_disabled && occupant) //prevent spamming this message with back-to-back EMPs
-		to_chat(occupant, "<span=danger>Error -- Connection to equipment control unit has been lost.</span>")
-	addtimer(CALLBACK(src, /obj/mecha/proc/restore_equipment), 3 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
-	equipment_disabled = 1
-
-/obj/mecha/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-	if(exposed_temperature>max_temperature)
-		mecha_log_message("Exposed to dangerous temperature.", color="red")
-		take_damage(5, BURN, 0, 1)
-
-/obj/mecha/attackby(obj/item/W as obj, mob/user as mob, params)
-
-	if(istype(W, /obj/item/mmi))
-		if(mmi_move_inside(W,user))
-			to_chat(user, "[src]-[W] interface initialized successfully.")
-		else
-			to_chat(user, "[src]-[W] interface initialization failed.")
-		return
-
-	if(istype(W, /obj/item/mecha_ammo))
-		ammo_resupply(W, user)
-		return
-
-	if(istype(W, /obj/item/mecha_parts/mecha_equipment))
-		var/obj/item/mecha_parts/mecha_equipment/E = W
-		spawn()
-			if(E.can_attach(src))
-				if(!user.temporarilyRemoveItemFromInventory(W))
-					return
-				E.attach(src)
-				user.visible_message("[user] attaches [W] to [src].", "<span class='notice'>You attach [W] to [src].</span>")
-			else
-				to_chat(user, "<span class='warning'>You were unable to attach [W] to [src]!</span>")
-		return
-	if(W.GetID())
-		if(add_req_access || maint_access)
-			if(internals_access_allowed(user))
-				var/obj/item/card/id/id_card
-				if(istype(W, /obj/item/card/id))
-					id_card = W
-				else
-					var/obj/item/pda/pda = W
-					id_card = pda.id
-				output_maintenance_dialog(id_card, user)
-				return
-			else
-				to_chat(user, "<span class='warning'>Invalid ID: Access denied.</span>")
-		else
-			to_chat(user, "<span class='warning'>Maintenance protocols disabled by operator.</span>")
-	else if(W.tool_behaviour == TOOL_WRENCH)
-		if(state==1)
-			state = 2
-			to_chat(user, "<span class='notice'>You undo the securing bolts.</span>")
-		else if(state==2)
-			state = 1
-			to_chat(user, "<span class='notice'>You tighten the securing bolts.</span>")
-		return
-	else if(W.tool_behaviour == TOOL_CROWBAR)
-		if(state==2)
-			state = 3
-			to_chat(user, "<span class='notice'>You open the hatch to the power unit.</span>")
-		else if(state==3)
-			state=2
-			to_chat(user, "<span class='notice'>You close the hatch to the power unit.</span>")
-		return
-	else if(istype(W, /obj/item/stack/cable_coil))
-		if(state == 3 && (internal_damage & MECHA_INT_SHORT_CIRCUIT))
-			if(W.use_tool(src, user, 0, 2))
-				clearInternalDamage(MECHA_INT_SHORT_CIRCUIT)
-				to_chat(user, "<span class='notice'>You replace the fused wires.</span>")
-			else
-				to_chat(user, "<span class='warning'>You need two lengths of cable to fix this mech!</span>")
-		return
-	else if(W.tool_behaviour == TOOL_SCREWDRIVER && user.a_intent != INTENT_HARM)
-		if(internal_damage & MECHA_INT_TEMP_CONTROL)
-			clearInternalDamage(MECHA_INT_TEMP_CONTROL)
-			to_chat(user, "<span class='notice'>You repair the damaged temperature controller.</span>")
-		else if(state==3 && cell)
-			cell.forceMove(loc)
-			cell = null
-			state = 4
-			to_chat(user, "<span class='notice'>You unscrew and pry out the powercell.</span>")
-			mecha_log_message("Powercell removed")
-		else if(state==4 && cell)
-			state=3
-			to_chat(user, "<span class='notice'>You screw the cell in place.</span>")
-		return
-
-	else if(istype(W, /obj/item/stock_parts/cell))
-		if(state==4)
-			if(!cell)
-				if(!user.transferItemToLoc(W, src))
-					return
-				var/obj/item/stock_parts/cell/C = W
-				to_chat(user, "<span class='notice'>You install the powercell.</span>")
-				cell = C
-				mecha_log_message("Powercell installed")
-			else
-				to_chat(user, "<span class='notice'>There's already a powercell installed.</span>")
-		return
-
-	else if(W.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM)
-		user.DelayNextAction(CLICK_CD_MELEE)
-		if(obj_integrity < max_integrity)
-			if(W.use_tool(src, user, 0, volume=50, amount=1))
-				if (internal_damage & MECHA_INT_TANK_BREACH)
-					clearInternalDamage(MECHA_INT_TANK_BREACH)
-					to_chat(user, "<span class='notice'>You repair the damaged gas tank.</span>")
-				else
-					user.visible_message("<span class='notice'>[user] repairs some damage to [name].</span>", "<span class='notice'>You repair some damage to [src].</span>")
-					obj_integrity += min(10, max_integrity-obj_integrity)
-					if(obj_integrity == max_integrity)
-						to_chat(user, "<span class='notice'>It looks to be fully repaired now.</span>")
-			return 1
-		else
-			to_chat(user, "<span class='warning'>The [name] is at full integrity!</span>")
-		return 1
-
-	else if(istype(W, /obj/item/mecha_parts/mecha_tracking))
-		var/obj/item/mecha_parts/mecha_tracking/tracker = W
-		tracker.try_attach_part(user, src)
-		return
-	else
-		return ..()
-
-/obj/mecha/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
-	mecha_log_message("Attacked by [I]. Attacker - [user]")
-	return ..()
-
-/obj/mecha/proc/mech_toxin_damage(mob/living/target)
-	playsound(src, 'sound/effects/spray2.ogg', 50, 1)
-	if(target.reagents)
-		if(target.reagents.get_reagent_amount(/datum/reagent/cryptobiolin) + force < force*2)
-			target.reagents.add_reagent(/datum/reagent/cryptobiolin, force/2)
-		if(target.reagents.get_reagent_amount(/datum/reagent/toxin) + force < force*2)
-			target.reagents.add_reagent(/datum/reagent/toxin, force/2.5)
-
-
-/obj/mecha/mech_melee_attack(obj/mecha/M)
-	if(!has_charge(melee_energy_drain))
-		return 0
-	use_power(melee_energy_drain)
-	if(M.damtype == BRUTE || M.damtype == BURN)
-		log_combat(M.occupant, src, "attacked", M, "(INTENT: [uppertext(M.occupant.a_intent)]) (DAMTYPE: [uppertext(M.damtype)])")
-		. = ..()
-
-/obj/mecha/proc/full_repair(charge_cell)
-	obj_integrity = max_integrity
-	if(cell && charge_cell)
-		cell.charge = cell.maxcharge
-	if(internal_damage & MECHA_INT_FIRE)
-		clearInternalDamage(MECHA_INT_FIRE)
-	if(internal_damage & MECHA_INT_TEMP_CONTROL)
-		clearInternalDamage(MECHA_INT_TEMP_CONTROL)
-	if(internal_damage & MECHA_INT_SHORT_CIRCUIT)
-		clearInternalDamage(MECHA_INT_SHORT_CIRCUIT)
-	if(internal_damage & MECHA_INT_TANK_BREACH)
-		clearInternalDamage(MECHA_INT_TANK_BREACH)
-	if(internal_damage & MECHA_INT_CONTROL_LOST)
-		clearInternalDamage(MECHA_INT_CONTROL_LOST)
-
-/obj/mecha/narsie_act()
-	emp_act(100)
-
-/obj/mecha/ratvar_act()
-	if((GLOB.ratvar_awakens || GLOB.clockwork_gateway_activated) && occupant)
-		if(is_servant_of_ratvar(occupant)) //reward the minion that got a mech by repairing it
-			full_repair(TRUE)
-		else
-			var/mob/living/L = occupant
-			go_out(TRUE)
-			if(L)
-				L.ratvar_act()
-
-/obj/mecha/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect)
-	if(!no_effect)
-		if(selected)
-			used_item = selected
-		else if(!visual_effect_icon)
-			visual_effect_icon = ATTACK_EFFECT_SMASH
-			if(damtype == BURN)
-				visual_effect_icon = ATTACK_EFFECT_MECHFIRE
-			else if(damtype == TOX)
-				visual_effect_icon = ATTACK_EFFECT_MECHTOXIN
-	..()
@@ -1,360 +0,0 @@
-
-////////////////////////////////////
-///// Rendering stats window ///////
-////////////////////////////////////
-
-/obj/mecha/proc/get_stats_html()
-	. = {"<html>
-						<head>
-						<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-						<title>[name] data</title>
-						<style>
-						body {color: #00ff00; background: #000000; font-family:"Lucida Console",monospace; font-size: 12px;}
-						hr {border: 1px solid #0f0; color: #0f0; background-color: #0f0;}
-						a {padding:2px 5px;;color:#0f0;}
-						.wr {margin-bottom: 5px;}
-						.header {cursor:pointer;}
-						.open, .closed {background: #32CD32; color:#000; padding:1px 2px;}
-						.links a {margin-bottom: 2px;padding-top:3px;}
-						.visible {display: block;}
-						.hidden {display: none;}
-						</style>
-						<script language='javascript' type='text/javascript'>
-						[js_byjax]
-						[js_dropdowns]
-						function SSticker() {
-							setInterval(function(){
-								window.location='byond://?src=[REF(src)]&update_content=1';
-							}, 1000);
-						}
-
-						window.onload = function() {
-							dropdowns();
-							SSticker();
-						}
-						</script>
-						</head>
-						<body>
-						<div id='content'>
-						[src.get_stats_part()]
-						</div>
-						<div id='eq_list'>
-						[src.get_equipment_list()]
-						</div>
-						<hr>
-						<div id='commands'>
-						[src.get_commands()]
-						</div>
-						</body>
-						</html>
-					 "}
-
-
-
-/obj/mecha/proc/report_internal_damage()
-	. = ""
-	var/list/dam_reports = list(
-		"[MECHA_INT_FIRE]" = "<span class='userdanger'>INTERNAL FIRE</span>",
-		"[MECHA_INT_TEMP_CONTROL]" = "<span class='userdanger'>LIFE SUPPORT SYSTEM MALFUNCTION</span>",
-		"[MECHA_INT_TANK_BREACH]" = "<span class='userdanger'>GAS TANK BREACH</span>",
-		"[MECHA_INT_CONTROL_LOST]" = "<span class='userdanger'>COORDINATION SYSTEM CALIBRATION FAILURE</span> - <a href='?src=[REF(src)];repair_int_control_lost=1'>Recalibrate</a>",
-		"[MECHA_INT_SHORT_CIRCUIT]" = "<span class='userdanger'>SHORT CIRCUIT</span>"
-								)
-	for(var/tflag in dam_reports)
-		var/intdamflag = text2num(tflag)
-		if(internal_damage & intdamflag)
-			. += dam_reports[tflag]
-			. += "<br />"
-	if(return_pressure() > WARNING_HIGH_PRESSURE)
-		. += "<span class='userdanger'>DANGEROUSLY HIGH CABIN PRESSURE</span><br />"
-
-
-
-/obj/mecha/proc/get_stats_part()
-	var/integrity = obj_integrity/max_integrity*100
-	var/cell_charge = get_charge()
-	var/datum/gas_mixture/int_tank_air = internal_tank.return_air()
-	var/tank_pressure = internal_tank ? round(int_tank_air.return_pressure(),0.01) : "None"
-	var/tank_temperature = internal_tank ? int_tank_air.return_temperature() : "Unknown"
-	var/cabin_pressure = round(return_pressure(),0.01)
-	. = {"[report_internal_damage()]
-						[integrity<30?"<span class='userdanger'>DAMAGE LEVEL CRITICAL</span><br>":null]
-						<b>Integrity: </b> [integrity]%<br>
-						<b>Powercell charge: </b>[isnull(cell_charge)?"No powercell installed":"[cell.percent()]%"]<br>
-						<b>Air source: </b>[use_internal_tank?"Internal Airtank":"Environment"]<br>
-						<b>Airtank pressure: </b>[tank_pressure]kPa<br>
-						<b>Airtank temperature: </b>[tank_temperature]&deg;K|[tank_temperature - T0C]&deg;C<br>
-						<b>Cabin pressure: </b>[cabin_pressure>WARNING_HIGH_PRESSURE ? "<span class='danger'>[cabin_pressure]</span>": cabin_pressure]kPa<br>
-						<b>Cabin temperature: </b> [return_temperature()]&deg;K|[return_temperature() - T0C]&deg;C<br>
-						[dna_lock?"<b>DNA-locked:</b><br> <span style='font-size:10px;letter-spacing:-1px;'>[dna_lock]</span> \[<a href='?src=[REF(src)];reset_dna=1'>Reset</a>\]<br>":""]<br>
-						[thrusters_action.owner ? "<b>Thrusters: </b> [thrusters_active ? "Enabled" : "Disabled"]<br>" : ""]
-						[defense_action.owner ? "<b>Defence Mode: </b> [defence_mode ? "Enabled" : "Disabled"]<br>" : ""]
-						[overload_action.owner ? "<b>Leg Actuators Overload: </b> [leg_overload_mode ? "Enabled" : "Disabled"]<br>" : ""]
-						[smoke_action.owner ? "<b>Smoke: </b> [smoke]<br>" : ""]
-						[zoom_action.owner ? "<b>Zoom: </b> [zoom_mode ? "Enabled" : "Disabled"]<br>" : ""]
-						[switch_damtype_action.owner ? "<b>Damtype: </b> [damtype]<br>" : ""]
-						[phasing_action.owner ? "<b>Phase Modulator: </b> [phasing ? "Enabled" : "Disabled"]<br>" : ""]
-					"}
-
-
-/obj/mecha/proc/get_commands()
-	. = {"<div class='wr'>
-						<div class='header'>Electronics</div>
-						<div class='links'>
-						<b>Radio settings:</b><br>
-						Microphone: <a href='?src=[REF(src)];rmictoggle=1'><span id="rmicstate">[radio.broadcasting?"Engaged":"Disengaged"]</span></a><br>
-						Speaker: <a href='?src=[REF(src)];rspktoggle=1'><span id="rspkstate">[radio.listening?"Engaged":"Disengaged"]</span></a><br>
-						Frequency:
-						<a href='?src=[REF(src)];rfreq=-10'>-</a>
-						<a href='?src=[REF(src)];rfreq=-2'>-</a>
-						<span id="rfreq">[format_frequency(radio.frequency)]</span>
-						<a href='?src=[REF(src)];rfreq=2'>+</a>
-						<a href='?src=[REF(src)];rfreq=10'>+</a><br>
-						</div>
-						</div>
-						<div class='wr'>
-						<div class='header'>Permissions & Logging</div>
-						<div class='links'>
-						<a href='?src=[REF(src)];toggle_id_upload=1'><span id='t_id_upload'>[add_req_access?"L":"Unl"]ock ID upload panel</span></a><br>
-						<a href='?src=[REF(src)];toggle_maint_access=1'><span id='t_maint_access'>[maint_access?"Forbid":"Permit"] maintenance protocols</span></a><br>
-						<a href='?src=[REF(src)];toggle_port_connection=1'><span id='t_port_connection'>[internal_tank.connected_port?"Disconnect from":"Connect to"] gas port</span></a><br>
-						<a href='?src=[REF(src)];dna_lock=1'>DNA-lock</a><br>
-						<a href='?src=[REF(src)];view_log=1'>View internal log</a><br>
-						<a href='?src=[REF(src)];change_name=1'>Change exosuit name</a><br>
-						</div>
-						</div>
-						<div id='equipment_menu'>[get_equipment_menu()]</div>
-						"}
-
-
-/obj/mecha/proc/get_equipment_menu() //outputs mecha html equipment menu
-	. = ""
-	if(equipment.len)
-		. += {"<div class='wr'>
-						<div class='header'>Equipment</div>
-						<div class='links'>"}
-		for(var/X in equipment)
-			var/obj/item/mecha_parts/mecha_equipment/W = X
-			. += "[W.name] <a href='?src=[REF(W)];detach=1'>Detach</a><br>"
-		. += "<b>Available equipment slots:</b> [max_equip-equipment.len]"
-		. += "</div></div>"
-
-
-/obj/mecha/proc/get_equipment_list() //outputs mecha equipment list in html
-	if(!equipment.len)
-		return
-	. = "<b>Equipment:</b><div style=\"margin-left: 15px;\">"
-	for(var/obj/item/mecha_parts/mecha_equipment/MT in equipment)
-		. += "<div id='[REF(MT)]'>[MT.get_equip_info()]</div>"
-	. += "</div>"
-
-
-
-/obj/mecha/proc/get_log_html()
-	. = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>[src.name] Log</title></head><body style='font: 13px 'Courier', monospace;'>"
-	for(var/list/entry in log)
-		. += {"<div style='font-weight: bold;'>[entry["time"]] [time2text(entry["date"],"MMM DD")] [entry["year"]]</div>
-						<div style='margin-left:15px; margin-bottom:10px;'>[entry["message"]]</div>
-						"}
-	. += "</body></html>"
-
-
-
-/obj/mecha/proc/output_access_dialog(obj/item/card/id/id_card, mob/user)
-	if(!id_card || !user)
-		return
-	. = {"<html>
-						<head>
-						<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-						<style>
-						h1 {font-size:15px;margin-bottom:4px;}
-						body {color: #00ff00; background: #000000; font-family:"Courier New", Courier, monospace; font-size: 12px;}
-						a {color:#0f0;}
-						</style>
-						</head>
-						<body>
-						<h1>Following keycodes are present in this system:</h1>"}
-	for(var/a in operation_req_access)
-		. += "[get_access_desc(a)] - <a href='?src=[REF(src)];del_req_access=[a];user=[REF(user)];id_card=[REF(id_card)]'>Delete</a><br>"
-	. += "<hr><h1>Following keycodes were detected on portable device:</h1>"
-	for(var/a in id_card.access)
-		if(a in operation_req_access)
-			continue
-		var/a_name = get_access_desc(a)
-		if(!a_name)
-			continue //there's some strange access without a name
-		. += "[a_name] - <a href='?src=[REF(src)];add_req_access=[a];user=[REF(user)];id_card=[REF(id_card)]'>Add</a><br>"
-	. += "<hr><a href='?src=[REF(src)];finish_req_access=1;user=[REF(user)]'>Finish</a> "
-	. += "<span class='danger'>(Warning! The ID upload panel will be locked. It can be unlocked only through Exosuit Interface.)</span>"
-	. += "</body></html>"
-	user << browse(., "window=exosuit_add_access")
-	onclose(user, "exosuit_add_access")
-
-
-/obj/mecha/proc/output_maintenance_dialog(obj/item/card/id/id_card,mob/user)
-	if(!id_card || !user)
-		return
-	. = {"<html>
-						<head>
-						<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-						<style>
-						body {color: #00ff00; background: #000000; font-family:"Courier New", Courier, monospace; font-size: 12px;}
-						a {padding:2px 5px; background:#32CD32;color:#000;display:block;margin:2px;text-align:center;text-decoration:none;}
-						</style>
-						</head>
-						<body>
-						[add_req_access?"<a href='?src=[REF(src)];req_access=1;id_card=[REF(id_card)];user=[REF(user)]'>Edit operation keycodes</a>":null]
-						[maint_access?"<a href='?src=[REF(src)];maint_access=1;id_card=[REF(id_card)];user=[REF(user)]'>[(state>0) ? "Terminate" : "Initiate"] maintenance protocol</a>":null]
-						[(state>0) ?"<a href='?src=[REF(src)];set_internal_tank_valve=1;user=[REF(user)]'>Set Cabin Air Pressure</a>":null]
-						</body>
-						</html>"}
-	user << browse(., "window=exosuit_maint_console")
-	onclose(user, "exosuit_maint_console")
-
-
-
-
-/////////////////
-///// Topic /////
-/////////////////
-
-/obj/mecha/Topic(href, href_list)
-	..()
-	if(href_list["close"])
-		return
-
-	if(usr.incapacitated())
-		return
-
-	if(in_range(src, usr))
-		var/obj/item/card/id/id_card
-		if (href_list["id_card"])
-			id_card = locate(href_list["id_card"])
-			if (!istype(id_card))
-				return
-
-		if(href_list["req_access"] && add_req_access)
-			output_access_dialog(id_card, usr)
-
-		if(href_list["maint_access"] && maint_access)
-			if(state==0)
-				state = 1
-				to_chat(usr, "The securing bolts are now exposed.")
-			else if(state==1)
-				state = 0
-				to_chat(usr, "The securing bolts are now hidden.")
-			output_maintenance_dialog(id_card, usr)
-
-		if(href_list["set_internal_tank_valve"] && state >=1)
-			var/new_pressure = input(usr,"Input new output pressure","Pressure setting",internal_tank_valve) as num
-			if(new_pressure)
-				internal_tank_valve = new_pressure
-				to_chat(usr, "The internal pressure valve has been set to [internal_tank_valve]kPa.")
-
-		if(href_list["add_req_access"] && add_req_access)
-			operation_req_access += text2num(href_list["add_req_access"])
-			output_access_dialog(id_card, usr)
-
-		if(href_list["del_req_access"] && add_req_access)
-			operation_req_access -= text2num(href_list["del_req_access"])
-			output_access_dialog(id_card, usr)
-
-		if(href_list["finish_req_access"])
-			add_req_access = 0
-			usr << browse(null,"window=exosuit_add_access")
-
-	if(usr != occupant)
-		return
-
-	if(href_list["update_content"])
-		send_byjax(usr,"exosuit.browser","content",src.get_stats_part())
-
-	if(href_list["select_equip"])
-		var/obj/item/mecha_parts/mecha_equipment/equip = locate(href_list["select_equip"]) in src
-		if(equip && equip.selectable)
-			selected = equip
-			occupant_message("You switch to [equip]")
-			visible_message("[src] raises [equip]")
-			send_byjax(usr, "exosuit.browser","eq_list", get_equipment_list())
-
-	if(href_list["rmictoggle"])
-		radio.broadcasting = !radio.broadcasting
-		send_byjax(usr,"exosuit.browser","rmicstate",(radio.broadcasting?"Engaged":"Disengaged"))
-
-	if(href_list["rspktoggle"])
-		radio.listening = !radio.listening
-		send_byjax(usr,"exosuit.browser","rspkstate",(radio.listening?"Engaged":"Disengaged"))
-
-	if(href_list["rfreq"])
-		var/new_frequency = (radio.frequency + text2num(href_list["rfreq"]))
-		if (!radio.freerange || (radio.frequency < MIN_FREE_FREQ || radio.frequency > MAX_FREE_FREQ))
-			new_frequency = sanitize_frequency(new_frequency)
-		radio.set_frequency(new_frequency)
-		send_byjax(usr,"exosuit.browser","rfreq","[format_frequency(radio.frequency)]")
-
-	if (href_list["view_log"])
-		src.occupant << browse(src.get_log_html(), "window=exosuit_log")
-		onclose(occupant, "exosuit_log")
-
-	if (href_list["change_name"])
-		var/userinput = stripped_input(occupant,"Choose new exosuit name","Rename exosuit","", MAX_NAME_LEN)
-		if(!userinput || usr != occupant || usr.incapacitated())
-			return
-		name = userinput
-		return
-
-	if (href_list["toggle_id_upload"])
-		add_req_access = !add_req_access
-		send_byjax(usr,"exosuit.browser","t_id_upload","[add_req_access?"L":"Unl"]ock ID upload panel")
-
-	if(href_list["toggle_maint_access"])
-		if(state)
-			occupant_message("<span class='danger'>Maintenance protocols in effect</span>")
-			return
-		maint_access = !maint_access
-		send_byjax(usr,"exosuit.browser","t_maint_access","[maint_access?"Forbid":"Permit"] maintenance protocols")
-
-	if (href_list["toggle_port_connection"])
-		if(internal_tank.connected_port)
-			if(internal_tank.disconnect())
-				occupant_message("Disconnected from the air system port.")
-				mecha_log_message("Disconnected from gas port.")
-			else
-				occupant_message("<span class='warning'>Unable to disconnect from the air system port!</span>")
-				return
-		else
-			var/obj/machinery/atmospherics/components/unary/portables_connector/possible_port = locate() in loc
-			if(internal_tank.connect(possible_port))
-				occupant_message("Connected to the air system port.")
-				mecha_log_message("Connected to gas port.")
-			else
-				occupant_message("<span class='warning'>Unable to connect with air system port!</span>")
-				return
-		send_byjax(occupant,"exosuit.browser","t_port_connection","[internal_tank.connected_port?"Disconnect from":"Connect to"] gas port")
-
-	if(href_list["dna_lock"])
-		if(!occupant)
-			return
-		var/mob/living/carbon/C = occupant
-		if(!istype(C) || !C.dna)
-			to_chat(C, "<span class='danger'> You do not have any DNA!</span>")
-			return
-		dna_lock = C.dna.unique_enzymes
-		occupant_message("You feel a prick as the needle takes your DNA sample.")
-
-	if(href_list["reset_dna"])
-		dna_lock = null
-
-	if(href_list["repair_int_control_lost"])
-		occupant_message("Recalibrating coordination system...")
-		mecha_log_message("Recalibration of coordination system started.")
-		var/T = loc
-		spawn(100)
-			if(T == loc)
-				clearInternalDamage(MECHA_INT_CONTROL_LOST)
-				occupant_message("<span class='notice'>Recalibration successful.</span>")
-				mecha_log_message("Recalibration of coordination system finished with 0 errors.")
-			else
-				occupant_message("<span class='warning'>Recalibration failed!</span>")
-				mecha_log_message("Recalibration of coordination system failed with 1 error.", color="red")
-
@@ -1,271 +0,0 @@
-///////////////////////////////////
-////////  Mecha wreckage   ////////
-///////////////////////////////////
-
-
-/obj/structure/mecha_wreckage
-	name = "exosuit wreckage"
-	desc = "Remains of some unfortunate mecha. Completely irreparable, but perhaps something can be salvaged."
-	icon = 'icons/mecha/mecha.dmi'
-	density = TRUE
-	anchored = FALSE
-	opacity = 0
-	var/list/welder_salvage = list(/obj/item/stack/sheet/plasteel, /obj/item/stack/sheet/metal, /obj/item/stack/rods)
-	var/list/wirecutters_salvage = list(/obj/item/stack/cable_coil)
-	var/list/crowbar_salvage = list()
-	var/salvage_num = 5
-	var/mob/living/silicon/ai/AI //AIs to be salvaged
-
-/obj/structure/mecha_wreckage/Initialize(mapload, mob/living/silicon/ai/AI_pilot)
-	. = ..()
-	if(!AI_pilot) //Type-checking for this is already done in mecha/Destroy()
-		return
-
-	AI = AI_pilot
-	AI.apply_damage(150, BURN) //Give the AI a bit of damage from the "shock" of being suddenly shut down
-	AI.death() //The damage is not enough to kill the AI, but to be 'corrupted files' in need of repair.
-	AI.forceMove(src) //Put the dead AI inside the wreckage for recovery
-	add_overlay(mutable_appearance('icons/obj/projectiles.dmi', "green_laser")) //Overlay for the recovery beacon
-	AI.controlled_mech = null
-	AI.remote_control = null
-
-/obj/structure/mecha_wreckage/examine(mob/user)
-	. = ..()
-	if(AI)
-		. += "<span class='notice'>The AI recovery beacon is active.</span>"
-
-/obj/structure/mecha_wreckage/attackby(obj/item/I, mob/user, params)
-	if(I.tool_behaviour == TOOL_WELDER)
-		if(salvage_num <= 0 || !length(welder_salvage))
-			to_chat(user, "<span class='warning'>You don't see anything that can be cut with [I]!</span>")
-			return
-
-		if(!I.use_tool(src, user, 0, volume=50))
-			return
-
-		var/type = prob(70) ? pick(welder_salvage) : null
-		if(type)
-			var/N = new type(get_turf(user))
-			user.visible_message("[user] cuts [N] from [src].", "<span class='notice'>You cut [N] from [src].</span>")
-			if(istype(N, /obj/item/mecha_parts/part))
-				welder_salvage -= type
-			salvage_num--
-		else
-			to_chat(user, "<span class='warning'>You fail to salvage anything valuable from [src]!</span>")
-		return
-
-	else if(I.tool_behaviour == TOOL_WIRECUTTER)
-		if(salvage_num <= 0)
-			to_chat(user, "<span class='warning'>You don't see anything that can be cut with [I]!</span>")
-			return
-		else if(wirecutters_salvage && wirecutters_salvage.len)
-			var/type = prob(70) ? pick(wirecutters_salvage) : null
-			if(type)
-				var/N = new type(get_turf(user))
-				user.visible_message("[user] cuts [N] from [src].", "<span class='notice'>You cut [N] from [src].</span>")
-				salvage_num--
-			else
-				to_chat(user, "<span class='warning'>You fail to salvage anything valuable from [src]!</span>")
-
-	else if(I.tool_behaviour == TOOL_CROWBAR)
-		if(crowbar_salvage && crowbar_salvage.len)
-			var/obj/S = pick(crowbar_salvage)
-			if(S)
-				S.forceMove(user.drop_location())
-				crowbar_salvage -= S
-				user.visible_message("[user] pries [S] from [src].", "<span class='notice'>You pry [S] from [src].</span>")
-			return
-		else
-			to_chat(user, "<span class='warning'>You don't see anything that can be pried with [I]!</span>")
-
-
-/obj/structure/mecha_wreckage/transfer_ai(interaction, mob/user, null, obj/item/aicard/card)
-	if(!..())
-		return
-
- //Proc called on the wreck by the AI card.
-	if(interaction == AI_TRANS_TO_CARD) //AIs can only be transferred in one direction, from the wreck to the card.
-		if(!AI) //No AI in the wreck
-			to_chat(user, "<span class='warning'>No AI backups found.</span>")
-			return
-		cut_overlays() //Remove the recovery beacon overlay
-		AI.forceMove(card) //Move the dead AI to the card.
-		card.AI = AI
-		if(AI.client) //AI player is still in the dead AI and is connected
-			to_chat(AI, "The remains of your file system have been recovered on a mobile storage device.")
-		else //Give the AI a heads-up that it is probably going to get fixed.
-			AI.notify_ghost_cloning("You have been recovered from the wreckage!", source = card)
-		to_chat(user, "<span class='boldnotice'>Backup files recovered</span>: [AI.name] ([rand(1000,9999)].exe) salvaged from [name] and stored within local memory.")
-
-	else
-		return ..()
-
-
-/obj/structure/mecha_wreckage/gygax
-	name = "\improper Gygax wreckage"
-	icon_state = "gygax-broken"
-
-/obj/structure/mecha_wreckage/gygax/Initialize()
-	. = ..()
-	var/list/parts = list(/obj/item/mecha_parts/part/gygax_torso,
-								/obj/item/mecha_parts/part/gygax_head,
-								/obj/item/mecha_parts/part/gygax_left_arm,
-								/obj/item/mecha_parts/part/gygax_right_arm,
-								/obj/item/mecha_parts/part/gygax_left_leg,
-								/obj/item/mecha_parts/part/gygax_right_leg)
-	for(var/i = 0; i < 2; i++)
-		if(parts.len && prob(40))
-			var/part = pick(parts)
-			welder_salvage += part
-			parts -= part
-
-
-
-/obj/structure/mecha_wreckage/gygax/dark
-	name = "\improper Dark Gygax wreckage"
-	icon_state = "darkgygax-broken"
-
-/obj/structure/mecha_wreckage/medigax
-	name = "\improper Medical Gygax wreckage"
-	icon_state = "medigax-broken"
-
-/obj/structure/mecha_wreckage/medigax/Initialize()
-	. = ..()
-	var/list/parts = list(/obj/item/mecha_parts/part/medigax_torso,
-								/obj/item/mecha_parts/part/medigax_head,
-								/obj/item/mecha_parts/part/medigax_left_arm,
-								/obj/item/mecha_parts/part/medigax_right_arm,
-								/obj/item/mecha_parts/part/medigax_left_leg,
-								/obj/item/mecha_parts/part/medigax_right_leg)
-	for(var/i = 0; i < 2; i++)
-		if(parts.len && prob(40))
-			var/part = pick(parts)
-			welder_salvage += part
-			parts -= part
-
-/obj/structure/mecha_wreckage/marauder
-	name = "\improper Marauder wreckage"
-	icon_state = "marauder-broken"
-
-/obj/structure/mecha_wreckage/mauler
-	name = "\improper Mauler wreckage"
-	icon_state = "mauler-broken"
-	desc = "The syndicate won't be very happy about this..."
-
-/obj/structure/mecha_wreckage/seraph
-	name = "\improper Seraph wreckage"
-	icon_state = "seraph-broken"
-
-/obj/structure/mecha_wreckage/reticence
-	name = "\improper Reticence wreckage"
-	icon_state = "reticence-broken"
-	color = "#87878715"
-	desc = "..."
-
-/obj/structure/mecha_wreckage/ripley
-	name = "\improper Ripley wreckage"
-	icon_state = "ripley-broken"
-
-/obj/structure/mecha_wreckage/ripley/Initialize()
-	. = ..()
-	var/list/parts = list(/obj/item/mecha_parts/part/ripley_torso,
-								/obj/item/mecha_parts/part/ripley_left_arm,
-								/obj/item/mecha_parts/part/ripley_right_arm,
-								/obj/item/mecha_parts/part/ripley_left_leg,
-								/obj/item/mecha_parts/part/ripley_right_leg)
-	for(var/i = 0; i < 2; i++)
-		if(parts.len && prob(40))
-			var/part = pick(parts)
-			welder_salvage += part
-			parts -= part
-
-
-/obj/structure/mecha_wreckage/ripley/firefighter
-	name = "\improper Firefighter wreckage"
-	icon_state = "firefighter-broken"
-
-/obj/structure/mecha_wreckage/ripley/firefighter/Initialize()
-	. = ..()
-	var/list/parts = list(/obj/item/mecha_parts/part/ripley_torso,
-								/obj/item/mecha_parts/part/ripley_left_arm,
-								/obj/item/mecha_parts/part/ripley_right_arm,
-								/obj/item/mecha_parts/part/ripley_left_leg,
-								/obj/item/mecha_parts/part/ripley_right_leg,
-								/obj/item/clothing/suit/fire)
-	for(var/i = 0; i < 2; i++)
-		if(parts.len && prob(40))
-			var/part = pick(parts)
-			welder_salvage += part
-			parts -= part
-
-
-/obj/structure/mecha_wreckage/ripley/deathripley
-	name = "\improper Death-Ripley wreckage"
-	icon_state = "deathripley-broken"
-
-
-/obj/structure/mecha_wreckage/honker
-	name = "\improper H.O.N.K wreckage"
-	icon_state = "honker-broken"
-	desc = "All is right in the universe."
-
-/obj/structure/mecha_wreckage/honker/Initialize()
-	. = ..()
-	var/list/parts = list(
-							/obj/item/mecha_parts/chassis/honker,
-							/obj/item/mecha_parts/part/honker_torso,
-							/obj/item/mecha_parts/part/honker_head,
-							/obj/item/mecha_parts/part/honker_left_arm,
-							/obj/item/mecha_parts/part/honker_right_arm,
-							/obj/item/mecha_parts/part/honker_left_leg,
-							/obj/item/mecha_parts/part/honker_right_leg)
-	for(var/i = 0; i < 2; i++)
-		if(parts.len && prob(40))
-			var/part = pick(parts)
-			welder_salvage += part
-			parts -= part
-
-
-/obj/structure/mecha_wreckage/durand
-	name = "\improper Durand wreckage"
-	icon_state = "durand-broken"
-
-/obj/structure/mecha_wreckage/durand/Initialize()
-	. = ..()
-	var/list/parts = list(
-								/obj/item/mecha_parts/part/durand_torso,
-								/obj/item/mecha_parts/part/durand_head,
-								/obj/item/mecha_parts/part/durand_left_arm,
-								/obj/item/mecha_parts/part/durand_right_arm,
-								/obj/item/mecha_parts/part/durand_left_leg,
-								/obj/item/mecha_parts/part/durand_right_leg)
-	for(var/i = 0; i < 2; i++)
-		if(parts.len && prob(40))
-			var/part = pick(parts)
-			welder_salvage += part
-			parts -= part
-
-
-/obj/structure/mecha_wreckage/phazon
-	name = "\improper Phazon wreckage"
-	icon_state = "phazon-broken"
-
-
-/obj/structure/mecha_wreckage/odysseus
-	name = "\improper Odysseus wreckage"
-	icon_state = "odysseus-broken"
-
-/obj/structure/mecha_wreckage/odysseus/Initialize()
-	. = ..()
-	var/list/parts = list(
-								/obj/item/mecha_parts/part/odysseus_torso,
-								/obj/item/mecha_parts/part/odysseus_head,
-								/obj/item/mecha_parts/part/odysseus_left_arm,
-								/obj/item/mecha_parts/part/odysseus_right_arm,
-								/obj/item/mecha_parts/part/odysseus_left_leg,
-								/obj/item/mecha_parts/part/odysseus_right_leg)
-	for(var/i = 0; i < 2; i++)
-		if(parts.len && prob(40))
-			var/part = pick(parts)
-			welder_salvage += part
-			parts -= part
@@ -1,16 +0,0 @@
-/obj/mecha/medical/mechturn(direction)
-	setDir(direction)
-	playsound(src,'sound/mecha/mechmove01.ogg',40,1)
-	return 1
-
-/obj/mecha/medical/mechstep(direction)
-	var/result = step(src,direction)
-	if(result)
-		playsound(src,'sound/mecha/mechstep.ogg',25,1)
-	return result
-
-/obj/mecha/medical/mechsteprand()
-	var/result = step_rand(src)
-	if(result)
-		playsound(src,'sound/mecha/mechstep.ogg',25,1)
-	return result
@@ -1,188 +0,0 @@
-/obj/mecha/working/ripley
-	desc = "Autonomous Power Loader Unit. This newer model is refitted with powerful armour against the dangers of planetary mining."
-	name = "\improper APLU \"Ripley\""
-	icon_state = "ripley"
-	step_in = 3 //Move speed, lower is faster.
-	var/fast_pressure_step_in = 2
-	var/slow_pressure_step_in = 3
-	max_temperature = 20000
-	max_integrity = 200
-	lights_power = 8
-	deflect_chance = 15
-	armor = list("melee" = 30, "bullet" = 15, "laser" = 10, "energy" = 20, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
-	max_equip = 6
-	wreckage = /obj/structure/mecha_wreckage/ripley
-	var/list/cargo = new
-	var/cargo_capacity = 15
-	var/hides = 0
-
-/obj/mecha/working/ripley/Move()
-	. = ..()
-	if(.)
-		collect_ore()
-	update_pressure()
-
-/obj/mecha/working/ripley/proc/collect_ore()
-	if(locate(/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp) in equipment)
-		var/obj/structure/ore_box/ore_box = locate(/obj/structure/ore_box) in cargo
-		if(ore_box)
-			for(var/obj/item/stack/ore/ore in range(1, src))
-				if(ore.Adjacent(src) && ((get_dir(src, ore) & dir) || ore.loc == loc)) //we can reach it and it's in front of us? grab it!
-					ore.forceMove(ore_box)
-
-/obj/mecha/working/ripley/Destroy()
-	for(var/atom/movable/A in cargo)
-		A.forceMove(drop_location())
-		step_rand(A)
-	cargo.Cut()
-	return ..()
-
-/obj/mecha/working/ripley/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/working/ripley/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/working/ripley/Initialize()
-	. = ..()
-	AddComponent(/datum/component/armor_plate,3,/obj/item/stack/sheet/animalhide/goliath_hide,list("melee" = 10, "bullet" = 5, "laser" = 5))
-
-
-/obj/mecha/working/ripley/firefighter
-	desc = "Autonomous Power Loader Unit. This model is refitted with additional thermal protection."
-	name = "\improper APLU \"Firefighter\""
-	icon_state = "firefighter"
-	step_in = 4
-	fast_pressure_step_in = 2
-	slow_pressure_step_in = 4
-	max_temperature = 65000
-	max_integrity = 250
-	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-	lights_power = 7
-	armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
-	max_equip = 5 // More armor, less tools
-	wreckage = /obj/structure/mecha_wreckage/ripley/firefighter
-
-
-/obj/mecha/working/ripley/deathripley
-	desc = "OH SHIT IT'S THE DEATHSQUAD WE'RE ALL GONNA DIE"
-	name = "\improper DEATH-RIPLEY"
-	icon_state = "deathripley"
-	armor = list("melee" = 40, "bullet" = 30, "laser" = 20, "energy" = 20, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
-	slow_pressure_step_in = 3
-	opacity=0
-	lights_power = 7
-	wreckage = /obj/structure/mecha_wreckage/ripley/deathripley
-	step_energy_drain = 0
-
-/obj/mecha/working/ripley/deathripley/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/kill
-	ME.attach(src)
-
-/obj/mecha/working/ripley/deathripley/real
-	desc = "OH SHIT IT'S THE DEATHSQUAD WE'RE ALL GONNA DIE. FOR REAL"
-
-/obj/mecha/working/ripley/deathripley/real/Initialize()
-	. = ..()
-	for(var/obj/item/mecha_parts/mecha_equipment/E in equipment)
-		E.detach()
-		qdel(E)
-	equipment.Cut()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/kill/real
-	ME.attach(src)
-
-/obj/mecha/working/ripley/mining
-	desc = "An old, dusty mining Ripley."
-	name = "\improper APLU \"Miner\""
-	obj_integrity = 75 //Low starting health
-
-/obj/mecha/working/ripley/mining/Initialize()
-	. = ..()
-	if(cell)
-		cell.charge = FLOOR(cell.charge * 0.25, 1) //Starts at very low charge
-	if(prob(70)) //Maybe add a drill
-		if(prob(15)) //Possible diamond drill... Feeling lucky?
-			var/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill/D = new
-			D.attach(src)
-		else
-			var/obj/item/mecha_parts/mecha_equipment/drill/D = new
-			D.attach(src)
-
-	else //Add plasma cutter if no drill
-		var/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/P = new
-		P.attach(src)
-
-	//Add ore box to cargo
-	cargo.Add(new /obj/structure/ore_box(src))
-
-	//Attach hydraulic clamp
-	var/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/HC = new
-	HC.attach(src)
-	for(var/obj/item/mecha_parts/mecha_tracking/B in trackers)//Deletes the beacon so it can't be found easily
-		qdel(B)
-
-	var/obj/item/mecha_parts/mecha_equipment/mining_scanner/scanner = new
-	scanner.attach(src)
-
-/obj/mecha/working/ripley/Exit(atom/movable/O)
-	if(O in cargo)
-		return 0
-	return ..()
-
-/obj/mecha/working/ripley/Topic(href, href_list)
-	..()
-	if(href_list["drop_from_cargo"])
-		var/obj/O = locate(href_list["drop_from_cargo"])
-		if(O && (O in cargo))
-			occupant_message("<span class='notice'>You unload [O].</span>")
-			O.forceMove(drop_location())
-			cargo -= O
-			mecha_log_message("Unloaded [O]. Cargo compartment capacity: [cargo_capacity - src.cargo.len]")
-	return
-
-
-/obj/mecha/working/ripley/contents_explosion(severity, target, origin)
-	for(var/X in cargo)
-		var/obj/O = X
-		if(prob(30/severity))
-			cargo -= O
-			O.forceMove(drop_location())
-	. = ..()
-
-/obj/mecha/working/ripley/get_stats_part()
-	var/output = ..()
-	output += "<b>Cargo Compartment Contents:</b><div style=\"margin-left: 15px;\">"
-	if(cargo.len)
-		for(var/obj/O in cargo)
-			output += "<a href='?src=[REF(src)];drop_from_cargo=[REF(O)]'>Unload</a> : [O]<br>"
-	else
-		output += "Nothing"
-	output += "</div>"
-	return output
-
-/obj/mecha/working/ripley/proc/update_pressure()
-	var/turf/T = get_turf(loc)
-
-	if(lavaland_equipment_pressure_check(T))
-		step_in = fast_pressure_step_in
-		for(var/obj/item/mecha_parts/mecha_equipment/drill/drill in equipment)
-			drill.equip_cooldown = initial(drill.equip_cooldown)/2
-	else
-		step_in = slow_pressure_step_in
-		for(var/obj/item/mecha_parts/mecha_equipment/drill/drill in equipment)
-			drill.equip_cooldown = initial(drill.equip_cooldown)
-
-/obj/mecha/working/ripley/relay_container_resist(mob/living/user, obj/O)
-	to_chat(user, "<span class='notice'>You lean on the back of [O] and start pushing so it falls out of [src].</span>")
-	if(do_after(user, 300, target = O))
-		if(!user || user.stat != CONSCIOUS || user.loc != src || O.loc != src )
-			return
-		to_chat(user, "<span class='notice'>You successfully pushed [O] out of [src]!</span>")
-		O.forceMove(drop_location())
-		cargo -= O
-	else
-		if(user.loc == src) //so we don't get the message if we resisted multiple times and succeeded.
-			to_chat(user, "<span class='warning'>You fail to push [O] out of [src]!</span>")
@@ -1,3 +0,0 @@
-/obj/mecha/working
-	internal_damage_threshold = 60
-
@@ -16,7 +16,7 @@
 		playsound(loc, 'sound/items/welder.ogg', 100, TRUE)

 /obj/structure/arachnid/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
-	if(damage_flag == "melee")
+	if(damage_flag == MELEE)
 		switch(damage_type)
 			if(BURN)
 				damage_amount *= 2
@@ -18,9 +18,6 @@
 /obj/effect/acid_act()
 	return

-/obj/effect/mech_melee_attack(obj/mecha/M)
-	return 0
-
 /obj/effect/blob_act(obj/structure/blob/B)
 	return

@@ -15,7 +15,7 @@


 /obj/structure/spider/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
-	if(damage_flag == "melee")
+	if(damage_flag == MELEE)
 		switch(damage_type)
 			if(BURN)
 				damage_amount *= 2
@@ -129,14 +129,18 @@
 			"<span class='userdanger'>Your [I.name] shields you from [src]!</span>")
 			continue
 		L.visible_message("<span class='warning'>[L] is struck by a [name]!</span>", "<span class='userdanger'>You're struck by a [name]!</span>")
-		L.apply_damage(damage, BURN, "chest", L.run_armor_check("chest", "laser", "Your armor absorbs [src]!", "Your armor blocks part of [src]!", 0, "Your armor was penetrated by [src]!"))
+		L.apply_damage(damage, BURN, "chest", L.run_armor_check("chest", LASER, "Your armor absorbs [src]!", "Your armor blocks part of [src]!", 0, "Your armor was penetrated by [src]!"))
 		log_combat(user, L, "struck with a volt blast")
 		hit_amount++
-	for(var/obj/mecha/M in T)
-		if(M.occupant)
-			if(is_servant_of_ratvar(M.occupant))
-				continue
-			to_chat(M.occupant, "<span class='userdanger'>Your [M.name] is struck by a [name]!</span>")
+	for(var/obj/vehicle/sealed/mecha/M in T)
+		if(LAZYLEN(M.occupants))
+			for(var/mob/living/MB in M.occupants)
+				if(is_servant_of_ratvar(MB))
+					continue
+				else
+					to_chat(MB, "<span class='userdanger'>Your [M.name] is struck by a [name]!</span>")
+			continue
+
 		M.visible_message("<span class='warning'>[M] is struck by a [name]!</span>")
 		M.take_damage(damage, BURN, 0, 0)
 		hit_amount++
@@ -841,9 +841,6 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 		return ..()
 	return 0

-/obj/item/mech_melee_attack(obj/mecha/M)
-	return 0
-
 /obj/item/burn()
 	if(!QDELETED(src))
 		var/turf/T = get_turf(src)
@@ -24,7 +24,7 @@ RLD
 	w_class = WEIGHT_CLASS_NORMAL
 	custom_materials = list(/datum/material/iron=100000)
 	req_access_txt = "11"
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50)
 	resistance_flags = FIRE_PROOF
 	var/datum/effect_system/spark_spread/spark_system
 	var/matter = 0
@@ -206,7 +206,7 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list(
 	throw_range = 5
 	w_class = WEIGHT_CLASS_NORMAL
 	custom_materials = list(/datum/material/iron=75000, /datum/material/glass=37500)
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50)
 	resistance_flags = FIRE_PROOF
 	var/datum/effect_system/spark_spread/spark_system
 	var/effectcooldown
@@ -14,7 +14,7 @@ RSF
 	density = FALSE
 	anchored = FALSE
 	item_flags = NOBLUDGEON
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0)
 	var/matter = 0
 	var/mode = 1
 	w_class = WEIGHT_CLASS_NORMAL
@@ -20,20 +20,20 @@
 		if(C.attached_accessory)
 			to_chat(user,"<span class='warning'>Kind of hard to sew around [C.attached_accessory].</span>")
 			return
-		if(C.armor.getRating("melee") < 10)
-			C.armor = C.armor.setRating("melee" = 10)
+		if(C.armor.getRating(MELEE) < 10)
+			C.armor = C.armor.setRating(MELEE = 10)
 			used = TRUE
-		if(C.armor.getRating("laser") < 10)
-			C.armor = C.armor.setRating("laser" = 10)
+		if(C.armor.getRating(LASER) < 10)
+			C.armor = C.armor.setRating(LASER = 10)
 			used = TRUE
-		if(C.armor.getRating("fire") < 40)
-			C.armor = C.armor.setRating("fire" = 40)
+		if(C.armor.getRating(FIRE) < 40)
+			C.armor = C.armor.setRating(FIRE = 40)
 			used = TRUE
-		if(C.armor.getRating("acid") < 10)
-			C.armor = C.armor.setRating("acid" = 10)
+		if(C.armor.getRating(ACID) < 10)
+			C.armor = C.armor.setRating(ACID = 10)
 			used = TRUE
-		if(C.armor.getRating("bomb") < 5)
-			C.armor = C.armor.setRating("bomb" = 5)
+		if(C.armor.getRating(BOMB) < 5)
+			C.armor = C.armor.setRating(BOMB = 5)
 			used = TRUE

 		if(used)
@@ -184,7 +184,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/idcards_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi'
 	slot_flags = ITEM_SLOT_ID
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 100)
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	var/id_type_name = "identification card"
 	var/mining_points = 0 //For redeeming at mining equipment vendors
@@ -29,7 +29,7 @@
 	icon = 'icons/obj/money_machine.dmi'
 	icon_state = "bogdanoff"
 	layer = LARGE_MOB_LAYER
-	armor = list("melee" = 80, "bullet" = 30, "laser" = 30, "energy" = 60, "bomb" = 90, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80)
+	armor = list(MELEE = 80, BULLET = 30, LASER = 30, ENERGY = 60, BOMB = 90, BIO = 0, RAD = 0, FIRE = 100, ACID = 80)
 	density = TRUE
 	pixel_z = -8
 	max_integrity = 5000
@@ -14,7 +14,7 @@
 	throwforce = 6
 	w_class = WEIGHT_CLASS_BULKY
 	actions_types = list(/datum/action/item_action/toggle_paddles)
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50)

 	var/on = FALSE //if the paddles are equipped (1) or on the defib (0)
 	var/safety = TRUE //if you can zap people with the defibs on harm mode
@@ -29,7 +29,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 	item_flags = NOBLUDGEON
 	w_class = WEIGHT_CLASS_TINY
 	slot_flags = ITEM_SLOT_ID | ITEM_SLOT_BELT
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 100)
 	resistance_flags = FIRE_PROOF | ACID_PROOF

 	//Main variables
@@ -161,7 +161,7 @@
 			dat += " (Stage [stage])"
 			dat += " <a href='?[REF(src)];track=[REF(S)]'>\[Track\]</a><br>"

-		for(var/obj/mecha/M in seen)
+		for(var/obj/vehicle/sealed/mecha/M in seen)
 			if(M.name in names)
 				names[M.name]++
 				dat += "[M.name] ([names[M.name]])"
@@ -87,7 +87,7 @@
 	mouse_opacity = MOUSE_OPACITY_OPAQUE
 	resistance_flags = INDESTRUCTIBLE
 	CanAtmosPass = ATMOS_PASS_DENSITY
-	armor = list("melee" = 0, "bullet" = 25, "laser" = 25, "energy" = 25, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
+	armor = list(MELEE = 0, BULLET = 25, LASER = 25, ENERGY = 25, BOMB = 25, BIO = 100, RAD = 100, FIRE = 100, ACID = 100)
 	var/obj/item/forcefield_projector/generator

 /obj/structure/projected_forcefield/Initialize(mapload, obj/item/forcefield_projector/origin)
@@ -21,7 +21,7 @@
 	light_color = "#00ff00"//green
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	max_integrity = 200
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 70)
 	resistance_flags = FIRE_PROOF
 	wound_bonus = -40
 	bare_wound_bonus = 20
@@ -15,7 +15,7 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharpness = SHARP_EDGED
 	max_integrity = 200
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 30)
 	resistance_flags = FIRE_PROOF
 	wound_bonus = -15
 	bare_wound_bonus = 20
@@ -52,10 +52,10 @@
 		return
 	if(istype(A, /obj/structure/window)) //destroys windows and grilles in one hit (or more if it has a ton of health like plasmaglass)
 		var/obj/structure/window/W = A
-		W.take_damage(200, BRUTE, "melee", 0)
+		W.take_damage(200, BRUTE, MELEE, 0)
 	else if(istype(A, /obj/structure/grille))
 		var/obj/structure/grille/G = A
-		G.take_damage(40, BRUTE, "melee", 0)
+		G.take_damage(40, BRUTE, MELEE, 0)

 /*
 * Bone Axe
@@ -27,6 +27,6 @@

 	for(var/obj/structure/blob/B in view(8,src))
 		var/damage = round(30/(get_dist(B,src)+1))
-		B.take_damage(damage, BURN, "melee", 0)
+		B.take_damage(damage, BURN, MELEE, 0)
 	sleep(80)
 	qdel(src)
@@ -40,7 +40,7 @@
 	throw_range = 5
 	custom_materials = list(/datum/material/iron=500)
 	breakouttime = 600 //Deciseconds = 60s = 1 minute
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50)
 	var/cuffsound = 'sound/weapons/handcuffs.ogg'
 	var/trashtype = null //for disposable cuffs

@@ -5,7 +5,7 @@
 	desc = "Deus Vult."
 	icon_state = "knight_templar"
 	item_state = "knight_templar"
-	armor = list("melee" = 41, "bullet" = 15, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 2, "rad" = 0, "fire" = 0, "acid" = 50)
+	armor = list(MELEE = 41, BULLET = 15, LASER = 5,ENERGY = 5, BOMB = 5, BIO = 2, RAD = 0, FIRE = 0, ACID = 50)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	strip_delay = 80
@@ -27,7 +27,7 @@
 	flags_1 = CONDUCT_1
 	attack_verb = list("attacked", "stabbed", "poked")
 	hitsound = 'sound/weapons/bladeslice.ogg'
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 30)
 	sharpness = SHARP_POINTY
 	var/datum/reagent/forkload //used to eat omelette

@@ -78,7 +78,7 @@
 	custom_materials = list(/datum/material/iron=12000)
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	sharpness = SHARP_POINTY
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50)
 	var/bayonet = FALSE	//Can this be attached to a gun?
 	wound_bonus = -5
 	bare_wound_bonus = 10
@@ -114,7 +114,7 @@
 	custom_materials = list(/datum/material/iron=12000)
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	sharpness = SHARP_POINTY
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50)
 	var/bayonet = FALSE	//Can this be attached to a gun?
 	wound_bonus = -5
 	bare_wound_bonus = 10
@@ -266,7 +266,7 @@
 	force = 8
 	throwforce = 12//fuck git
 	attack_verb = list("shanked", "shivved")
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0)
 	custom_materials = list(/datum/material/glass=400)

 /obj/item/kitchen/knife/shiv/carrot
@@ -2,7 +2,7 @@
 	hitsound_on = 'sound/weapons/blade1.ogg'
 	heat = 3500
 	max_integrity = 200
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 30)
 	resistance_flags = FIRE_PROOF
 	var/brightness_on = 3
 	var/sword_color
--- a/Show More
+++ b/Show More