runtime hell fixes

Author: Singul0

monkestation/code/game/mecha/makeshift/locker_mech.dm

@@ -8,7 +8,7 @@
 	max_integrity = 100 //its made of scraps
 	lights_power = 5
 	movedelay = 2 //Same speed as a ripley, for now.
-	armor_type = list(melee = 20, bullet = 10, laser = 10, energy = 0, bomb = 10, bio = 0, rad = 0, fire = 70, acid = 60) //Same armour as a locker
+	armor_type = /datum/armor/scrap_vehicles //Same armour as a locker
 	internal_damage_threshold = 30 //Its got shitty durability
 	wreckage = null
 	mech_type = EXOSUIT_MODULE_MAKESHIFT
@@ -26,3 +26,11 @@
 		MECHA_POWER = 0,
 		MECHA_ARMOR = 0,
 	)
+
+/datum/armor/scrap_vehicles
+	melee = 20
+	bullet = 10
+	laser = 10
+	bomb = 10
+	fire = 70
+	acid = 60

monkestation/code/game/mecha/makeshift/makeshift_ambulance.dm

@@ -11,7 +11,7 @@
 	stepsound = 'sound/vehicles/carrev.ogg'
 	turnsound = 'sound/vehicles/carrev.ogg'
 	mecha_flags = ADDING_ACCESS_POSSIBLE | IS_ENCLOSED | HAS_LIGHTS //can't strafe bruv
-	armor_type = list(melee = 20, bullet = 10, laser = 10, energy = 0, bomb = 10, bio = 0, rad = 0, fire = 70, acid = 60) //Same armour as a locker (close enough to a portapotty no?)
+	armor_type = /datum/armor/scrap_vehicles //Same armour as a locker (close enough to a portapotty no?)
 	internal_damage_threshold = 30 //Its got shitty durability
 	wreckage = null
 	mech_type = EXOSUIT_MODULE_AMBULANCE

monkestation/code/game/mecha/makeshift/trash_tank.dm

@@ -11,7 +11,7 @@
 	stepsound = 'monkestation/sound/mecha/tank_treads.ogg'
 	turnsound = 'monkestation/sound/mecha/tank_treads.ogg'
 	mecha_flags = ADDING_ACCESS_POSSIBLE | IS_ENCLOSED | HAS_LIGHTS | MMI_COMPATIBLE //can't strafe bruv
-	armor_type = list(melee = 30, bullet = 20, laser = 20, energy = 10, bomb = 20, bio = 0, rad = 0, fire = 70, acid = 60) //mediocre armor, do you expect any better?
+	armor_type = /datum/armor/scrap_tank //mediocre armor, do you expect any better?
 	internal_damage_threshold = 60 //Its got shitty durability
 	wreckage = /obj/structure/closet/crate/trashcart
 	mech_type = EXOSUIT_MODULE_TRASHTANK
@@ -28,10 +28,27 @@
 		MECHA_ARMOR = 0,
 	)
 
+/datum/armor/scrap_tank
+	melee = 30
+	bullet = 20
+	laser = 20
+	energy = 10
+	bomb = 20
+	fire = 70
+	acid = 60
+
+/datum/armor/scrap_tank/uparmoured
+	melee = 60
+	bullet = 40
+	laser = 40
+	energy = 20
+	fire = 70
+	acid = 60
+
 /obj/vehicle/sealed/mecha/trash_tank/proc/upgrade()
 	name = "up-armoured trash tank"
 	icon_state = "trash_tank-armoured"
 	base_icon_state = "trash_tank-armoured"
 	update_appearance()
 
-	armor_type = list(melee = 60, bullet = 40, laser = 40, energy = 20, bomb = 20, bio = 0, rad = 0, fire = 70, acid = 60)
+	armor_type = /datum/armor/scrap_tank/uparmoured