Adds some new mech weaponry for the legion, changes the way mech decals are applied (#7534)

code/__defines/_layers.dm

@@ -26,4 +26,5 @@
 #define MECH_LEG_LAYER              4.04
 #define MECH_COCKPIT_LAYER          4.05
 #define MECH_ARM_LAYER              4.06
-#define MECH_GEAR_LAYER             4.07
+#define MECH_DECAL_LAYER            4.07
+#define MECH_GEAR_LAYER             4.08

code/modules/cargo/random_stock/t3_rare.dm

@@ -83,7 +83,7 @@ STOCK_ITEM_RARE(exogear, 1.5)
 		/obj/item/mecha_equipment/clamp = 1,
 		/obj/item/mecha_equipment/drill = 1,
 		/obj/item/mecha_equipment/mounted_system/extinguisher = 1,
-		/obj/item/mecha_equipment/mounted_system/rcd = 0.08,
+		/obj/item/mecha_equipment/mounted_system/rfd = 0.08,
 		/obj/item/mecha_equipment/mounted_system/plasmacutter = 0.5,
 		/obj/item/mecha_equipment/catapult = 0.8,
 		/obj/item/mecha_equipment/sleeper = 0.9

code/modules/heavy_vehicle/components/frame.dm

@@ -65,9 +65,9 @@
 	var/list/new_overlays = get_mech_icon(list(legs, head, body, arms), layer)
 	if(body)
 		density = TRUE
-		overlays += get_mech_image(null, "[body.icon_state]_cockpit", body.icon, body.color)
+		overlays += get_mech_image("[body.icon_state]_cockpit", body.icon, body.color)
 		if(body.pilot_coverage < 100 || body.transparent_cabin)
-			new_overlays += get_mech_image(null, "[body.icon_state]_open_overlay", body.icon, body.color)
+			new_overlays += get_mech_image("[body.icon_state]_open_overlay", body.icon, body.color)
 	else
 		density = FALSE
 	overlays = new_overlays

code/modules/heavy_vehicle/equipment/combat.dm

@@ -44,6 +44,22 @@
 	restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND)
 	restricted_software = list(MECH_SOFTWARE_ADVWEAPONS)
 
+/obj/item/mecha_equipment/mounted_system/blaster
+	name = "rapidfire blaster"
+	desc = "A weapon for combat exosuits. Shoots armor penetrating blaster beams."
+	icon_state = "mecha_blaster"
+	holding_type = /obj/item/gun/energy/blaster/mounted/mech
+	restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND)
+	restricted_software = list(MECH_SOFTWARE_WEAPONS)
+
+/obj/item/mecha_equipment/mounted_system/gauss
+	name = "heavy gauss cannon"
+	desc = "A weapon for combat exosuits. Shoots high explosive gauss propelled projectiles."
+	icon_state = "mecha_gauss"
+	holding_type = /obj/item/gun/energy/gauss/mounted/mech
+	restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND)
+	restricted_software = list(MECH_SOFTWARE_WEAPONS)
+
 /obj/item/gun/energy/taser/mounted/mech
 	use_external_power = TRUE
 	self_recharge = TRUE
@@ -90,6 +106,22 @@
 	restricted_hardpoints = list(HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER)
 	restricted_software = list(MECH_SOFTWARE_WEAPONS)
 
+/obj/item/mecha_equipment/mounted_system/grenadetear
+	name = "teargas launcher"
+	desc = "The SGL-6TGL grenade launcher is designated to launch primed teargas grenades."
+	icon_state = "mecha_grenadelnchr"
+	holding_type = /obj/item/gun/launcher/mech/mountedtgl
+	restricted_hardpoints = list(HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER)
+	restricted_software = list(MECH_SOFTWARE_WEAPONS)
+
+/obj/item/mecha_equipment/mounted_system/grenadesmoke
+	name = "smoke grenade launcher"
+	desc = "The SGL-6SGL grenade launcher is designated to launch primed smoke grenades."
+	icon_state = "mecha_grenadelnchr"
+	holding_type = /obj/item/gun/launcher/mech/mountedsgl
+	restricted_hardpoints = list(HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER)
+	restricted_software = list(MECH_SOFTWARE_WEAPONS)
+
 /obj/item/gun/launcher/mech
 	name = "mounted mech launcher"
 	desc = "Shouldn't be seeing this."
@@ -191,6 +223,52 @@
 	addtimer(CALLBACK(src, .proc/regen_proj), proj_gen_time, TIMER_UNIQUE)
 	return g
 
+/obj/item/gun/launcher/mech/mountedtgl
+	name = "mounted teargas launcher"
+	desc = "The SGL-6TGL grenade launcher is designated to launch primed teargas grenades."
+	icon = 'icons/obj/robot_items.dmi'
+	icon_state = "smg"
+	item_state = "smg"
+	fire_sound = 'sound/weapons/grenadelaunch.ogg'
+
+	release_force = 5
+	throw_distance = 7
+	proj = 3
+	max_proj = 3
+	proj_gen_time = 200
+
+/obj/item/gun/launcher/mech/mountedtgl/consume_next_projectile()
+	if(proj < 1) return null
+	var/obj/item/grenade/chem_grenade/teargas/tg = new (src)
+	tg.det_time = 10
+	tg.activate(null)
+	proj--
+	addtimer(CALLBACK(src, .proc/regen_proj), proj_gen_time, TIMER_UNIQUE)
+	return tg
+
+/obj/item/gun/launcher/mech/mountedsgl
+	name = "mounted smoke launcher"
+	desc = "The SGL-6SGL grenade launcher is designated to launch primed smoke grenades."
+	icon = 'icons/obj/robot_items.dmi'
+	icon_state = "smg"
+	item_state = "smg"
+	fire_sound = 'sound/weapons/grenadelaunch.ogg'
+
+	release_force = 5
+	throw_distance = 7
+	proj = 3
+	max_proj = 3
+	proj_gen_time = 200
+
+/obj/item/gun/launcher/mech/mountedsgl/consume_next_projectile()
+	if(proj < 1) return null
+	var/obj/item/grenade/smokebomb/sg = new (src)
+	sg.det_time = 10
+	sg.activate(null)
+	proj--
+	addtimer(CALLBACK(src, .proc/regen_proj), proj_gen_time, TIMER_UNIQUE)
+	return sg
+
 /obj/item/gun/launcher/mech/get_hardpoint_maptext()
 	return "[proj]/[max_proj]"
 

code/modules/heavy_vehicle/equipment/engineering.dm

@@ -1,5 +1,6 @@
-/obj/item/mecha_equipment/mounted_system/rcd
-	icon_state = "mech_rfd"
+/obj/item/mecha_equipment/mounted_system/rfd
+	name = "mounted rfd"
+	icon_state = "mecha_rfd"
 	holding_type = /obj/item/rfd/construction/borg
 	restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND)
 	restricted_software = list(MECH_SOFTWARE_ENGINEERING)
@@ -21,6 +22,7 @@
 	return null
 
 /obj/item/extinguisher/mech
+	name = "mounted fire extinguisher"
 	max_water = 4000 //Good is gooder
 	icon_state = "mecha_exting"
 

code/modules/heavy_vehicle/equipment/medical.dm

@@ -266,6 +266,7 @@
 
 
 /obj/item/mecha_equipment/mounted_system/medanalyzer
+	name = "mounted health analyzer"
 	icon_state = "mecha_healthyanalyzer"
 	holding_type = /obj/item/device/healthanalyzer/adv/mech
 	restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND)

code/modules/heavy_vehicle/mech_icon.dm

@@ -1,23 +1,13 @@
 var/global/list/mecha_image_cache = list()
 var/global/list/mecha_icon_cache = list()
 
-proc/get_mech_image(var/decal, var/cache_key, var/cache_icon, var/image_colour, var/overlay_layer = FLOAT_LAYER)
-	var/use_key = "[cache_key]-[cache_icon]-[decal ? decal : "none"]-[image_colour ? image_colour : "none"]"
+proc/get_mech_image(var/cache_key, var/cache_icon, var/image_colour, var/overlay_layer = FLOAT_LAYER)
+	var/use_key = "[cache_key]-[cache_icon]-[image_colour ? image_colour : "none"]"
 	if(image_colour) use_key += "-[image_colour]"
 	if(!mecha_image_cache[use_key])
 		var/image/I = image(icon = cache_icon, icon_state = cache_key)
 		if(image_colour)
 			I.color = image_colour
-		if(decal)
-			var/decal_key = "[decal]-[cache_key]"
-			if(!global.mecha_icon_cache[decal_key])
-				var/template_key = "template-[cache_key]"
-				if(!global.mecha_icon_cache[template_key])
-					global.mecha_icon_cache[template_key] = icon(cache_icon, "[cache_key]_mask")
-				var/icon/decal_icon = icon('icons/mecha/mecha_decals.dmi', decal)
-				decal_icon.Blend(global.mecha_icon_cache[template_key], ICON_MULTIPLY)
-				global.mecha_icon_cache[decal_key] = decal_icon
-			I.overlays += get_mech_image(null, decal_key, global.mecha_icon_cache[decal_key])
 		I.layer = overlay_layer
 		I.plane = FLOAT_PLANE
 		global.mecha_image_cache[use_key] = I
@@ -26,30 +16,38 @@ proc/get_mech_image(var/decal, var/cache_key, var/cache_icon, var/image_colour,
 proc/get_mech_icon(var/list/components = list(), var/overlay_layer = FLOAT_LAYER)
 	var/list/all_images = list()
 	for(var/obj/item/mech_component/comp in components)
-		all_images += get_mech_image(comp.decal, comp.icon_state, comp.on_mech_icon, comp.color, overlay_layer)
+		all_images += get_mech_image(comp.icon_state, comp.on_mech_icon, comp.color, overlay_layer)
 	return all_images
 
 /mob/living/heavy_vehicle/update_icon()
-	var/list/mecha_weapon_overlays = list()
-	mecha_weapon_overlays = icon_states('icons/mecha/mecha_weapon_overlays.dmi')
 	var/list/new_overlays = get_mech_icon(list(body, head), MECH_BASE_LAYER)
 	if(body && !hatch_closed)
-		new_overlays += get_mech_image(body.decal, "[body.icon_state]_cockpit", body.on_mech_icon, MECH_BASE_LAYER)
+		new_overlays += get_mech_image("[body.icon_state]_cockpit", body.on_mech_icon, MECH_BASE_LAYER)
 	update_pilot_overlay(FALSE)
 	if(LAZYLEN(pilot_overlays))
 		new_overlays += pilot_overlays
 	if(body)
-		new_overlays += get_mech_image(body.decal, "[body.icon_state]_overlay[hatch_closed ? "" : "_open"]", body.on_mech_icon, body.color, MECH_COCKPIT_LAYER)
+		new_overlays += get_mech_image("[body.icon_state]_overlay[hatch_closed ? "" : "_open"]", body.on_mech_icon, body.color, MECH_COCKPIT_LAYER)
 	if(arms)
-		new_overlays += get_mech_image(arms.decal, arms.icon_state, arms.on_mech_icon, arms.color, MECH_ARM_LAYER)
+		new_overlays += get_mech_image(arms.icon_state, arms.on_mech_icon, arms.color, MECH_ARM_LAYER)
 	if(legs)
-		new_overlays += get_mech_image(legs.decal, legs.icon_state, legs.on_mech_icon, legs.color, MECH_LEG_LAYER)
+		new_overlays += get_mech_image(legs.icon_state, legs.on_mech_icon, legs.color, MECH_LEG_LAYER)
+
+	var/list/mecha_decal_overlays = list()
+	mecha_decal_overlays = icon_states('icons/mecha/mecha_decals.dmi')
+	if(decal)
+		if(decal in mecha_decal_overlays)
+			new_overlays += get_mech_image(decal, 'icons/mecha/mecha_decals.dmi', null, MECH_DECAL_LAYER)
+
+	var/list/mecha_weapon_overlays = list()
+	mecha_weapon_overlays = icon_states('icons/mecha/mecha_weapon_overlays.dmi')
 	for(var/hardpoint in hardpoints)
 		var/obj/item/mecha_equipment/hardpoint_object = hardpoints[hardpoint]
 		if(hardpoint_object)
 			var/use_icon_state = "[hardpoint_object.icon_state]_[hardpoint]"
 			if(use_icon_state in mecha_weapon_overlays)
-				new_overlays += get_mech_image(null, use_icon_state, 'icons/mecha/mecha_weapon_overlays.dmi', null, hardpoint_object.mech_layer)
+				new_overlays += get_mech_image(use_icon_state, 'icons/mecha/mecha_weapon_overlays.dmi', null, hardpoint_object.mech_layer)
+
 	overlays = new_overlays
 
 /mob/living/heavy_vehicle/proc/update_pilot_overlay(var/update_overlays = TRUE)

code/modules/heavy_vehicle/mecha.dm

@@ -7,6 +7,7 @@
 	status_flags = PASSEMOTES
 	a_intent = I_HURT
 	mob_size = MOB_LARGE
+	var/decal
 
 	var/emp_damage = 0
 

code/modules/heavy_vehicle/premade/_premade.dm

@@ -1,9 +1,12 @@
 /mob/living/heavy_vehicle/premade
 	name = "impossible mech"
 	desc = "It seems to be saying 'please let me die'."
-	var/decal
+	icon = 'icons/mecha/mecha.dmi'
+	icon_state = "ripley"
 
 /mob/living/heavy_vehicle/premade/Initialize()
+	icon = null
+	icon_state = null
 	if(arms)
 		arms.decal = decal
 		arms.prebuild()

code/modules/heavy_vehicle/premade/combat.dm

@@ -1,6 +1,7 @@
 /mob/living/heavy_vehicle/premade/combat
 	name = "combat exosuit"
 	desc = "A sleek, modern combat exosuit."
+	icon_state = "durand"
 
 /mob/living/heavy_vehicle/premade/combat/Initialize()
 	if(!arms)

code/modules/heavy_vehicle/premade/heavy.dm

@@ -1,6 +1,7 @@
 /mob/living/heavy_vehicle/premade/heavy
 	name = "Heavy exosuit"
 	desc = "A heavily armored combat exosuit."
+	icon_state = "durand"
 
 /mob/living/heavy_vehicle/premade/heavy/Initialize()
 	if(!arms)
@@ -88,6 +89,7 @@
 /mob/living/heavy_vehicle/premade/superheavy
 	name = "Marauder"
 	desc = "Heavy-duty, combat exosuit, developed after the Durand model. Rarely found among civilian populations."
+	icon_state = "darkgygax"
 
 /mob/living/heavy_vehicle/premade/superheavy/Initialize()
 	if(!arms)

code/modules/heavy_vehicle/premade/light.dm

@@ -1,6 +1,7 @@
 /mob/living/heavy_vehicle/premade/light
 	name = "light exosuit"
 	desc = "A light and agile exosuit."
+	icon_state = "odysseus"
 
 /mob/living/heavy_vehicle/premade/light/Initialize()
 	if(!arms)
@@ -86,4 +87,33 @@
 			"[WEST]"  = list("x" = 9,  "y" = -2)
 		)
 	)
-	. = ..()
+	. = ..()
+
+/mob/living/heavy_vehicle/premade/light/legion
+	name = "legion support exosuit"
+	desc = "A light and agile exosuit painted in the colours of the Tau Ceti Foreign Legion."
+	icon_state = "odysseus"
+
+/mob/living/heavy_vehicle/premade/light/legion/Initialize()
+	if(!arms)
+		arms = new /obj/item/mech_component/manipulators/light(src)
+		arms.color = "#849bc1"
+	if(!legs)
+		legs = new /obj/item/mech_component/propulsion/light(src)
+		legs.color = "#849bc1"
+	if(!head)
+		head = new /obj/item/mech_component/sensors/light(src)
+		head.color = "#849bc1"
+	if(!body)
+		body = new /obj/item/mech_component/chassis/light(src)
+		body.color = "#849bc1"
+
+	. = ..()
+
+/mob/living/heavy_vehicle/premade/light/legion/spawn_mech_equipment()
+	install_system(new /obj/item/mecha_equipment/clamp(src), HARDPOINT_RIGHT_HAND)
+	install_system(new /obj/item/mecha_equipment/mounted_system/medanalyzer(src), HARDPOINT_LEFT_HAND)
+	install_system(new /obj/item/mecha_equipment/sleeper(src), HARDPOINT_BACK)
+	install_system(new /obj/item/mecha_equipment/light(src), HARDPOINT_HEAD)
+	install_system(new /obj/item/mecha_equipment/mounted_system/flarelauncher(src), HARDPOINT_RIGHT_SHOULDER)
+	install_system(new /obj/item/mecha_equipment/crisis_drone(src), HARDPOINT_LEFT_SHOULDER)

code/modules/heavy_vehicle/premade/powerloader.dm

@@ -87,16 +87,19 @@
 /mob/living/heavy_vehicle/premade/ripley/flames_red
 	name = "APLU \"Firestarter\""
 	desc = "An ancient but well-liked cargo handling exosuit. This one has cool red flames."
+	icon_state = "ripley_flames_red"
 	decal = "flames_red"
 
 /mob/living/heavy_vehicle/premade/ripley/flames_blue
 	name = "APLU \"Burning Chrome\""
 	desc = "An ancient but well-liked cargo handling exosuit. This one has cool blue flames."
+	icon_state = "ripley_flames_blue"
 	decal = "flames_blue"
 
 /mob/living/heavy_vehicle/premade/firefighter
 	name = "firefighting exosuit"
 	desc = "A mix and match of industrial parts designed to withstand fires."
+	icon_state = "firefighter"
 
 /mob/living/heavy_vehicle/premade/firefighter/Initialize()
 	if(!arms)
@@ -129,6 +132,8 @@
 /mob/living/heavy_vehicle/premade/combatripley
 	name = "combat APLU \"Ripley\""
 	desc = "A large APLU unit fitted with specialized composite armor and fancy, though old targeting systems."
+	icon_state = "combatripley"
+	decal = "ripley_legion"
 
 /mob/living/heavy_vehicle/premade/combatripley/Initialize()
 	if(!arms)
@@ -150,9 +155,10 @@
 
 /mob/living/heavy_vehicle/premade/combatripley/spawn_mech_equipment()
 	..()
-	install_system(new /obj/item/mecha_equipment/drill(src), HARDPOINT_LEFT_HAND)
-	install_system(new /obj/item/mecha_equipment/mounted_system/taser/laser(src), HARDPOINT_RIGHT_HAND)
-	install_system(new /obj/item/mecha_equipment/mounted_system/grenadeflash(src), HARDPOINT_RIGHT_SHOULDER)
+	install_system(new /obj/item/mecha_equipment/mounted_system/blaster(src), HARDPOINT_LEFT_HAND)
+	install_system(new /obj/item/mecha_equipment/mounted_system/gauss(src), HARDPOINT_RIGHT_HAND)
+	install_system(new /obj/item/mecha_equipment/mounted_system/flarelauncher(src), HARDPOINT_RIGHT_SHOULDER)
+	install_system(new /obj/item/mecha_equipment/mounted_system/grenadesmoke(src), HARDPOINT_LEFT_SHOULDER)
 
 /obj/item/mech_component/sensors/combatripley
 	name = "exosuit sensors"

code/modules/projectiles/guns/energy/blaster.dm

@@ -20,6 +20,20 @@
 		list(mode_name="2-round bursts", burst=2, fire_delay=null, move_delay=2,    burst_accuracy=list(1,0,0),       dispersion=list(0, 10, 15))
 		)
 
+/obj/item/gun/energy/blaster/mounted/mech
+	name = "rapidfire blaster"
+	desc = "An aged but reliable rapidfire blaster tuned to expel projectiles at high fire rates."
+	fire_sound = 'sound/weapons/laserstrong.ogg'
+	projectile_type = /obj/item/projectile/energy/blaster/heavy
+	burst = 5
+	burst_delay = 3
+	max_shots = 30
+	charge_cost = 100
+	use_external_power = TRUE
+	self_recharge = TRUE
+	recharge_time = 1.5
+	dispersion = list(3,6,9,12)
+
 /obj/item/gun/energy/blaster/revolver
 	name = "blaster revolver"
 	desc = "A robust eight-shot blaster.."
@@ -47,7 +61,6 @@
 	desc = "A robust, low in maintenance, eight-shot blaster. Perfect for self-defense purposes."
 
 /obj/item/gun/energy/blaster/carbine
-
 	name = "blaster carbine"
 	desc = "A short-barreled blaster carbine meant for easy handling and comfort when in combat."
 	icon_state = "blaster_carbine"

code/modules/projectiles/guns/projectile/rifle.dm

@@ -225,7 +225,6 @@
 	allowed_magazines = list(/obj/item/ammo_magazine/gauss)
 	icon_state = "gauss_thumper"
 	caliber = "gauss"
-	accuracy = 1
 	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
 	fire_sound = 'sound/weapons/railgun.ogg'
 	load_method = MAGAZINE
@@ -249,4 +248,20 @@
 		item_state = "gauss_thumper"
 
 	update_held_icon()
-	return
+	return
+
+/obj/item/gun/energy/gauss/mounted/mech
+	name = "heavy gauss cannon"
+	desc = "An outdated and power hungry gauss cannon, modified to deliver high explosive rounds at high velocities."
+	icon = 'icons/obj/gun.dmi'
+	icon_state = "gauss_thumper"
+	fire_sound = 'sound/weapons/railgun.ogg'
+	fire_delay = 30
+	charge_meter = 0
+	max_shots = 3
+	charge_cost = 500
+	projectile_type = /obj/item/projectile/bullet/gauss/highex
+	self_recharge = 1
+	use_external_power = 1
+	recharge_time = 12
+	needspin = FALSE

code/modules/projectiles/projectile/bullets.dm

@@ -329,6 +329,22 @@
 	muzzle_type = /obj/effect/projectile/muzzle/gauss
 	embed = 0
 
+/obj/item/projectile/bullet/gauss/highex
+	name ="high-ex shell"
+	damage = 10
+
+/obj/item/projectile/bullet/gauss/highex/on_impact(var/atom/A)
+	explosion(A, -1, 0, 2)
+	..()
+
+/obj/item/projectile/bullet/gauss/highex/on_hit(var/atom/target, var/blocked = 0)
+	explosion(target, -1, 0, 2)
+	sleep(0)
+	var/obj/T = target
+	var/throwdir = get_dir(firer,target)
+	T.throw_at(get_edge_target_turf(target, throwdir),3,3)
+	return 1
+
 /obj/item/projectile/bullet/cannonball
 	name = "cannonball"
 	icon_state = "cannonball"

code/modules/research/designs/designs_exosuits.dm

@@ -278,7 +278,7 @@
 	time = 90
 	materials = list(DEFAULT_WALL_MATERIAL = 30000, "phoron" = 25000, "steel" = 15000, "gold" = 15000)
 	req_tech = list(TECH_MATERIAL = 4, TECH_BLUESPACE = 3, TECH_MAGNET = 4, TECH_POWER = 4, TECH_ENGINEERING = 4)
-	build_path = /obj/item/mecha_equipment/mounted_system/rcd
+	build_path = /obj/item/mecha_equipment/mounted_system/rfd
 
 /datum/design/item/mechfab/exosuit/floodlight
 	name = "floodlight"

html/changelogs/Ferner-191129-coding_mechdecals.yml

@@ -0,0 +1,44 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Ferner
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "Reworked the contents of the Legion's garages to work better with the recent mech updates."
+  - rscadd: "Added some new exclusive weaponry for Legion combat ripleys."
+  - bugfix: "Reworked the way mech decals are added so they get the proper colors applied to them."
+  - bugfix: "Fixed some mech equipment that lacked an icon or had the wrong name set."

maps/aurora/aurora-1_centcomm.dmm

@@ -10417,7 +10417,7 @@
 /area/centcom/specops)
 "ayG" = (
 /obj/item/mecha_equipment/mounted_system/extinguisher,
-/obj/item/mecha_equipment/mounted_system/rcd,
+/obj/item/mecha_equipment/mounted_system/rfd,
 /obj/item/pickaxe/diamonddrill,
 /obj/structure/table/reinforced/steel,
 /obj/item/pickaxe/diamonddrill,
@@ -22445,6 +22445,7 @@
 /area/centcom/legion)
 "bjl" = (
 /obj/effect/decal/cleanable/dirt,
+/mob/living/heavy_vehicle/premade/combatripley,
 /turf/unsimulated/floor{
 	icon_state = "engine"
 	},
@@ -22488,12 +22489,6 @@
 	dir = 5
 	},
 /area/centcom/evac)
-"bpk" = (
-/obj/item/stool,
-/turf/unsimulated/floor{
-	name = "plating"
-	},
-/area/centcom/legion/hangar5)
 "bpY" = (
 /obj/structure/closet/secure_closet/engineering_welding,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -22712,6 +22707,19 @@
 	dir = 4
 	},
 /area/centcom/spawning)
+"clq" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/light/small/emergency{
+	icon_state = "bulb1";
+	dir = 1
+	},
+/turf/unsimulated/floor{
+	icon_state = "engine"
+	},
+/area/centcom/legion/hangar5)
 "coC" = (
 /obj/structure/sign/greencross{
 	name = "Emergency Room"
@@ -22719,8 +22727,22 @@
 /turf/unsimulated/wall/darkshuttlewall,
 /area/centcom/legion)
 "cpE" = (
-/obj/structure/table/reinforced/steel,
-/obj/item/mecha_equipment/sleeper,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/table/rack,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+	dir = 4;
+	name = "adjusted light fixture";
+	pixel_y = 0
+	},
+/obj/item/hoist_kit{
+	pixel_x = -1;
+	pixel_y = 4
+	},
+/obj/item/hoist_kit{
+	pixel_x = -1;
+	pixel_y = 4
+	},
 /turf/unsimulated/floor{
 	name = "plating"
 	},
@@ -23268,12 +23290,6 @@
 	dir = 5
 	},
 /area/centcom/living)
-"dMN" = (
-/obj/machinery/mech_recharger,
-/turf/unsimulated/floor{
-	name = "plating"
-	},
-/area/centcom/legion/hangar5)
 "dNm" = (
 /obj/item/storage/fancy/cigar{
 	layer = 3.01;
@@ -23353,8 +23369,17 @@
 /turf/simulated/floor/tiled,
 /area/centcom/ferry)
 "dWj" = (
-/obj/structure/table/reinforced/steel,
-/obj/item/mecha_equipment/mounted_system/extinguisher,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/fake_object{
+	density = 1;
+	desc = "The half-built chassis of some kind of outdated mech. It's rather dusty.";
+	icon = 'icons/mecha/mech_construction.dmi';
+	icon_state = "hermes7";
+	layer = 3;
+	name = "half-built mech";
+	pixel_x = -4;
+	pixel_y = 3
+	},
 /turf/unsimulated/floor{
 	name = "plating"
 	},
@@ -24174,16 +24199,20 @@
 /area/centcom/legion/hangar5)
 "fTp" = (
 /obj/structure/table/reinforced/steel,
-/obj/item/mecha_equipment/drill{
-	pixel_x = 0;
-	pixel_y = 10
+/obj/item/clothing/head/welding{
+	pixel_y = 6
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/item/mecha_equipment/mounted_system/rcd,
+/obj/item/weldingtool/hugetank,
 /turf/unsimulated/floor{
 	name = "plating"
 	},
 /area/centcom/legion/hangar5)
+"fTE" = (
+/obj/structure/closet/crate/secure/legion,
+/turf/unsimulated/floor{
+	icon_state = "tiles"
+	},
+/area/centcom/legion/hangar5)
 "fWe" = (
 /obj/structure/table/rack,
 /obj/item/rig/retro/equipped,
@@ -24336,6 +24365,22 @@
 	name = "plating"
 	},
 /area/centcom/legion)
+"gnj" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/fake_object{
+	density = 1;
+	desc = "A heavy armored vehicle. Commonly produced by the Sol Alliance and fielded by the forces of the Tau Ceti Foreign Legion. This one has suffered too much damage to be operational.";
+	icon = 'icons/mecha/mecha_114x59.dmi';
+	icon_state = "jotun-broken";
+	layer = 3.3;
+	name = "Jotun";
+	pixel_x = -42;
+	pixel_y = -10
+	},
+/turf/unsimulated/floor{
+	name = "plating"
+	},
+/area/centcom/legion/hangar5)
 "gpl" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/generic,
@@ -24798,6 +24843,12 @@
 	icon_state = "dark"
 	},
 /area/centcom/legion/hangar5)
+"hyZ" = (
+/obj/structure/closet/crate/secure/legion,
+/turf/unsimulated/floor{
+	icon_state = "steel_dirty"
+	},
+/area/centcom/legion/hangar5)
 "hzB" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -25233,13 +25284,6 @@
 	},
 /turf/simulated/floor/holofloor/snow,
 /area/holodeck/source_dininghall)
-"ikA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/oil,
-/turf/unsimulated/floor{
-	name = "plating"
-	},
-/area/centcom/legion/hangar5)
 "iol" = (
 /obj/machinery/door/blast/odin/shuttle/tcfl/shutter{
 	density = 1;
@@ -25747,6 +25791,15 @@
 	icon_state = "floor"
 	},
 /area/centcom/evac)
+"joT" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed/chair/office/dark{
+	dir = 1
+	},
+/turf/unsimulated/floor{
+	name = "plating"
+	},
+/area/centcom/legion/hangar5)
 "jpq" = (
 /obj/effect/floor_decal/industrial/warning/full,
 /obj/effect/decal/fake_object{
@@ -26262,6 +26315,17 @@
 	icon_state = "dark"
 	},
 /area/centcom/legion)
+"kKZ" = (
+/obj/machinery/door/blast/odin/shuttle/tcfl/shutter{
+	dir = 2;
+	id = "tcfl_hangar5";
+	name = "Garage"
+	},
+/obj/effect/decal/cleanable/generic,
+/turf/unsimulated/floor{
+	name = "plating"
+	},
+/area/centcom/legion/hangar5)
 "kLE" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -26743,9 +26807,13 @@
 /area/centcom/holding)
 "mkQ" = (
 /obj/structure/table/reinforced/steel,
-/obj/item/mecha_equipment/clamp,
-/obj/item/mecha_equipment/clamp,
-/obj/effect/decal/cleanable/dirt,
+/obj/item/device/flashlight/lamp{
+	on = 1
+	},
+/obj/item/screwdriver{
+	pixel_x = -1;
+	pixel_y = -12
+	},
 /turf/unsimulated/floor{
 	name = "plating"
 	},
@@ -27018,16 +27086,6 @@
 	dir = 9
 	},
 /area/centcom/legion)
-"mSX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/emergency{
-	icon_state = "bulb1";
-	dir = 4
-	},
-/turf/unsimulated/floor{
-	icon_state = "engine"
-	},
-/area/centcom/legion/hangar5)
 "mUu" = (
 /obj/machinery/atmospherics/pipe/tank/air{
 	icon_state = "air_map";
@@ -28093,10 +28151,15 @@
 	},
 /area/centcom/living)
 "oQd" = (
-/obj/structure/table/reinforced/steel,
-/obj/item/mecha_equipment/sleeper,
-/obj/machinery/light/small{
-	dir = 1
+/obj/effect/decal/fake_object{
+	density = 1;
+	desc = "A wooden crate containing spare parts.";
+	icon = 'icons/obj/storage.dmi';
+	icon_state = "densecrate";
+	layer = 3;
+	name = "mechanical supply crate";
+	pixel_x = 1;
+	pixel_y = 0
 	},
 /turf/unsimulated/floor{
 	name = "plating"
@@ -28355,12 +28418,6 @@
 	name = "plating"
 	},
 /area/centcom/legion)
-"pxH" = (
-/mob/living/heavy_vehicle/premade/combatripley,
-/turf/unsimulated/floor{
-	name = "plating"
-	},
-/area/centcom/legion/hangar5)
 "pBa" = (
 /obj/effect/floor_decal/corner/blue{
 	icon_state = "corner_white";
@@ -30442,9 +30499,16 @@
 	},
 /area/centcom/legion)
 "upy" = (
-/obj/structure/table/reinforced/steel,
-/obj/machinery/light/small{
-	dir = 8
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/fake_object{
+	density = 1;
+	desc = "This one is beyond repair and only worth as much as its weight in scrap. The cockpit has some long dried bloodstains.";
+	icon = 'icons/mecha/mecha.dmi';
+	icon_state = "combatripley-broken";
+	layer = 3;
+	name = "wrecked combat ripley";
+	pixel_x = 0;
+	pixel_y = 4
 	},
 /turf/unsimulated/floor{
 	name = "plating"
@@ -30832,13 +30896,22 @@
 	},
 /area/shuttle/legion/centcom)
 "vqz" = (
-/obj/structure/table/reinforced/steel,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/table/rack,
+/obj/item/ladder_mobile{
+	pixel_y = 6
+	},
+/obj/item/ladder_mobile{
+	pixel_y = 6
+	},
 /turf/unsimulated/floor{
 	name = "plating"
 	},
 /area/centcom/legion/hangar5)
 "vsg" = (
-/mob/living/heavy_vehicle/premade/light,
+/obj/effect/decal/cleanable/dirt,
+/mob/living/heavy_vehicle/premade/light/legion,
 /turf/unsimulated/floor{
 	name = "plating"
 	},
@@ -31683,6 +31756,13 @@
 	icon_state = "steel_dirty"
 	},
 /area/centcom/legion/hangar5)
+"xia" = (
+/obj/effect/decal/cleanable/dirt,
+/mob/living/heavy_vehicle/premade/combatripley,
+/turf/unsimulated/floor{
+	name = "plating"
+	},
+/area/centcom/legion/hangar5)
 "xif" = (
 /obj/structure/sign/christmas/lights{
 	icon_state = "xmaslights";
@@ -31696,13 +31776,6 @@
 "xii" = (
 /turf/unsimulated/wall/fakepdoor,
 /area/centcom/legion/hangar5)
-"xiL" = (
-/obj/effect/decal/cleanable/dirt,
-/mob/living/heavy_vehicle/premade/superheavy,
-/turf/unsimulated/floor{
-	name = "plating"
-	},
-/area/centcom/legion/hangar5)
 "xjq" = (
 /obj/machinery/light,
 /obj/structure/curtain,
@@ -32011,12 +32084,12 @@
 /turf/space/transit/east/shuttlespace_ew8,
 /area/shuttle/legion/transit)
 "xKS" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/blast/odin/shuttle/tcfl/shutter{
 	dir = 2;
 	id = "tcfl_hangar5";
 	name = "Garage"
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/unsimulated/floor{
 	name = "plating"
 	},
@@ -90046,8 +90119,8 @@ nkv
 nkv
 ldQ
 dWj
-bpk
 orV
+joT
 xKS
 hzB
 hiF
@@ -90303,8 +90376,8 @@ orV
 orV
 vDl
 blQ
-pxH
-pWv
+orV
+orV
 xKS
 hzB
 hiF
@@ -90555,13 +90628,13 @@ aDQ
 aaM
 lmb
 lBN
+gnj
 orV
-xiL
 orV
 vDl
-ikA
-pWv
-pWv
+orV
+xia
+orV
 bft
 hzB
 hiF
@@ -90816,9 +90889,9 @@ orV
 orV
 orV
 vDl
-dMN
-pWv
-pWv
+blQ
+orV
+orV
 bft
 hzB
 hiF
@@ -91069,14 +91142,14 @@ aDQ
 aaM
 lmb
 ldQ
-cpV
+clq
 wZy
 cpV
 ldQ
 vsg
 pWv
-pWv
-bft
+orV
+kKZ
 hzB
 hiF
 pWv
@@ -91327,7 +91400,7 @@ aaM
 lmb
 ldQ
 bjl
-mSX
+bjl
 bjl
 ldQ
 oQd
@@ -92356,11 +92429,11 @@ lmb
 lBN
 hYP
 hkI
-iVa
+cPn
+hyZ
 gwQ
 cPn
 iVa
-iVa
 xPz
 chO
 hiF
@@ -92614,9 +92687,9 @@ lBN
 rbI
 mzf
 iVa
+fTE
 oXZ
 iAR
-iVa
 cPn
 xPz
 chO

maps/exodus/exodus-2_centcomm.dmm

@@ -7591,13 +7591,6 @@
 	icon_state = "redfull"
 	},
 /area/centcom/living)
-"awl" = (
-/obj/structure/table/reinforced/steel,
-/turf/unsimulated/floor{
-	icon_state = "vault";
-	dir = 1
-	},
-/area/centcom/specops)
 "awo" = (
 /obj/machinery/door/airlock/centcom{
 	name = "Armory Special Operations";
@@ -12568,7 +12561,7 @@
 /area/centcom/specops)
 "aLP" = (
 /obj/item/mecha_equipment/mounted_system/extinguisher,
-/obj/item/mecha_equipment/mounted_system/rcd,
+/obj/item/mecha_equipment/mounted_system/rfd,
 /obj/item/pickaxe/diamonddrill,
 /obj/structure/table/reinforced/steel,
 /obj/item/pickaxe/diamonddrill,
@@ -15681,10 +15674,10 @@
 	},
 /area/centcom/control)
 "aSN" = (
-/mob/living/heavy_vehicle/premade/combat,
 /obj/machinery/camera/network/ert{
 	c_tag = "Assault Armor North"
 	},
+/mob/living/heavy_vehicle/premade/combat,
 /turf/unsimulated/floor{
 	icon_state = "delivery";
 	dir = 6
@@ -19267,17 +19260,6 @@
 	dir = 5
 	},
 /area/tdome/tdomeadmin)
-"cGa" = (
-/obj/machinery/door/airlock/external{
-	frequency = 1380;
-	icon_state = "door_locked";
-	id_tag = "escape_shuttle_hatch";
-	locked = 1;
-	name = "Shuttle Hatch";
-	req_access = list(13)
-	},
-/turf/simulated/floor/shuttle,
-/area/shuttle/escape/centcom)
 "cGJ" = (
 /obj/machinery/camera/network/crescent{
 	c_tag = "Crescent Departures";
@@ -20985,10 +20967,6 @@
 	dir = 6
 	},
 /area/centcom/spawning)
-"jAR" = (
-/obj/structure/table/reinforced/steel,
-/turf/simulated/floor/tiled/dark,
-/area/centcom/legion)
 "jEA" = (
 /obj/machinery/status_display/arrivals_display,
 /turf/unsimulated/wall/riveted,
@@ -21707,8 +21685,8 @@
 	},
 /area/centcom/shared_dream)
 "ofL" = (
-/mob/living/heavy_vehicle/premade/light,
 /obj/effect/floor_decal/industrial/hatch/yellow,
+/mob/living/heavy_vehicle/premade/light,
 /turf/simulated/floor/tiled/dark,
 /area/centcom/legion)
 "ofX" = (
@@ -21928,9 +21906,6 @@
 	},
 /turf/simulated/floor/shuttle,
 /area/shuttle/escape/centcom)
-"plE" = (
-/turf/simulated/floor/tiled/dark,
-/area/centcom/legion)
 "plH" = (
 /turf/unsimulated/floor{
 	icon_state = "red";
@@ -22330,8 +22305,8 @@
 	},
 /area/centcom/holding)
 "qSp" = (
-/mob/living/heavy_vehicle/premade/ripley,
 /obj/effect/floor_decal/industrial/hatch/yellow,
+/mob/living/heavy_vehicle/premade/ripley,
 /turf/simulated/floor/tiled/dark,
 /area/centcom/legion)
 "qTU" = (
@@ -23619,7 +23594,7 @@
 /area/centcom/spawning)
 "xcV" = (
 /obj/item/mecha_equipment/mounted_system/extinguisher,
-/obj/item/mecha_equipment/mounted_system/rcd,
+/obj/item/mecha_equipment/mounted_system/rfd,
 /obj/item/pickaxe/diamonddrill,
 /obj/structure/table/reinforced/steel,
 /obj/item/pickaxe/diamonddrill,
@@ -37685,8 +37660,8 @@ tPL
 aWW
 aWW
 tPL
-plE
-plE
+dem
+dem
 tPL
 uhS
 fqX
@@ -37936,19 +37911,19 @@ aWW
 pXT
 rgE
 dIO
-plE
+dem
 iBs
 tPL
 rgE
 rgE
 tPL
 kMm
-plE
+dem
 rgE
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 tPL
 tPL
 rgE
@@ -38193,24 +38168,24 @@ aWW
 pXT
 rgE
 dIO
-plE
-plE
+dem
+dem
 rgE
-plE
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
+dem
 hRt
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 tsf
-plE
-plE
+dem
+dem
 gGB
-plE
+dem
 rgE
 pXT
 aWW
@@ -38450,24 +38425,24 @@ aWW
 pXT
 rgE
 dIO
-plE
-plE
+dem
+dem
 imI
-plE
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
+dem
 rgE
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 tPL
 tPL
 tPL
 tPL
-plE
+dem
 tPL
 pXT
 aWW
@@ -38707,14 +38682,14 @@ aWW
 pXT
 rgE
 dIO
-plE
-plE
+dem
+dem
 imI
-plE
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
+dem
 tPL
 geX
 fYP
@@ -38724,7 +38699,7 @@ tPL
 oii
 oii
 tPL
-plE
+dem
 rgE
 pXT
 pXT
@@ -38964,13 +38939,13 @@ aWW
 pXT
 rgE
 dIO
-plE
-plE
+dem
+dem
 rgE
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 iBs
 tPL
 rgE
@@ -39221,19 +39196,19 @@ aWW
 pXT
 rgE
 dIO
-plE
+dem
 iBs
 tPL
 rgE
 rgE
 tPL
 kMm
-plE
+dem
 tPL
 iIW
-plE
-plE
-plE
+dem
+dem
+dem
 nbF
 tPL
 uSR
@@ -39481,16 +39456,16 @@ tkH
 qdE
 lQc
 tPL
-plE
-plE
+dem
+dem
 tPL
-plE
-plE
+dem
+dem
 rgE
 jFm
-plE
-plE
-plE
+dem
+dem
+dem
 knv
 tPL
 rvv
@@ -39738,16 +39713,16 @@ tPL
 tPL
 tPL
 tPL
-plE
-plE
+dem
+dem
 rgE
-plE
-plE
+dem
+dem
 dhL
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 hLg
 tPL
 brP
@@ -39993,18 +39968,18 @@ pXT
 tPL
 eAC
 ccP
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 rgE
-plE
-plE
+dem
+dem
 rgE
 kMm
-plE
-plE
-plE
+dem
+dem
+dem
 bUL
 tPL
 vaK
@@ -40251,12 +40226,12 @@ tPL
 tPL
 tPL
 kMm
-plE
-plE
+dem
+dem
 iDx
 rgE
-plE
-plE
+dem
+dem
 tPL
 rxJ
 mIn
@@ -40507,12 +40482,12 @@ pXT
 tPL
 eAC
 ccP
-plE
-plE
-plE
+dem
+dem
+dem
 iDx
 rgE
-plE
+dem
 iBs
 tPL
 tPL
@@ -40765,24 +40740,24 @@ tPL
 tPL
 tPL
 kMm
-plE
-plE
-plE
+dem
+dem
+dem
 rgE
-plE
-plE
+dem
+dem
 tPL
 suQ
 tCJ
 uoa
-plE
+dem
 dDS
 tPL
-plE
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
+dem
 tPL
 pXT
 aaM
@@ -41021,25 +40996,25 @@ pXT
 tPL
 eAC
 ccP
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 rgE
-plE
-plE
+dem
+dem
 rgE
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 ioZ
 tPL
-plE
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
+dem
 tPL
 pXT
 aaM
@@ -41279,23 +41254,23 @@ tPL
 tPL
 tPL
 kMm
-plE
-plE
+dem
+dem
 iBs
 tPL
 kMm
-plE
+dem
 rgE
 kMm
-plE
-plE
-plE
+dem
+dem
+dem
 lvG
 tPL
 kMm
-plE
-plE
-plE
+dem
+dem
+dem
 iBs
 tPL
 pXT
@@ -41535,25 +41510,25 @@ pXT
 tPL
 eAC
 ccP
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 fpt
-plE
-plE
+dem
+dem
 szc
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 jNg
 tPL
 blT
 mGj
 mGj
 uqa
-plE
+dem
 tPL
 pXT
 aaM
@@ -41793,24 +41768,24 @@ tPL
 tPL
 tPL
 kMm
-plE
-plE
+dem
+dem
 iBs
 tPL
 kMm
-plE
+dem
 rgE
 kMm
-plE
-plE
-plE
+dem
+dem
+dem
 ggL
 tPL
 blT
-plE
+dem
 dem
 uqa
-plE
+dem
 tPL
 pXT
 aaM
@@ -42049,18 +42024,18 @@ pXT
 tPL
 eAC
 ccP
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 rgE
-plE
-plE
+dem
+dem
 rgE
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 nRS
 tPL
 wtu
@@ -42307,24 +42282,24 @@ tPL
 tPL
 tPL
 kMm
-plE
-plE
+dem
+dem
 iDx
 rgE
-plE
-plE
+dem
+dem
 tPL
 eRL
 ucM
 pRV
-plE
+dem
 otv
 tPL
-plE
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
+dem
 tPL
 pXT
 aaM
@@ -42563,12 +42538,12 @@ pXT
 tPL
 eAC
 ccP
-plE
-plE
-plE
+dem
+dem
+dem
 iDx
 rgE
-plE
+dem
 iBs
 tPL
 tPL
@@ -42577,11 +42552,11 @@ rgE
 rgE
 tPL
 tPL
-plE
-plE
-plE
+dem
+dem
+dem
 tGf
-plE
+dem
 tPL
 pXT
 aaM
@@ -42821,12 +42796,12 @@ tPL
 tPL
 tPL
 kMm
-plE
-plE
-plE
+dem
+dem
+dem
 rgE
-plE
-plE
+dem
+dem
 tPL
 qrp
 xOP
@@ -43070,32 +43045,32 @@ pXT
 tPL
 mla
 qpO
-plE
+dem
 qpO
-plE
-plE
+dem
+dem
 qpO
-plE
-plE
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
+dem
+dem
 tPL
 kMm
-plE
+dem
 rgE
 kMm
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 jri
 kZY
 jri
 bIX
 rgE
-plE
+dem
 rgE
 pXT
 aaM
@@ -43339,20 +43314,20 @@ pHf
 pHf
 sds
 fpt
-plE
-plE
+dem
+dem
 oKe
-plE
-plE
-plE
-plE
-plE
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
+dem
+dem
+dem
+dem
+dem
 rgE
-plE
+dem
 rgE
 pXT
 aaM
@@ -43597,19 +43572,19 @@ kbl
 uqa
 tPL
 kMm
-plE
+dem
 rgE
 kMm
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 com
 vQX
 sWB
 sWB
 rgE
-plE
+dem
 rgE
 pXT
 aaM
@@ -43853,8 +43828,8 @@ ihi
 bSv
 uqa
 rgE
-plE
-plE
+dem
+dem
 tPL
 khE
 pXa
@@ -44110,7 +44085,7 @@ ihi
 kKU
 uqa
 rgE
-plE
+dem
 iBs
 tPL
 tPL
@@ -44123,7 +44098,7 @@ fQl
 cIO
 xcV
 xDP
-plE
+dem
 tPL
 pXT
 aaM
@@ -44367,8 +44342,8 @@ ihi
 kKU
 uqa
 rgE
-plE
-plE
+dem
+dem
 rgE
 fLN
 tqs
@@ -44376,10 +44351,10 @@ bfF
 wtN
 gpt
 tPL
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 iBs
 tPL
 pXT
@@ -44624,20 +44599,20 @@ ihi
 kKU
 uqa
 rgE
-plE
-plE
+dem
+dem
 rgE
 kMm
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 tPL
 kMm
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 rgE
 pXT
 aaM
@@ -44881,20 +44856,20 @@ ihi
 nzK
 uqa
 rgE
-plE
-plE
+dem
+dem
 exF
-plE
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
+dem
 iWk
-plE
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
+dem
 rgE
 pXT
 aaM
@@ -45138,19 +45113,19 @@ rMk
 mnr
 uqa
 rgE
-plE
-plE
+dem
+dem
 rgE
 kMm
-plE
-plE
-plE
-plE
+dem
+dem
+dem
+dem
 tPL
 sLc
-plE
-plE
-plE
+dem
+dem
+dem
 tHq
 tPL
 pXT
@@ -45396,7 +45371,7 @@ mGj
 qfi
 tPL
 kMm
-plE
+dem
 rgE
 had
 lrJ
@@ -45404,10 +45379,10 @@ shO
 frj
 iip
 tPL
-jAR
-plE
+cIO
+dem
 tGf
-plE
+dem
 lxf
 tPL
 pXT
@@ -48027,7 +48002,7 @@ auR
 avn
 aLP
 avT
-awl
+avn
 atL
 atL
 axe
@@ -62185,9 +62160,9 @@ aCn
 ayK
 azV
 ayK
-cGa
-cGa
-cGa
+aCn
+aCn
+aCn
 ayK
 azV
 ayK

maps/space_ruins/scrapheap.dmm

@@ -1363,10 +1363,6 @@
 	dir = 8
 	},
 /area/derelict/ship)
-"dR" = (
-/obj/structure/table/rack,
-/turf/simulated/floor/tiled/dark,
-/area/derelict/ship)
 "dS" = (
 /obj/structure/window/phoronreinforced{
 	icon_state = "phoronrwindow";
@@ -1721,16 +1717,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
-"eT" = (
-/turf/simulated/floor/tiled/dark,
-/area/derelict/ship)
 "eU" = (
 /obj/machinery/mecha_part_fabricator,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
 "eV" = (
-/obj/item/mecha_equipment/mounted_system/rcd,
+/obj/item/mecha_equipment/mounted_system/rfd,
 /obj/structure/table/rack,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
@@ -1767,10 +1760,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/bluegrid,
 /area/derelict/ship)
-"fc" = (
-/obj/item/mech_component/chassis/combat,
-/turf/simulated/floor/tiled/dark,
-/area/derelict/ship)
 "fd" = (
 /obj/item/mech_component/sensors/combat,
 /turf/simulated/floor/tiled/dark,
@@ -1892,14 +1881,6 @@
 /obj/structure/table/reinforced,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
-"fq" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/dark,
-/area/derelict/ship)
-"fr" = (
-/obj/structure/table/reinforced,
-/turf/simulated/floor/tiled/dark,
-/area/derelict/ship)
 "fs" = (
 /obj/structure/bed/padded,
 /turf/simulated/floor/wood,
@@ -2778,10 +2759,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
 /area/derelict/ship)
-"ij" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/dark,
-/area/derelict/ship)
 "ik" = (
 /obj/effect/decal/remains/robot,
 /obj/effect/decal/cleanable/dirt,
@@ -3241,10 +3218,6 @@
 /obj/structure/ore_box,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
-"jF" = (
-/obj/effect/floor_decal/industrial/outline,
-/turf/simulated/floor/tiled/dark,
-/area/derelict/ship)
 "jG" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced,
@@ -3328,10 +3301,6 @@
 /obj/machinery/floodlight,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
-"jR" = (
-/obj/effect/floor_decal/industrial/outline,
-/turf/simulated/floor/tiled/dark,
-/area/derelict/ship)
 "jS" = (
 /obj/structure/closet/radiation,
 /turf/simulated/floor/tiled/dark,
@@ -3799,11 +3768,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
-"ls" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/dark,
-/area/derelict/ship)
 "lt" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/material/shard,
@@ -6380,16 +6344,6 @@
 	icon_state = "floor7"
 	},
 /area/derelict)
-"tj" = (
-/obj/effect/floor_decal/industrial/warning{
-	icon_state = "warning";
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/shuttle{
-	icon_state = "floor4"
-	},
-/area/derelict)
 "tk" = (
 /obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/dirt,
@@ -6498,13 +6452,6 @@
 	icon_state = "floor4"
 	},
 /area/derelict)
-"tA" = (
-/obj/machinery/mech_recharger,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/shuttle{
-	icon_state = "floor4"
-	},
-/area/derelict)
 "tB" = (
 /obj/effect/decal/cleanable/dirt,
 /mob/living/simple_animal/hostile/retaliate/malf_drone,
@@ -7991,12 +7938,6 @@
 	icon_state = "floor7"
 	},
 /area/derelict)
-"xe" = (
-/obj/machinery/floodlight,
-/turf/simulated/floor/shuttle{
-	icon_state = "floor7"
-	},
-/area/derelict)
 "xf" = (
 /obj/machinery/floodlight,
 /turf/simulated/floor/airless{
@@ -10860,10 +10801,6 @@
 /obj/machinery/newscaster,
 /turf/simulated/wall/r_wall,
 /area/derelict/arrival)
-"EZ" = (
-/obj/effect/floor_decal/industrial/hatch,
-/turf/simulated/floor/tiled,
-/area/derelict/arrival)
 "Fa" = (
 /obj/effect/floor_decal/industrial/hatch,
 /obj/structure/closet/crate/loot,
@@ -11661,11 +11598,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/arrival)
-"Hq" = (
-/obj/structure/table/rack,
-/obj/random/toolbox,
-/turf/simulated/floor/tiled/dark,
-/area/derelict/arrival)
 "Hr" = (
 /obj/machinery/suit_storage_unit/standard_unit,
 /turf/simulated/floor/tiled/red,
@@ -44088,7 +44020,7 @@ Ef
 Ej
 EC
 Ef
-EZ
+Ep
 Eo
 Ef
 CI
@@ -45643,7 +45575,7 @@ GF
 GT
 Hc
 Hk
-Hq
+Hk
 Ch
 Ch
 Ch
@@ -51610,7 +51542,7 @@ ad
 ad
 dL
 eo
-eT
+aw
 aw
 aw
 nZ
@@ -52896,7 +52828,7 @@ ad
 aR
 aw
 ax
-fq
+ax
 aR
 aw
 bL
@@ -53471,7 +53403,7 @@ sz
 sz
 sQ
 gg
-tj
+sN
 tz
 sO
 sV
@@ -53986,7 +53918,7 @@ sz
 sQ
 gg
 sN
-tA
+tz
 tT
 sO
 eX
@@ -54262,7 +54194,7 @@ tw
 tw
 rs
 eX
-xe
+te
 tw
 rs
 tw
@@ -54437,7 +54369,7 @@ SV
 ad
 aw
 eq
-fc
+eq
 ax
 ax
 aw
@@ -54949,7 +54881,7 @@ ad
 ad
 ad
 ad
-dR
+dP
 eo
 ax
 ax
@@ -55206,10 +55138,10 @@ aD
 aD
 aD
 ad
-dR
+dP
 ax
 ax
-fr
+aR
 aw
 aw
 ad
@@ -55465,7 +55397,7 @@ aF
 bb
 aw
 ax
-dR
+dP
 aR
 fw
 ad
@@ -55743,7 +55675,7 @@ jd
 jx
 jd
 jd
-jF
+iT
 jd
 jd
 jE
@@ -56006,7 +55938,7 @@ iT
 jM
 iT
 iT
-jR
+iT
 gQ
 hX
 hX
@@ -63193,9 +63125,9 @@ gi
 nb
 gm
 ad
-dR
-dR
-dR
+dP
+dP
+dP
 zh
 ad
 hE
@@ -68260,7 +68192,7 @@ am
 ad
 eP
 ax
-ij
+ax
 ax
 bC
 lQ
@@ -69804,7 +69736,7 @@ eP
 if
 hK
 ax
-ls
+bC
 lQ
 at
 ap