From cfefb1098e7873290972e699093248e40125fc55 Mon Sep 17 00:00:00 2001 From: Casey Date: Mon, 7 Feb 2022 18:16:31 -0500 Subject: [PATCH] Hastily gives the ERT their suits back --- code/datums/uplink/tools_vr.dm | 5 + maps/submaps/admin_use_vr/ert.dmm | 469 ++++++++++++++++++------------ 2 files changed, 296 insertions(+), 178 deletions(-) diff --git a/code/datums/uplink/tools_vr.dm b/code/datums/uplink/tools_vr.dm index abc4d481bf..1cf66457d0 100644 --- a/code/datums/uplink/tools_vr.dm +++ b/code/datums/uplink/tools_vr.dm @@ -73,6 +73,11 @@ item_cost = 15 path = /obj/fiftyspawner/glass +/datum/uplink_item/item/tools/holdingpouch + name = "Pouch of Holding" + item_cost = 20 + path = /obj/item/weapon/storage/pouch/holding + /datum/uplink_item/item/tools/elitelaptop name = "Laptop (Advanced)" item_cost = 20 diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index 4ca29b7a96..d9243d3bd4 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -119,7 +119,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "aq" = ( -/obj/machinery/telecomms/relay/preset/station, +/obj/machinery/telecomms/relay, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) "ar" = ( @@ -184,16 +184,187 @@ }, /turf/simulated/floor/wood, /area/ship/ert/commander) +"au" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/table/rack/steel, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) "av" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/gunnery) +"aw" = ( +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/mask/gas{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/mask/gas{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) "ax" = ( /obj/structure/hull_corner{ dir = 8 }, /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/ert_ship_boat) +"ay" = ( +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/mask/gas{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/mask/gas{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"az" = ( +/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/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = 6 + }, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = 9 + }, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = 12 + }, +/obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/clothing/suit/space/void/responseteam/security, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"aA" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"aB" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/table/rack/steel, +/obj/structure/table/rack/steel, +/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{ + pixel_y = 6 + }, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/storage/belt/utility/holding, +/obj/item/weapon/storage/belt/utility/holding, +/obj/item/weapon/storage/belt/utility/holding, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) "aC" = ( /obj/machinery/pointdefense{ id_tag = "vonbraun_pd" @@ -210,10 +381,104 @@ /obj/fiftyspawner/tritium, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) +"aE" = ( +/obj/machinery/alarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/obj/structure/table/rack/steel, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) "aF" = ( /obj/machinery/porta_turret/stationary/CIWS, /turf/simulated/floor/reinforced/airless, /area/ship/ert/atmos) +"aG" = ( +/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/effect/floor_decal/industrial/outline/grey, +/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 + }, +/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"aH" = ( +/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, +/obj/item/weapon/storage/belt/medical/holding, +/obj/item/weapon/storage/belt/medical/holding, +/obj/item/weapon/storage/belt/medical/holding, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) "aI" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -233,6 +498,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) +"aJ" = ( +/obj/item/device/multitool/tether_buffered, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) "aK" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -318,6 +587,7 @@ /obj/structure/window/reinforced, /turf/simulated/floor/airless, /area/ship/ert/gunnery) +<<<<<<< HEAD "bI" = ( /obj/machinery/light/no_nightshift{ dir = 1 @@ -326,6 +596,8 @@ /obj/structure/table/rack/steel, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) +======= +>>>>>>> 7f76eb5c10d... Merge pull request #12174 from Novacat/nova-basicfixes "bJ" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8 @@ -494,32 +766,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) -"do" = ( -/obj/structure/table/rack/steel, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/clothing/mask/gas{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/clothing/mask/gas{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/clothing/mask/gas{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/mask/gas{ - pixel_x = 6; - pixel_y = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) "dp" = ( /obj/structure/table/rack/steel, /obj/item/weapon/rig/ert/assetprotection{ @@ -973,43 +1219,6 @@ }, /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, @@ -2460,30 +2669,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) -"pa" = ( -/obj/structure/table/steel_reinforced, -/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/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 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) "pb" = ( /obj/structure/medical_stand, /obj/structure/sink{ @@ -2493,28 +2678,6 @@ }, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) -"pd" = ( -/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/effect/floor_decal/industrial/outline/grey, -/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" = ( /obj/effect/landmark/map_data/ert_ship, /turf/space, @@ -2531,25 +2694,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) -"pn" = ( -/obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/table/rack/steel, -/obj/structure/table/rack/steel, -/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{ - pixel_y = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) "po" = ( /obj/machinery/door/airlock/glass_medical{ name = "Medical Bay"; @@ -4863,27 +5007,6 @@ "DS" = ( /turf/simulated/wall/rshull, /area/ship/ert/hallways_aft) -"Ec" = ( -/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/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/backpack/ert/security{ - pixel_y = 6 - }, -/obj/item/weapon/storage/backpack/ert/security{ - pixel_y = 9 - }, -/obj/item/weapon/storage/backpack/ert/security{ - pixel_y = 12 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) "Ed" = ( /obj/machinery/light/no_nightshift{ dir = 4 @@ -6523,26 +6646,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled/techmaint, /area/shuttle/ert_ship_boat) -"MX" = ( -/obj/structure/table/steel_reinforced, -/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/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" = ( /turf/simulated/wall/rshull, /area/ship/ert/med_surg) @@ -14689,7 +14792,7 @@ kP kP rS aq -gA +aJ CT qR pV @@ -18804,7 +18907,7 @@ xA xA Jd mF -Ec +az tH gx SF @@ -19088,7 +19191,7 @@ WH Rw Jd mF -MX +aA tH xg SF @@ -19372,7 +19475,7 @@ WH eX iX mT -pn +aB tH xi BF @@ -19514,7 +19617,7 @@ WH ff ip mV -pa +aE tH qJ BU @@ -19650,6 +19753,7 @@ yz yz yz ab +<<<<<<< HEAD Zo bI WH @@ -19657,6 +19761,15 @@ WH ip mV pd +======= +nq +au +Wo +Wo +AX +eG +aG +>>>>>>> 7f76eb5c10d... Merge pull request #12174 from Novacat/nova-basicfixes tH xt BU @@ -19794,11 +19907,11 @@ yz cu Zo Zo -do -do +aw +ay ip mV -fJ +aH tH xv Ce