diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm index d965a9bbc5d..56dc3110e57 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm @@ -275,6 +275,7 @@ var/new_species = input("Please select a species to emulate.", "Shapeshifter Body") as null|anything in GLOB.playable_species if(new_species) impersonate_bodytype = new_species + species?.base_species = new_species // Really though you better have a species regenerate_icons() //Expensive, but we need to recrunch all the icons we're wearing //// diff --git a/maps/offmap_vr/om_ships/aro3.dmm b/maps/offmap_vr/om_ships/aro3.dmm index 0ecd631c85b..35ee6f007f8 100644 --- a/maps/offmap_vr/om_ships/aro3.dmm +++ b/maps/offmap_vr/om_ships/aro3.dmm @@ -3679,10 +3679,8 @@ /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/repair_bay) "DM" = ( -/obj/structure/closet/walllocker_double/north, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/machinery/gear_dispenser/suit/autolok, +/turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/eva_hall) "DQ" = ( /obj/structure/bed/chair/sofa/black/left{ @@ -4034,11 +4032,9 @@ /turf/simulated/floor/tiled/techmaint, /area/aro3/medical) "Hc" = ( -/obj/structure/closet/autolok_wall{ - pixel_y = 32 - }, +/obj/machinery/gear_dispenser/suit/autolok, /turf/simulated/floor/tiled/eris/dark/danger, -/area/aro3/eva_hall) +/area/aro3/flight_deck) "Hd" = ( /turf/simulated/wall/rpshull, /area/aro3/hallway_starboard) @@ -15373,7 +15369,7 @@ NC Ty To Ur -Ov +Hc Ov HE HE @@ -15470,7 +15466,7 @@ Xv Xj Xj lu -Hc +XF XF kc Nu @@ -16464,7 +16460,7 @@ KB Xj Xj lu -Hc +XF XF kc Nu diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index 14e1bdc9edc..1fee5ae579b 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -290,48 +290,11 @@ /turf/simulated/floor/airless, /area/ship/ert/gunnery) "bI" = ( -/obj/structure/table/rack/steel, /obj/machinery/light/no_nightshift{ dir = 1 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/suit_cooling_unit{ - pixel_x = -10; - pixel_y = -10 - }, -/obj/item/device/suit_cooling_unit{ - pixel_x = -8; - pixel_y = -8 - }, -/obj/item/device/suit_cooling_unit{ - pixel_x = -6; - pixel_y = -6 - }, -/obj/item/device/suit_cooling_unit{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/device/suit_cooling_unit{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/device/suit_cooling_unit{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/device/suit_cooling_unit{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/device/suit_cooling_unit{ - pixel_x = 8; - pixel_y = 8 - }, +/obj/structure/table/rack/steel, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "bJ" = ( @@ -971,6 +934,43 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) +"fJ" = ( +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = -4 + }, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = -2 + }, +/obj/item/weapon/storage/belt/medical/emt, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = 6 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/white_vest, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = 6 + }, +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) "fP" = ( /obj/structure/table/steel_reinforced, /obj/item/rig_module/chem_dispenser/combat, @@ -2359,63 +2359,44 @@ /obj/item/weapon/storage/backpack/ert/engineer{ pixel_y = 3 }, -/obj/item/clothing/suit/space/void/responseteam/engineer{ - pixel_y = -3 +/obj/item/clothing/gloves/yellow{ + pixel_y = 6 }, -/obj/item/clothing/suit/space/void/responseteam/engineer, -/obj/item/clothing/suit/space/void/responseteam/engineer{ - pixel_y = 3 +/obj/item/clothing/gloves/yellow{ + pixel_y = 9 }, -/obj/item/clothing/head/helmet/ert/engineer{ - pixel_y = -3 +/obj/item/clothing/gloves/yellow{ + pixel_y = 12 }, -/obj/item/clothing/head/helmet/ert/engineer, -/obj/item/clothing/head/helmet/ert/engineer{ - pixel_y = 3 +/obj/item/weapon/storage/backpack/ert/engineer{ + pixel_y = 6 }, -/obj/item/clothing/suit/armor/vest/ert/engineer{ - pixel_y = -3 +/obj/item/weapon/storage/backpack/ert/engineer{ + pixel_y = 9 }, -/obj/item/clothing/suit/armor/vest/ert/engineer, -/obj/item/clothing/suit/armor/vest/ert/engineer{ - pixel_y = 3 +/obj/item/weapon/storage/backpack/ert/engineer{ + pixel_y = 12 }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "pa" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/belt/medical/emt{ - pixel_y = -4 +/obj/item/device/mapping_unit/ert{ + pixel_x = -6; + pixel_y = -6 }, -/obj/item/weapon/storage/belt/medical/emt{ - pixel_y = -2 - }, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt{ - pixel_y = 2 - }, -/obj/item/weapon/storage/belt/medical/emt{ - pixel_y = 4 - }, -/obj/item/weapon/storage/belt/medical/emt{ +/obj/item/device/mapping_unit/ert{ + pixel_x = 6; pixel_y = 6 }, -/obj/item/clothing/accessory/storage/white_vest{ - pixel_y = -4 - }, -/obj/item/clothing/accessory/storage/white_vest{ - pixel_y = -2 - }, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest{ - pixel_y = 2 - }, -/obj/item/clothing/accessory/storage/white_vest{ - pixel_y = 4 - }, -/obj/item/clothing/accessory/storage/white_vest{ +/obj/item/device/mapping_unit/ert{ + pixel_x = -6; pixel_y = 6 }, +/obj/item/device/mapping_unit/ert{ + pixel_x = 6; + pixel_y = -6 + }, /obj/machinery/alarm/alarms_hidden{ dir = 1; pixel_y = -26 @@ -2440,29 +2421,17 @@ /obj/item/weapon/storage/backpack/ert/medical{ pixel_y = 3 }, -/obj/item/clothing/suit/space/void/responseteam/medical{ - pixel_y = -3 - }, -/obj/item/clothing/suit/space/void/responseteam/medical, -/obj/item/clothing/suit/space/void/responseteam/medical{ - pixel_y = 3 - }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/clothing/head/helmet/ert/medical{ - pixel_y = -3 - }, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical{ - pixel_y = 3 - }, -/obj/item/clothing/suit/armor/vest/ert/medical{ - pixel_y = -3 - }, -/obj/item/clothing/suit/armor/vest/ert/medical, -/obj/item/clothing/suit/armor/vest/ert/medical{ - pixel_y = 3 - }, /obj/machinery/light/no_nightshift, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 6 + }, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 9 + }, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 12 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "pf" = ( @@ -2482,35 +2451,21 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) "pn" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/storage/backpack/ert/medical{ - pixel_y = -3 - }, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical{ - pixel_y = 3 - }, -/obj/item/clothing/suit/space/void/responseteam/medical{ - pixel_y = -3 - }, -/obj/item/clothing/suit/space/void/responseteam/medical, -/obj/item/clothing/suit/space/void/responseteam/medical{ - pixel_y = 3 - }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/clothing/head/helmet/ert/medical{ - pixel_y = -3 +/obj/structure/table/rack/steel, +/obj/structure/table/rack/steel, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = -2 }, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical{ - pixel_y = 3 +/obj/item/weapon/storage/belt/utility/chief/full, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = 2 }, -/obj/item/clothing/suit/armor/vest/ert/medical{ - pixel_y = -3 +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = 4 }, -/obj/item/clothing/suit/armor/vest/ert/medical, -/obj/item/clothing/suit/armor/vest/ert/medical{ - pixel_y = 3 +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = 6 }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -2804,40 +2759,6 @@ /obj/item/weapon/tool/crowbar, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) -"qa" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/rig/ert/security{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/weapon/rig/ert/security{ - pixel_x = 4; - pixel_y = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/mech_bay) -"qd" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/rig/ert/engineer{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/weapon/rig/ert/engineer{ - pixel_x = 4; - pixel_y = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/mech_bay) "ql" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -2850,20 +2771,6 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) "qo" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/rig/ert/medical{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/weapon/rig/ert/medical{ - pixel_x = 4; - pixel_y = 4 - }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "qt" = ( @@ -3094,36 +3001,24 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "so" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/storage/backpack/ert/security{ - pixel_y = -3 - }, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security{ - pixel_y = 3 - }, -/obj/item/clothing/suit/space/void/responseteam/security{ - pixel_y = -3 - }, -/obj/item/clothing/suit/space/void/responseteam/security, -/obj/item/clothing/suit/space/void/responseteam/security{ - pixel_y = 3 - }, /obj/machinery/light/no_nightshift, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/clothing/head/helmet/ert/security{ - pixel_y = -3 +/obj/structure/table/rack/steel, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = -4 }, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security{ - pixel_y = 3 +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = -2 }, -/obj/item/clothing/suit/armor/vest/ert/security{ - pixel_y = -3 +/obj/item/clothing/accessory/storage/brown_vest, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = 2 }, -/obj/item/clothing/suit/armor/vest/ert/security, -/obj/item/clothing/suit/armor/vest/ert/security{ - pixel_y = 3 +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = 6 }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -3926,29 +3821,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "xA" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/shoes/magboots/adv{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/clothing/shoes/magboots/adv{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/clothing/shoes/magboots/adv, -/obj/item/clothing/shoes/magboots/adv{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/clothing/shoes/magboots/adv{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/shoes/magboots/adv{ - pixel_x = 6; - pixel_y = 6 - }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/gear_dispenser/suit/ert, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "xC" = ( @@ -4223,6 +4097,9 @@ /obj/item/modular_computer/console/preset/engineering{ dir = 4 }, +/obj/structure/panic_button{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) "zh" = ( @@ -4908,27 +4785,15 @@ /obj/item/weapon/storage/backpack/ert/security{ pixel_y = 3 }, -/obj/item/clothing/suit/space/void/responseteam/security{ - pixel_y = -3 - }, -/obj/item/clothing/suit/space/void/responseteam/security, -/obj/item/clothing/suit/space/void/responseteam/security{ - pixel_y = 3 - }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/clothing/head/helmet/ert/security{ - pixel_y = -3 +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = 6 }, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security{ - pixel_y = 3 +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = 9 }, -/obj/item/clothing/suit/armor/vest/ert/security{ - pixel_y = -3 - }, -/obj/item/clothing/suit/armor/vest/ert/security, -/obj/item/clothing/suit/armor/vest/ert/security{ - pixel_y = 3 +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = 12 }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -6549,38 +6414,22 @@ /area/shuttle/ert_ship_boat) "MX" = ( /obj/structure/table/steel_reinforced, -/obj/item/clothing/accessory/storage/brown_vest{ - pixel_y = -4 +/obj/item/device/mapping_unit/ert{ + pixel_x = -6; + pixel_y = -6 }, -/obj/item/clothing/accessory/storage/brown_vest{ - pixel_y = -2 - }, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest{ - pixel_y = 2 - }, -/obj/item/clothing/accessory/storage/brown_vest{ - pixel_y = 4 - }, -/obj/item/clothing/accessory/storage/brown_vest{ +/obj/item/device/mapping_unit/ert{ + pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/storage/belt/utility/chief/full{ - pixel_y = -4 - }, -/obj/item/weapon/storage/belt/utility/chief/full{ - pixel_y = -2 - }, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full{ - pixel_y = 2 - }, -/obj/item/weapon/storage/belt/utility/chief/full{ - pixel_y = 4 - }, -/obj/item/weapon/storage/belt/utility/chief/full{ +/obj/item/device/mapping_unit/ert{ + pixel_x = -6; pixel_y = 6 }, +/obj/item/device/mapping_unit/ert{ + pixel_x = 6; + pixel_y = -6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "MZ" = ( @@ -19400,7 +19249,7 @@ WH eX iX mT -oX +pn tH xi BF @@ -19826,7 +19675,7 @@ do do ip mV -pn +fJ tH xv Ce @@ -21104,7 +20953,7 @@ Cx fP jU nt -qa +qo tX yx WC @@ -21246,7 +21095,7 @@ Cx fU jY nv -qd +qo tX xO WC