More MedSci Sprites (#7154)

Adds more of the Medical and Science uniform sprites. Still have stuff to do. My understanding of code is pretty limited so if anyone knows how to do any of the things I'm trying to do, please comment and tell me how. Otherwise, I'll keep trying to get them working. Also please if any merciful coder feels like looking over any changes out of the kindness of their heart while I'm working on this, please point out anything that might be broken or wrong.

code/controllers/subsystems/traumas.dm

@@ -102,7 +102,7 @@ var/datum/controller/subsystem/traumas/SStraumas
 												 /obj/item/toy/figure/md, /obj/item/weapon/bedsheet/medical, /obj/item/weapon/rig/medical, /obj/item/weapon/storage/backpack/duffel/med,
 												 /obj/item/weapon/storage/backpack/medic, /obj/item/weapon/storage/backpack/messenger/med, /obj/item/weapon/storage/belt/medical,
 												 /obj/machinery/vending/medical, /obj/mecha/medical/odysseus, /obj/structure/closet/crate/medical, /obj/structure/closet/medical_wall,
-												 /obj/structure/sign/bluecross, /obj/item/clothing/accessory/armband/med, /obj/item/clothing/head/helmet/space/void/medical, /obj/item/clothing/mask/breath/medical,
+												 /obj/structure/sign/greencross, /obj/item/clothing/accessory/armband/med, /obj/item/clothing/head/helmet/space/void/medical, /obj/item/clothing/mask/breath/medical,
 												 /obj/item/clothing/under/rank/medical, /obj/item/weapon/scalpel, /obj/machinery/clonepod, /obj/item/weapon/storage/firstaid, /obj/machinery/optable,
 												 /obj/item/clothing/accessory/armband/science, /obj/item/clothing/under/rank/scientist, /obj/machinery/door/airlock/science, /obj/machinery/door/airlock/medical))
 

code/game/jobs/job/medical.dm

@@ -75,7 +75,7 @@
 	jobtype = /datum/job/doctor
 
 	uniform = /obj/item/clothing/under/rank/medical
-	suit = /obj/item/clothing/suit/storage/toggle/labcoat
+	suit = /obj/item/clothing/suit/storage/toggle/labcoat/medical
 	shoes = /obj/item/clothing/shoes/medical
 	l_ear = /obj/item/device/radio/headset/headset_med
 	pda = /obj/item/device/pda/medical
@@ -99,7 +99,8 @@
 	jobtype = /datum/job/doctor
 
 	uniform = /obj/item/clothing/under/rank/medical/blue
-	suit = /obj/item/clothing/suit/storage/toggle/labcoat
+	suit = /obj/item/clothing/suit/storage/toggle/labcoat/surgeon
+	shoes = /obj/item/clothing/shoes/surgeon
 	head = /obj/item/clothing/head/surgery/blue
 
 /datum/outfit/job/doctor/nurse
@@ -154,6 +155,7 @@
 
 	uniform = /obj/item/clothing/under/rank/biochemist
 	suit = /obj/item/clothing/suit/storage/toggle/labcoat/biochemist
+	shoes = /obj/item/clothing/shoes/biochem
 
 	backpack = /obj/item/weapon/storage/backpack/virology
 	satchel = /obj/item/weapon/storage/backpack/satchel_vir
@@ -186,8 +188,8 @@
 	jobtype = /datum/job/psychiatrist
 
 	uniform = /obj/item/clothing/under/rank/psych
-	suit = /obj/item/clothing/suit/storage/toggle/labcoat
-	shoes = /obj/item/clothing/shoes/laceup
+	suit = /obj/item/clothing/suit/storage/toggle/labcoat/psych
+	shoes = /obj/item/clothing/shoes/psych
 	l_ear = /obj/item/device/radio/headset/headset_med
 	pda =  /obj/item/device/pda/chemist
 
@@ -212,7 +214,7 @@
 
 	minimum_character_age = 24
 	alt_ages = list("Emergency Medical Technician" = 20)
-	
+
 	access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_pharmacy, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_paramedic)
 	minimal_access = list(access_medical, access_medical_equip, access_morgue, access_eva, access_maint_tunnels, access_external_airlocks, access_paramedic)
 	alt_titles = list("Emergency Medical Technician")

code/game/jobs/job/science.dm

@@ -63,6 +63,7 @@
 
 	minimal_player_age = 14
 	outfit = /datum/outfit/job/scientist
+	alt_outfits = list("Xenoarcheologist"=/datum/outfit/job/scientist/xenoarcheologist)
 
 /datum/outfit/job/scientist
 	name = "Scientist"
@@ -79,6 +80,11 @@
 	dufflebag = /obj/item/weapon/storage/backpack/duffel/tox
 	messengerbag = /obj/item/weapon/storage/backpack/messenger/tox
 
+/datum/outfit/job/scientist/xenoarcheologist
+    name = "Xenoarcheologist"
+
+    uniform = /obj/item/clothing/under/rank/xenoarcheologist
+
 /datum/job/xenobiologist
 	title = "Xenobiologist"
 	flag = XENOBIOLOGIST

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -324,8 +324,8 @@
 	..()
 	new /obj/item/clothing/under/rank/virologist(src)
 	new /obj/item/clothing/under/rank/virologist(src)
-	new /obj/item/clothing/shoes/chemist(src)
-	new /obj/item/clothing/shoes/chemist(src)
+	new /obj/item/clothing/shoes/biochem(src)
+	new /obj/item/clothing/shoes/biochem(src)
 	new /obj/item/clothing/suit/storage/toggle/labcoat/biochemist(src)
 	new /obj/item/clothing/suit/storage/toggle/labcoat/biochemist(src)
 	new /obj/item/clothing/mask/surgical(src)

code/game/objects/structures/signs.dm

@@ -130,10 +130,10 @@
 	desc = "A warning sign which reads 'NO SMOKING'."
 	icon_state = "nosmoking2"
 
-/obj/structure/sign/bluecross
+/obj/structure/sign/greencross
 	name = "medbay"
 	desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here."
-	icon_state = "bluecross"
+	icon_state = "greencross"
 
 /obj/structure/sign/goldenplaque
 	name = "The Most Robust Men Award for Robustness"

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -264,4 +264,9 @@
 
 /datum/gear/uniform/circuitry
 	display_name = "jumpsuit, circuitry (empty)"
-	path = /obj/item/clothing/under/circuitry
+	path = /obj/item/clothing/under/circuitry
+
+/datum/gear/uniform/science_alt
+	display_name = "scientist, alt"
+	path = /obj/item/clothing/under/rank/scientist/science_alt
+	allowed_roles = list("Scientist", "Xenobiologist")

code/modules/clothing/shoes/colour.dm

@@ -48,7 +48,7 @@
 
 /obj/item/clothing/shoes/medical
 	name = "doctor shoes"
-	desc = "A pair of blue and white shoes intended for safety around patients."
+	desc = "A pair of green and white shoes intended for safety around patients."
 	icon_state = "doctor"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 80, rad = 0)
 
@@ -60,12 +60,33 @@
 	permeability_coefficient = 0.01
 
 /obj/item/clothing/shoes/chemist
-	name = "biochemist shoes"
-	desc = "A pair of green and white shoes resistant to biological and chemical hazards."
+	name = "pharmacist shoes"
+	desc = "A pair of orange and white shoes resistant to biological and chemical hazards."
 	icon_state = "chemist"
 	permeability_coefficient = 0.01
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 90, rad = 0)
 
+/obj/item/clothing/shoes/biochem
+	name = "biochemist shoes"
+	desc = "A pair of red and white shoes resistant to biological and chemical hazards."
+	icon_state = "biochem"
+	permeability_coefficient = 0.01
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 90, rad = 0)
+
+/obj/item/clothing/shoes/psych
+	name = "psychologist shoes"
+	desc = "A pair of teal and white shoes resistant to biological and chemical hazards."
+	icon_state = "psych"
+	permeability_coefficient = 0.01
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 90, rad = 0)
+
+/obj/item/clothing/shoes/surgeon
+	name = "surgeon shoes"
+	desc = "A pair of light blue and white shoes resistant to biological and chemical hazards."
+	icon_state = "surgeon"
+	permeability_coefficient = 0.01
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 90, rad = 0)
+
 /obj/item/clothing/shoes/leather
 	name = "leather shoes"
 	desc = "A sturdy pair of leather shoes."

code/modules/clothing/suits/labcoat.dm

@@ -57,6 +57,7 @@
 	item_state = "labcoat_cmo"
 	icon_open = "labcoat_cmo_open"
 	icon_closed = "labcoat_cmo"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)
 
 /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt
 	name = "chief medical officer labcoat"
@@ -64,6 +65,15 @@
 	icon_state = "labcoat_cmoalt_open"
 	icon_open = "labcoat_cmoalt_open"
 	icon_closed = "labcoat_cmoalt"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)
+
+/obj/item/clothing/suit/storage/toggle/labcoat/cmoalt2
+	name = "chief medical officer labcoat"
+	desc = "A labcoat with command gold highlights."
+	icon_state = "labcoat_cmoalt2_open"
+	icon_open = "labcoat_cmoalt2_open"
+	icon_closed = "labcoat_cmoalt2"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)
 
 /obj/item/clothing/suit/storage/toggle/labcoat/mad
 	name = "the mad's labcoat"
@@ -80,6 +90,14 @@
 	icon_open = "labcoat_gen_open"
 	icon_closed = "labcoat_gen"
 
+/obj/item/clothing/suit/storage/toggle/labcoat/medical
+	name = "medical labcoat"
+	desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder."
+	icon_state = "labcoat_med_open"
+	icon_open = "labcoat_med_open"
+	icon_closed = "labcoat_med"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)
+
 /obj/item/clothing/suit/storage/toggle/labcoat/pharmacist
 	name = "pharmacist labcoat"
 	desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has an orange stripe on the shoulder."
@@ -90,12 +108,28 @@
 
 /obj/item/clothing/suit/storage/toggle/labcoat/biochemist
 	name = "biochemist labcoat"
-	desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder."
+	desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a red stripe on the shoulder."
 	icon_state = "labcoat_vir_open"
 	icon_open = "labcoat_vir_open"
 	icon_closed = "labcoat_vir"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)
 
+/obj/item/clothing/suit/storage/toggle/labcoat/psych
+	name = "psychiatrist labcoat"
+	desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a teal stripe on the shoulder."
+	icon_state = "labcoat_psych_open"
+	icon_open = "labcoat_psych_open"
+	icon_closed = "labcoat_psych"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)
+
+/obj/item/clothing/suit/storage/toggle/labcoat/surgeon
+	name = "surgeon labcoat"
+	desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a light blue stripe on the shoulder."
+	icon_state = "labcoat_surgeon_open"
+	icon_open = "labcoat_surgeon_open"
+	icon_closed = "labcoat_surgeon"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)
+
 /obj/item/clothing/suit/storage/toggle/labcoat/science
 	name = "scientist labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder."

code/modules/clothing/under/jobs/engineering.dm

@@ -26,9 +26,18 @@
 	siemens_coefficient = 0.75
 
 /obj/item/clothing/under/rank/roboticist
-	desc = "It's a slimming black jumpsuit with reinforced seams; great for industrial work."
+	desc = "It's a white and purple jumpsuit with reinforced seams; great for industrial work."
 	name = "roboticist's jumpsuit"
 	icon_state = "robotics"
 	item_state = "bl_suit"
 	worn_state = "robotics"
 	siemens_coefficient = 0.75
+
+/obj/item/clothing/under/rank/roboticistalt
+	desc = "It's a slimming black jumpsuit with reinforced seams; great for industrial work."
+	name = "roboticist's jumpsuit"
+	icon_state = "robotics_alt"
+	item_state = "bl_suit"
+	worn_state = "robotics_alt"
+	siemens_coefficient = 0.75
+

code/modules/clothing/under/jobs/medsci.dm

@@ -4,9 +4,9 @@
 /obj/item/clothing/under/rank/research_director
 	desc = "It's a jumpsuit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
 	name = "research director's jumpsuit"
-	icon_state = "director"
+	icon_state = "rd"
 	item_state = "lb_suit"
-	worn_state = "director"
+	worn_state = "rd"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 
 /obj/item/clothing/under/rank/research_director/rdalt
@@ -35,6 +35,24 @@
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
 
+/obj/item/clothing/under/rank/scientist/xenoarcheologist
+	desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
+	name = "xenoarcheologist's jumpsuit"
+	icon_state = "xenoarcheology"
+	item_state = "w_suit"
+	worn_state = "xenoarcheology"
+	permeability_coefficient = 0.50
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
+
+/obj/item/clothing/under/rank/scientist/science_alt
+	desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
+	name = "scientist's uniform"
+	icon_state = "science_alt"
+	item_state = "w_suit"
+	worn_state = "science_alt"
+	permeability_coefficient = 0.50
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
+
 /obj/item/clothing/under/rank/scientist/botany
 	desc = "It's made of a special fiber that provides minor protection against biohazards. Its colour denotes the wearer as a xenobotanist."
 	icon_state = "botany"
@@ -56,6 +74,15 @@
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 
+/obj/item/clothing/under/rank/xenoarcheologist
+	desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a xenoarcheologist."
+	name = "xenoarcheologist's jumpsuit"
+	icon_state = "xenoarcheology"
+	item_state = "w_suit"
+	worn_state = "xenoarcheology"
+	permeability_coefficient = 0.50
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
+
 /*
  * Medical
  */
@@ -223,9 +250,9 @@
 
 /obj/item/clothing/under/rank/biochemist
 	desc = "Made of a special fiber that gives increased protection against biohazards."
-	name = "virologist's jumpsuit"
-	icon_state = "virologist_new"
+	name = "biochemist's jumpsuit"
+	icon_state = "virology"
 	item_state = "w_suit"
-	worn_state = "virologist_new"
+	worn_state = "virology"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)

html/changelogs/furrycactus - medsci sprites.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: Furrycactus, AmoryBlaine
+
+# 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: 
+  - rscadd: "Added the rest of the new MedSci uniform sprites by AmoryBlaine."
+  - rscadd: "Scientists and Xenobiologists have access to an alternate outfit from the loadout."
+  - rscadd: "Added several new coloured labcoats for Medical staff to aid in distinction between roles."
+  - tweak: "Medical has been made green once more."

maps/aurora/aurora-1_centcomm.dmm

@@ -11400,7 +11400,7 @@
 /turf/unsimulated/wall/riveted,
 /area/centcom/control)
 "aAg" = (
-/obj/structure/sign/bluecross{
+/obj/structure/sign/greencross{
 	pixel_y = -32
 	},
 /turf/unsimulated/floor{
@@ -14267,7 +14267,7 @@
 	},
 /area/centcom/holding)
 "aGr" = (
-/obj/structure/sign/bluecross,
+/obj/structure/sign/greencross,
 /turf/unsimulated/wall/riveted,
 /area/centcom/holding)
 "aGs" = (
@@ -17298,7 +17298,7 @@
 	},
 /area/centcom/holding)
 "aMS" = (
-/obj/structure/sign/bluecross,
+/obj/structure/sign/greencross,
 /turf/unsimulated/wall/riveted,
 /area/centcom/spawning)
 "aMT" = (

maps/aurora/aurora-3_sublevel.dmm

@@ -23618,7 +23618,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
 "aWG" = (
-/obj/structure/sign/bluecross{
+/obj/structure/sign/greencross{
 	pixel_y = 32
 	},
 /obj/effect/floor_decal/corner/lime/full{

maps/aurora/aurora-4_mainlevel.dmm

@@ -30222,7 +30222,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/obj/structure/sign/bluecross,
+/obj/structure/sign/greencross,
 /turf/simulated/floor/plating,
 /area/hallway/primary/starboard)
 "baT" = (
@@ -35190,6 +35190,7 @@
 /obj/machinery/camera/network/medbay{
 	c_tag = "Medical - CMO's Office"
 	},
+/obj/item/clothing/suit/storage/toggle/labcoat/cmoalt2,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "bjq" = (
@@ -39748,6 +39749,8 @@
 	},
 /obj/structure/closet/wardrobe/robotics_black,
 /obj/effect/floor_decal/industrial/outline/yellow,
+/obj/item/clothing/under/rank/roboticistalt,
+/obj/item/clothing/under/rank/roboticistalt,
 /turf/simulated/floor/tiled,
 /area/assembly/robotics)
 "bqx" = (
@@ -40451,7 +40454,7 @@
 	dir = 4
 	},
 /obj/structure/window/reinforced,
-/obj/structure/sign/bluecross,
+/obj/structure/sign/greencross,
 /turf/simulated/floor/plating,
 /area/medical/reception)
 "brG" = (
@@ -42834,7 +42837,7 @@
 	dir = 1
 	},
 /obj/structure/window/reinforced,
-/obj/structure/sign/bluecross,
+/obj/structure/sign/greencross,
 /turf/simulated/floor/plating,
 /area/medical/reception)
 "bvh" = (

maps/exodus/exodus-5_asteroid.dmm

@@ -3809,7 +3809,7 @@
 	dir = 5;
 	health = 1e+007
 	},
-/obj/structure/sign/bluecross,
+/obj/structure/sign/greencross,
 /obj/machinery/door/firedoor{
 	dir = 4;
 	name = "Firelock"

maps/space_ruins/derelict.dmm

@@ -2823,7 +2823,7 @@
 /turf/simulated/floor/airless,
 /area/derelict/hallway/southwest)
 "iZ" = (
-/obj/structure/sign/bluecross,
+/obj/structure/sign/greencross,
 /turf/simulated/wall,
 /area/derelict/hallway/southeast)
 "ja" = (
@@ -3518,7 +3518,7 @@
 /turf/simulated/floor/tiled/white,
 /area/derelict/hallway/southeast)
 "li" = (
-/obj/structure/sign/bluecross{
+/obj/structure/sign/greencross{
 	pixel_x = 32
 	},
 /obj/effect/decal/cleanable/dirt,

maps/space_ruins/scrapheap.dmm

@@ -743,7 +743,7 @@
 /turf/simulated/floor/wood,
 /area/derelict/ship)
 "cm" = (
-/obj/structure/sign/bluecross,
+/obj/structure/sign/greencross,
 /turf/simulated/wall/r_wall,
 /area/derelict/ship)
 "cn" = (
@@ -886,6 +886,17 @@
 /obj/effect/decal/cleanable/vomit,
 /turf/simulated/floor/tiled/white,
 /area/derelict/ship)
+"cF" = (
+/turf/simulated/floor,
+/obj/structure/shuttle/engine/propulsion{
+	icon_state = "propulsion";
+	dir = 8
+	},
+/turf/simulated/shuttle/wall/dark{
+	dir = 8;
+	icon_state = "diagonalWall3"
+	},
+/area/derelict/ship)
 "cG" = (
 /obj/effect/floor_decal/corner/green{
 	icon_state = "corner_white";
@@ -3301,7 +3312,6 @@
 	dir = 8
 	},
 /turf/simulated/shuttle/wall/dark{
-	dir = 8;
 	icon_state = "diagonalWall3"
 	},
 /area/derelict/ship)
@@ -13400,16 +13410,6 @@
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/storage/engine_storage)
-"MD" = (
-/turf/simulated/floor,
-/obj/structure/shuttle/engine/propulsion{
-	icon_state = "propulsion";
-	dir = 8
-	},
-/turf/simulated/shuttle/wall/dark{
-	icon_state = "diagonalWall3"
-	},
-/area/derelict/ship)
 "ME" = (
 /turf/simulated/shuttle/wall/dark,
 /area/mine/unexplored)
@@ -72710,13 +72710,13 @@ gh
 gh
 gh
 gh
-jN
+cF
 pN
 pJ
 pJ
 pJ
 pJ
-MD
+jN
 gh
 gh
 gh
@@ -73479,7 +73479,7 @@ ad
 fN
 gh
 pG
-jN
+cF
 pJ
 pK
 kx
@@ -73489,7 +73489,7 @@ kx
 kx
 pU
 pJ
-MD
+jN
 pG
 fN
 ad