diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 827a783e851..132af470ecd 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -306,17 +306,6 @@ }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) -"adT" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack_nw"; - name = "northwest of SS13"; - width = 19 - }, -/turf/space, -/area/space) "adZ" = ( /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, @@ -2359,17 +2348,6 @@ icon_state = "redfull" }, /area/maintenance/fore2) -"aoP" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack_ne"; - name = "northeast of SS13"; - width = 19 - }, -/turf/space, -/area/space) "aoR" = ( /obj/machinery/light/small{ dir = 8 @@ -90513,28 +90491,6 @@ icon_state = "solarpanel" }, /area/maintenance/portsolar) -"dWd" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack_sw"; - name = "southwest of SS13"; - width = 19 - }, -/turf/space, -/area/space) -"dWe" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack_se"; - name = "southeast of SS13"; - width = 19 - }, -/turf/space, -/area/space) "dWf" = ( /obj/docking_port/stationary{ dheight = 9; @@ -113144,7 +113100,7 @@ aaa aaa aaa aaa -dWd +aaa aaa aaa aaa @@ -116807,7 +116763,7 @@ aaa aaa aaa aaa -adT +aaa aaa aaa aaa @@ -152813,7 +152769,7 @@ aaa aaa aaa aaa -aoP +aaa aaa aaa aaa @@ -153238,7 +153194,7 @@ aaa aaa aaa aaa -dWe +aaa aaa aaa aaa @@ -159740,7 +159696,7 @@ aaa aaa aaa aaa -aoP +aaa aaa aaa aaa diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index f94ebfab1e5..2e19e9e2641 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -396,17 +396,6 @@ /obj/machinery/power/tracker, /turf/simulated/floor/plating/airless, /area/solar/auxstarboard) -"acy" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack_nw"; - name = "northwest of SS13"; - width = 19 - }, -/turf/space, -/area/space) "acz" = ( /obj/structure/lattice/catwalk, /obj/effect/landmark/spawner/xeno, @@ -966,17 +955,6 @@ icon_state = "whitered" }, /area/security/permabrig) -"adN" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack_ne"; - name = "northeast of SS13"; - width = 19 - }, -/turf/space, -/area/space) "adP" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -73565,17 +73543,6 @@ icon_state = "solarpanel" }, /area/solar/starboard) -"ddv" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack_se"; - name = "southeast of SS13"; - width = 19 - }, -/turf/space, -/area/space) "ddw" = ( /obj/structure/lattice/catwalk, /obj/effect/landmark/spawner/xeno, @@ -94337,7 +94304,7 @@ aaa aaa aaa aaa -acy +aaa aaa aaa aaa @@ -122753,7 +122720,7 @@ aaa aaa aaa aaa -ddv +aaa aaa aaa aaa @@ -132633,7 +132600,7 @@ aaa aaa aaa aaa -adN +aaa aaa aaa aaa diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 8a7cdb3ecea..e0a93fca71b 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -1385,17 +1385,6 @@ /obj/structure/grille, /turf/simulated/floor/plating/airless, /area/space/nearstation) -"agd" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack_ne"; - name = "northeast of SS13"; - width = 19 - }, -/turf/space, -/area/space) "agk" = ( /obj/structure/cable{ d1 = 1; @@ -140089,7 +140078,7 @@ aaa aaa aaa aaa -agd +aaa aaa aaa aaa diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index d432358fe0a..815dfb1d32c 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -95,9 +95,6 @@ "at" = ( /turf/simulated/wall/indestructible/riveted, /area/vox_station) -"au" = ( -/turf/simulated/floor/plasteel/dark/nitrogen, -/area/vox_station) "av" = ( /obj/structure/table/holotable/wood, /obj/effect/decal/cleanable/dirt, @@ -111,12 +108,6 @@ name = "Holodeck Projector Floor" }, /area/holodeck/source_wildlife) -"ay" = ( -/obj/machinery/vox_win_button, -/turf/simulated/floor/plasteel/dark/nitrogen{ - icon_state = "light_on" - }, -/area/vox_station) "az" = ( /turf/simulated/floor/holofloor{ icon_state = "engine"; @@ -159,18 +150,6 @@ /obj/structure/flora/ausbushes/grassybush, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) -"aI" = ( -/obj/machinery/door/airlock/centcom, -/turf/simulated/floor/plasteel/dark/nitrogen, -/area/vox_station) -"aJ" = ( -/obj/structure/girder/displaced, -/turf/simulated/floor/plasteel/dark/nitrogen, -/area/vox_station) -"aK" = ( -/obj/structure/closet/crate, -/turf/simulated/floor/plasteel/dark/nitrogen, -/area/vox_station) "aL" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor{ @@ -251,23 +230,6 @@ /obj/machinery/computer/shuttle/ert, /turf/simulated/floor/plasteel/grimy, /area/centcom/specops) -"bh" = ( -/obj/structure/kitchenspike, -/turf/simulated/floor/plasteel/dark/nitrogen, -/area/vox_station) -"bi" = ( -/obj/structure/table/wood, -/turf/simulated/floor/plasteel/dark/nitrogen, -/area/vox_station) -"bk" = ( -/obj/machinery/door/airlock/centcom{ - opacity = 1 - }, -/turf/simulated/floor/plasteel/dark/nitrogen, -/area/vox_station) -"bl" = ( -/turf/simulated/floor/plating/nitrogen, -/area/vox_station) "bo" = ( /turf/simulated/floor/holofloor{ dir = 4; @@ -704,17 +666,6 @@ icon_state = "snow" }, /area/holodeck/source_snowfield) -"do" = ( -/obj/machinery/door/airlock/hatch{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "vox_southeast_lock"; - locked = 1; - req_access_txt = "152"; - req_one_access = null - }, -/turf/simulated/floor/plating/nitrogen, -/area/shuttle/vox) "dp" = ( /turf/simulated/floor/holofloor{ icon_state = "red" @@ -1746,17 +1697,6 @@ /obj/machinery/vending/syndicigs, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) -"gZ" = ( -/obj/docking_port/stationary/transit{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack_transit"; - name = "skipjack in transit"; - width = 19 - }, -/turf/space/transit, -/area/space) "ha" = ( /obj/docking_port/stationary/transit{ dheight = 9; @@ -1844,10 +1784,6 @@ /obj/item/disk/plantgene, /turf/simulated/floor/plating/asteroid/snow/airless, /area/syndicate_mothership) -"ht" = ( -/obj/structure/rack, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "hv" = ( /turf/simulated/floor/beach/away/water, /area/ninja/holding) @@ -1918,15 +1854,6 @@ /obj/item/storage/fancy/crayons, /turf/simulated/floor/plasteel/freezer, /area/syndicate_mothership) -"hR" = ( -/obj/machinery/bodyscanner, -/obj/machinery/light/spot, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) -"hU" = ( -/obj/structure/AIcore, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "hV" = ( /turf/simulated/floor/mineral/titanium, /area/shuttle/trade/sol) @@ -3303,15 +3230,6 @@ icon_state = "bar" }, /area/centcom/control) -"mE" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/pickaxe, -/obj/item/storage/firstaid/toxin, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "mF" = ( /obj/machinery/light/spot, /obj/structure/chair{ @@ -3343,13 +3261,6 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/centcom/control) -"mJ" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/item/clothing/mask/breath, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "mK" = ( /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/grass, @@ -4397,11 +4308,6 @@ icon_state = "red" }, /area/holodeck/source_thunderdomecourt) -"qi" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/machinery/light/spot, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "qk" = ( /obj/item/gun/projectile/automatic/pistol/m1911, /obj/item/ammo_box/magazine/m45, @@ -7019,9 +6925,6 @@ "xQ" = ( /turf/simulated/wall/indestructible/fakeglass, /area/trader_station/sol) -"xR" = ( -/turf/simulated/wall/indestructible/fakeglass, -/area/vox_station) "xU" = ( /obj/machinery/computer/crew, /turf/simulated/floor/plasteel, @@ -7443,12 +7346,6 @@ /obj/item/flash, /turf/simulated/floor/mineral/plastitanium/red, /area/centcom/evac) -"zy" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen, -/turf/simulated/floor/plasteel, -/area/trader_station/sol) "zz" = ( /obj/structure/ninjatele{ pixel_x = -28 @@ -7468,17 +7365,6 @@ /obj/effect/landmark/spawner/soltrader, /turf/simulated/floor/plasteel, /area/trader_station/sol) -"zG" = ( -/obj/machinery/door/airlock/hatch{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "vox_northwest_lock"; - locked = 1; - req_access_txt = "152"; - req_one_access = null - }, -/turf/simulated/floor/plating/nitrogen, -/area/shuttle/vox) "zH" = ( /obj/machinery/vending/cola, /turf/simulated/floor/mineral/titanium/blue, @@ -7540,34 +7426,6 @@ }, /turf/simulated/floor/plasteel, /area/trader_station/sol) -"zT" = ( -/obj/machinery/door/airlock/hatch{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "vox_northeast_lock"; - locked = 1; - req_access_txt = "152"; - req_one_access = null - }, -/obj/docking_port/mobile{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack"; - name = "Vox Skipjack"; - roundstart_move = null; - width = 19 - }, -/obj/docking_port/stationary{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack_away"; - name = "vox bay 1"; - width = 19 - }, -/turf/simulated/floor/plating/nitrogen, -/area/shuttle/vox) "zU" = ( /obj/machinery/door/window/southleft{ name = "Cell B"; @@ -8270,15 +8128,6 @@ icon_state = "red" }, /area/holodeck/source_thunderdomecourt) -"Cw" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1331; - master_tag = "vox_west_control"; - req_one_access_txt = "152" - }, -/turf/simulated/wall/mineral/plastitanium, -/area/shuttle/vox) "Cz" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -8318,11 +8167,6 @@ icon_state = "green" }, /area/holodeck/source_boxingcourt) -"CT" = ( -/obj/item/clothing/head/bearpelt, -/obj/item/xenos_claw, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "CV" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/latex/nitrile, @@ -8331,17 +8175,6 @@ icon_state = "cmo" }, /area/shuttle/escape) -"CX" = ( -/obj/machinery/door/airlock/hatch{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "vox_southwest_lock"; - locked = 1; - req_access_txt = "152"; - req_one_access = null - }, -/turf/simulated/floor/plating/nitrogen, -/area/shuttle/vox) "De" = ( /obj/effect/landmark/spawner/nuclear_bomb, /obj/machinery/light/spot, @@ -8421,14 +8254,6 @@ "DC" = ( /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) -"DE" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/suit/space/vox/stealth, -/obj/item/clothing/head/helmet/space/vox/stealth, -/obj/item/clothing/mask/breath, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "DF" = ( /obj/structure/table, /obj/item/bonegel, @@ -8497,10 +8322,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) -"DZ" = ( -/obj/machinery/portable_atmospherics/canister/toxins, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Ea" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 28 @@ -8514,10 +8335,6 @@ icon_state = "whiteblue" }, /area/shuttle/escape) -"Ed" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/vox, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Ef" = ( /turf/simulated/floor/plasteel{ icon_state = "white" @@ -8670,9 +8487,6 @@ icon_state = "bot" }, /area/shuttle/escape) -"EW" = ( -/turf/simulated/floor/plating/nitrogen, -/area/shuttle/vox) "EX" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, @@ -8740,10 +8554,6 @@ }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/trade/sol) -"Fi" = ( -/obj/effect/spawner/window/plastitanium, -/turf/simulated/floor/plating/nitrogen, -/area/shuttle/vox) "Fk" = ( /obj/structure/chair/comfy/shuttle, /turf/simulated/floor/plasteel{ @@ -8751,18 +8561,6 @@ icon_state = "bot" }, /area/shuttle/escape) -"Fm" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/effect/spawner/window/plastitanium, -/turf/simulated/floor/plating/nitrogen, -/area/shuttle/vox) "Fo" = ( /obj/structure/closet/crate/internals, /obj/item/tank/internals/oxygen/red, @@ -8786,23 +8584,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/escape) -"Fq" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/machinery/recharger, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) -"Fr" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/weed_extract, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Ft" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; @@ -8810,10 +8591,6 @@ }, /turf/simulated/floor/plating/airless, /area/shuttle/specops) -"Fu" = ( -/obj/machinery/light/spot, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Fx" = ( /obj/structure/table/holotable, /turf/simulated/floor/holofloor{ @@ -8866,13 +8643,6 @@ /obj/machinery/light, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) -"FO" = ( -/obj/item/stack/spacecash/c50, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "FP" = ( /obj/structure/table, /obj/item/screwdriver{ @@ -8927,10 +8697,6 @@ icon_state = "asteroid11" }, /area/holodeck/source_desert) -"Gi" = ( -/obj/item/skeleton/r_arm, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Gn" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; @@ -8994,14 +8760,6 @@ icon_state = "cmo" }, /area/shuttle/escape) -"GQ" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/optable, -/obj/item/organ/internal/brain, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "GU" = ( /turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) @@ -9375,12 +9133,6 @@ /obj/item/clothing/gloves/color/latex/nitrile, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) -"IX" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "152" - }, -/turf/simulated/floor/plating/nitrogen, -/area/shuttle/vox) "IZ" = ( /obj/structure/table, /obj/item/storage/lockbox/mindshield, @@ -9427,14 +9179,6 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) -"Jv" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/suit/space/vox/pressure, -/obj/item/clothing/head/helmet/space/vox/pressure, -/obj/item/clothing/mask/breath, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Jw" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -9446,12 +9190,6 @@ icon_state = "cmo" }, /area/shuttle/escape) -"Jz" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "JC" = ( /obj/structure/chair/stool, /obj/item/clothing/head/bandana{ @@ -9464,12 +9202,6 @@ /obj/structure/chair/stool, /turf/simulated/floor/beach/away/sand, /area/ninja/holding) -"JE" = ( -/obj/machinery/sleeper/upgraded{ - dir = 4 - }, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "JH" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sit{ dir = 1 @@ -9521,11 +9253,6 @@ "Kp" = ( /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/trade/sol) -"Kq" = ( -/obj/structure/chair/comfy/red, -/obj/effect/landmark/spawner/raider_spawn, -/turf/simulated/floor/plasteel/dark/nitrogen, -/area/vox_station) "Kr" = ( /obj/structure/table, /obj/item/aicard, @@ -9536,11 +9263,6 @@ /obj/machinery/chem_dispenser/beer, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) -"Kv" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/spawner/raider_spawn, -/turf/simulated/floor/plasteel/dark/nitrogen, -/area/vox_station) "Kw" = ( /obj/structure/table, /obj/machinery/recharger, @@ -9570,18 +9292,6 @@ /obj/machinery/kitchen_machine/microwave, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) -"KC" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1331; - master_tag = "vox_east_control"; - req_one_access_txt = "152" - }, -/turf/simulated/wall/mineral/plastitanium, -/area/shuttle/vox) -"KD" = ( -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "KF" = ( /obj/item/radio/intercom{ dir = 8; @@ -9631,10 +9341,6 @@ /obj/structure/chair/comfy/shuttle, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/specops) -"KO" = ( -/obj/item/storage/box/zipties, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "KQ" = ( /obj/structure/chair/comfy/shuttle, /turf/simulated/floor/mineral/plastitanium/red, @@ -9652,10 +9358,6 @@ /obj/structure/table, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) -"KT" = ( -/obj/item/storage/toolbox/syndicate, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "KW" = ( /obj/machinery/light/small{ dir = 1 @@ -9720,17 +9422,6 @@ icon_state = "green" }, /area/holodeck/source_emptycourt) -"Lm" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/effect/spawner/window/plastitanium, -/turf/simulated/floor/plating/nitrogen, -/area/shuttle/vox) "Ln" = ( /obj/machinery/door/airlock/titanium/glass{ name = "trader shuttle airlock"; @@ -9843,14 +9534,6 @@ icon_state = "bot" }, /area/shuttle/escape) -"Mf" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/suit/space/vox/medic, -/obj/item/clothing/head/helmet/space/vox/medic, -/obj/item/clothing/mask/breath, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Mi" = ( /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate_sit) @@ -9897,16 +9580,6 @@ "Mu" = ( /turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/shuttle/syndicate) -"Mw" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/scalpel, -/obj/item/stack/cable_coil, -/obj/item/storage/firstaid/regular, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "My" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/extinguisher_cabinet{ @@ -9957,14 +9630,6 @@ }, /turf/simulated/floor/plasteel, /area/shuttle/escape) -"MN" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/circular_saw, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "MP" = ( /obj/machinery/door/airlock/titanium/glass{ name = "Shuttle Cargo Hatch" @@ -9990,11 +9655,6 @@ }, /turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) -"MY" = ( -/obj/item/tank/internals/emergency_oxygen, -/obj/item/clothing/mask/breath, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "MZ" = ( /obj/machinery/light/spot, /obj/structure/chair/comfy/shuttle{ @@ -10032,14 +9692,6 @@ icon_state = "darkblue" }, /area/shuttle/escape) -"No" = ( -/obj/structure/rack, -/obj/item/rcd, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Nr" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/mineral/plastitanium/red, @@ -10072,12 +9724,6 @@ icon_state = "neutralcorner" }, /area/shuttle/escape) -"NB" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/plating/nitrogen, -/area/shuttle/vox) "NC" = ( /obj/item/ashtray/glass, /obj/structure/table, @@ -10091,14 +9737,6 @@ icon_state = "redcorner" }, /area/shuttle/escape) -"NE" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/suit/space/vox/carapace, -/obj/item/clothing/head/helmet/space/vox/carapace, -/obj/item/clothing/mask/breath, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "NF" = ( /obj/machinery/bsa/full/admin/east, /obj/effect/decal/warning_stripes/north, @@ -10128,18 +9766,6 @@ /obj/item/storage/box/syndidonkpockets, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) -"NN" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 8; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/effect/spawner/window/plastitanium, -/turf/simulated/floor/plating/nitrogen, -/area/shuttle/vox) "NP" = ( /obj/structure/window/reinforced{ dir = 4 @@ -10263,15 +9889,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/shuttle/escape) -"OB" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1331; - master_tag = "vox_west_control"; - req_one_access_txt = "152" - }, -/turf/simulated/wall/mineral/plastitanium, -/area/shuttle/vox) "OE" = ( /obj/structure/closet/syndicate/personal, /turf/simulated/floor/mineral/plastitanium/red, @@ -10283,10 +9900,6 @@ }, /turf/simulated/floor/plating/airless, /area/shuttle/trade/sol) -"OG" = ( -/obj/item/broken_bottle, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "OJ" = ( /obj/machinery/light, /obj/structure/chair/comfy/shuttle{ @@ -10355,15 +9968,6 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) -"Po" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/broken_device, -/obj/item/robot_parts/chest, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Pq" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -10392,32 +9996,6 @@ /obj/item/multitool, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) -"PF" = ( -/obj/structure/rack, -/obj/item/pneumatic_cannon, -/obj/item/harpoon, -/obj/item/harpoon, -/obj/item/harpoon, -/obj/item/harpoon, -/obj/item/tank/internals/nitrogen, -/obj/machinery/light/spot{ - dir = 4 - }, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) -"PG" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1331; - id_tag = "vox_west_control"; - pixel_x = 24; - req_access_txt = "152"; - tag_airpump = "vox_west_vent"; - tag_chamber_sensor = "vox_west_sensor"; - tag_exterior_door = "vox_northwest_lock"; - tag_interior_door = "vox_southwest_lock" - }, -/turf/simulated/floor/plating/nitrogen, -/area/shuttle/vox) "PJ" = ( /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, @@ -10501,16 +10079,6 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate_elite) -"Qh" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/mob/living/simple_animal/bot/floorbot{ - on = 0 - }, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Qm" = ( /obj/machinery/door/window{ dir = 8; @@ -10729,11 +10297,6 @@ "Rp" = ( /turf/simulated/wall/mineral/plastitanium, /area/shuttle/administration) -"Rq" = ( -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c500, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Rs" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -10751,19 +10314,6 @@ icon_state = "dark" }, /area/shuttle/escape) -"Rx" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1331; - id_tag = "vox_east_control"; - pixel_x = -24; - req_access_txt = "152"; - tag_airpump = "vox_east_vent"; - tag_chamber_sensor = "vox_east_sensor"; - tag_exterior_door = "vox_northeast_lock"; - tag_interior_door = "vox_southeast_lock" - }, -/turf/simulated/floor/plating/nitrogen, -/area/shuttle/vox) "Ry" = ( /obj/machinery/bodyscanner, /turf/simulated/floor/mineral/titanium, @@ -10849,12 +10399,6 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) -"Sl" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Sn" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -10901,10 +10445,6 @@ }, /turf/simulated/wall/mineral/plastitanium, /area/shuttle/syndicate) -"SA" = ( -/obj/machinery/computer/shuttle/vox, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "SB" = ( /obj/structure/table, /obj/item/wrench, @@ -11046,19 +10586,6 @@ /obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/shuttle/transport) -"TD" = ( -/turf/simulated/wall/mineral/plastitanium, -/area/shuttle/vox) -"TE" = ( -/obj/structure/rack, -/obj/item/tank/internals/nitrogen, -/obj/item/tank/internals/nitrogen, -/obj/item/tank/internals/nitrogen, -/obj/item/tank/internals/nitrogen, -/obj/item/tank/internals/nitrogen, -/obj/item/tank/internals/nitrogen, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "TF" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; @@ -11304,6 +10831,15 @@ icon_state = "bot" }, /area/shuttle/escape) +"Vf" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/trader_station/sol) "Vi" = ( /obj/structure/shuttle/engine/propulsion{ dir = 1; @@ -11314,12 +10850,6 @@ "Vj" = ( /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) -"Vk" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "152" - }, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Vm" = ( /obj/structure/table/wood, /obj/item/storage/box/donkpockets, @@ -11354,10 +10884,6 @@ icon_state = "dark" }, /area/shuttle/escape) -"Vw" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "VA" = ( /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel/dark, @@ -11392,12 +10918,6 @@ /obj/structure/chair, /turf/simulated/floor/plasteel, /area/centcom/evac) -"VK" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "propulsion_l" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/vox) "VN" = ( /turf/simulated/wall/mineral/titanium, /area/shuttle/trade/sol) @@ -11443,13 +10963,6 @@ /obj/structure/bed, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) -"Wb" = ( -/obj/item/clothing/head/collectable/petehat{ - desc = "It smells faintly of reptile."; - name = "fancy leader hat" - }, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Wc" = ( /obj/machinery/computer/shuttle/admin{ dir = 8; @@ -11520,13 +11033,6 @@ /obj/structure/chair/comfy/shuttle, /turf/simulated/floor/mineral/titanium, /area/shuttle/transport) -"Wt" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/vox) "Wz" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/mineral/plastitanium/red, @@ -11684,16 +11190,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/syndicate_sit) -"Xw" = ( -/obj/structure/rack, -/obj/item/gun/dartgun/vox/raider, -/obj/item/gun/dartgun/vox/medical, -/obj/item/dart_cartridge, -/obj/item/dart_cartridge, -/obj/item/dart_cartridge, -/obj/item/dart_cartridge, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Xx" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; @@ -11701,12 +11197,6 @@ }, /turf/simulated/floor/plating/airless, /area/shuttle/administration) -"XB" = ( -/obj/machinery/atmospherics/unary/tank/nitrogen{ - dir = 1 - }, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "XC" = ( /obj/machinery/light/spot{ dir = 4 @@ -11750,27 +11240,12 @@ /obj/structure/bed/abductor, /turf/simulated/floor/plating/abductor, /area/abductor_ship) -"XS" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1331; - master_tag = "vox_east_control"; - req_access_txt = "152" - }, -/turf/simulated/wall/mineral/plastitanium, -/area/shuttle/vox) "XT" = ( /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) "XW" = ( /turf/simulated/floor/plating, /area/centcom/specops) -"XY" = ( -/obj/item/clothing/head/collectable/xenom, -/obj/item/clothing/head/chicken, -/obj/item/aiModule/syndicate, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Ya" = ( /obj/machinery/atm{ pixel_y = 32 @@ -11864,12 +11339,6 @@ /obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/shuttle/trade/sol) -"YH" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "YK" = ( /turf/simulated/wall/indestructible/opsglass, /area/centcom) @@ -11959,15 +11428,6 @@ icon_state = "cmo" }, /area/shuttle/escape) -"Zk" = ( -/obj/structure/table, -/obj/machinery/door_control{ - id = "voxshutters"; - name = "remote shutter control"; - req_access_txt = "152" - }, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "Zn" = ( /obj/structure/table, /obj/item/radio/beacon/syndicate/bomb{ @@ -11976,18 +11436,6 @@ /obj/item/radio/beacon/syndicate/bomb, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) -"Zs" = ( -/obj/machinery/airlock_sensor{ - frequency = 1331; - id_tag = "vox_east_sensor"; - pixel_x = -25; - req_access_txt = "152" - }, -/obj/machinery/light/spot{ - dir = 8 - }, -/turf/simulated/floor/plating/nitrogen, -/area/shuttle/vox) "Zu" = ( /obj/machinery/vending/cola, /turf/simulated/floor/mineral/plastitanium/red, @@ -12013,27 +11461,6 @@ }, /turf/simulated/floor/plating/airless, /area/shuttle/syndicate) -"ZH" = ( -/obj/machinery/airlock_sensor{ - frequency = 1331; - id_tag = "vox_west_sensor"; - pixel_x = 25; - req_access_txt = "152" - }, -/obj/machinery/light/spot{ - dir = 4 - }, -/turf/simulated/floor/plating/nitrogen, -/area/shuttle/vox) -"ZI" = ( -/obj/item/stack/spacecash/c200, -/obj/item/stack/spacecash/c50, -/obj/machinery/light/spot, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/floor/mineral/plastitanium/red/nitrogen, -/area/shuttle/vox) "ZK" = ( /obj/machinery/light/spot{ dir = 8 @@ -27263,43 +26690,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -27520,43 +26947,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -27777,43 +27204,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -28034,43 +27461,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -28291,43 +27718,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -28548,43 +27975,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -28805,43 +28232,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -29062,43 +28489,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -29319,43 +28746,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -29576,43 +29003,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -29833,43 +29260,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -30090,43 +29517,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -30347,43 +29774,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -30604,43 +30031,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -30861,43 +30288,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -31118,43 +30545,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -31375,43 +30802,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -31632,43 +31059,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -31889,43 +31316,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -32146,43 +31573,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -32403,43 +31830,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -32660,43 +32087,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -32917,43 +32344,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -33174,43 +32601,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -33431,43 +32858,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -33688,43 +33115,43 @@ aN aN aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -gZ -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -33945,43 +33372,43 @@ ck ck aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -34202,43 +33629,43 @@ ck ck aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -34459,43 +33886,43 @@ ck ck aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -34716,43 +34143,43 @@ ck ck aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -34973,43 +34400,43 @@ ck ck aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -35230,43 +34657,43 @@ ck ck aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -35487,43 +34914,43 @@ ck ck aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -35744,43 +35171,43 @@ ck ck aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -36001,43 +35428,43 @@ ck ck aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aq aq @@ -36258,43 +35685,43 @@ ck ck aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -36515,43 +35942,43 @@ ck ck aN aN -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -40573,8 +40000,8 @@ YC mr yF yF -zu -zu +yF +yF yF xQ aN @@ -40829,10 +40256,10 @@ VN VN mr yF -zj -zt -zy -zC +yF +yF +yF +yF xQ aN aN @@ -41344,9 +40771,9 @@ yF yF yF yF +zu +zu yF -yF -yw xQ aN aN @@ -41596,30 +41023,30 @@ yw yF yF yF -mr -mr -mr -mr -mr -at -at -at -at -at -at -at -at -at -at -at -at -at -at +yF +yF +yF +yF +zj +zt +Vf +zC at aN aN aN aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN "} (116,1,1) = {" aN @@ -41842,37 +41269,37 @@ aN aN aN aN +aN +aN +aN +aN +aN at at at at at at +mr +mr +mr +mr +mr at at at at -at -at -TD -TD -TD -TD -TD -TD -NN -NN -NN -TD -TD -TD aN aN aN aN aN aN -at +aN +aN +aN +aN +aN aN aN aN @@ -42099,37 +41526,37 @@ aN aN aN aN -at -aJ -aK -bh -bh -bh -au -au -at -bl -bl -bl -OB -EW -EW -CX -EW -EW -EW -KD -KD -XB -Wt -VK aN aN aN aN aN aN -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -42356,37 +41783,37 @@ aN aN aN aN -at -aJ -au -au -au -au -au -au -bk -bl -bl -bl -zG -ZH -PG -Cw -TD -TD -EW -Fq -KD -DZ -Wt -VK aN aN aN aN aN aN -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -42613,37 +42040,37 @@ aN aN aN aN -at -aJ -au -au -au -au -au -aK -at -at -at -at -TD -TD -TD -TD -aN -TD -EW -Fr -KD -qi -TD -TD aN aN aN aN aN aN -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -42870,29 +42297,6 @@ aN aN aN aN -at -aK -au -au -au -au -au -aJ -at -aN -aN -at -aN -aN -aN -aN -aN -TD -EW -Qh -KD -No -TD aN aN aN @@ -42900,7 +42304,30 @@ aN aN aN aN -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -43127,29 +42554,6 @@ aN aN aN aN -xR -au -au -au -au -au -au -aJ -at -aN -aN -at -aN -aN -TD -NN -NN -TD -EW -Po -KT -TE -TD aN aN aN @@ -43157,7 +42561,30 @@ aN aN aN aN -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -43384,37 +42811,37 @@ aN aN aN aN -xR -au -au -au -au -au -au -aK -at aN aN -at aN -TD -TD -Jz -Jz -TD -EW -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD aN -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -43641,37 +43068,37 @@ aN aN aN aN -xR -au -au -au -Kv -au -au -au -at aN aN -at -TD -TD -KD -KD -KD -TD -EW -IX -KD -NE -Mf -Jv -DE -Fi -OG -mJ -TD -TD -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -43898,37 +43325,37 @@ aN aN aN aN -xR -au -au -bi -bi -Kv -au -au -at aN aN -at aN -Fm -Ed -KD -Fu -TD -TD -TD -KD -KD -KD -KD -KD -Fi -Vw -XY -hU -TD -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -44155,37 +43582,37 @@ aN aN aN aN -xR -au -Kq -bi -bi -Kv -au -au -at aN aN -at aN -Fm -SA -YH -Wb -IX -NB -IX -KD -KD -KD -KD -KD -Vk -KD -KD -ZI -TD -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -44412,37 +43839,37 @@ aN aN aN aN -xR -au -au -bi -bi -Kv -au -au -at aN aN -at aN -Fm -Zk -KD -KD -TD -TD -TD -KD -KD -KD -KD -KD -Fi -MY -Rq -KO -TD -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -44669,37 +44096,37 @@ aN aN aN aN -xR -au -au -au -Kv -au -au -au -at aN aN -at -TD -TD -KD -KD -KD -TD -EW -IX -KD -Xw -PF -ht -ht -Fi -CT -FO -TD -TD -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -44926,37 +44353,37 @@ aN aN aN aN -xR -au -au -au -au -au -au -au -at aN aN -at aN -TD -TD -Sl -Sl -TD -EW -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD aN -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -45183,29 +44610,6 @@ aN aN aN aN -xR -aK -au -au -au -au -au -au -at -aN -aN -at -aN -aN -TD -Lm -Lm -TD -EW -mE -KD -JE -TD aN aN aN @@ -45213,7 +44617,30 @@ aN aN aN aN -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -45436,33 +44863,6 @@ aN aN aN aN -at -at -at -at -at -aK -au -au -au -au -au -au -at -aN -aN -at -aN -aN -aN -aN -aN -TD -EW -Mw -KD -KD -TD aN aN aN @@ -45470,7 +44870,34 @@ aN aN aN aN -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -45693,41 +45120,41 @@ aN aN aN aN -at -au -au -au -at -aK -au -au -au -au -au -au -at -at -at -at -TD -TD -TD -TD -aN -TD -EW -MN -Gi -hR -TD -TD aN aN aN aN aN aN -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -45950,41 +45377,41 @@ aN aN aN aN -at -au -ay -au -aI -au -au -au -au -au -au -au -bk -bl -bl -bl -zT -Zs -Rx -KC -TD -TD -EW -GQ -KD -KD -Wt -VK aN aN aN aN aN aN -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -46207,41 +45634,41 @@ aN aN aN aN -at -au -au -au -at -aJ -aJ -aJ -aK -au -au -au -at -bl -bl -bl -XS -EW -EW -do -EW -EW -EW -KD -KD -XB -Wt -VK aN aN aN aN aN aN -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -46464,41 +45891,41 @@ aN aN aN aN -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -TD -TD -TD -TD -TD -TD -Lm -Lm -Lm -TD -TD -TD aN aN aN aN aN aN -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -46736,26 +46163,26 @@ aN aN aN aN -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN diff --git a/_maps/map_files/shuttles/admin_skipjack.dmm b/_maps/map_files/shuttles/admin_skipjack.dmm new file mode 100644 index 00000000000..57179870975 --- /dev/null +++ b/_maps/map_files/shuttles/admin_skipjack.dmm @@ -0,0 +1,948 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/space, +/area/space) +"ab" = ( +/obj/structure/rack, +/obj/item/gun/energy/noisecannon, +/obj/item/gun/energy/noisecannon, +/obj/item/gun/energy/noisecannon, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"ac" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/admin/vox, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"ad" = ( +/obj/machinery/door/airlock/hatch{ + frequency = 1331; + id_tag = "vox_northwest_lock"; + locked = 1; + req_access_txt = "152" + }, +/obj/structure/fans/tiny, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"ae" = ( +/obj/machinery/computer/shuttle/admin/vox, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"ai" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 2; + icon_state = "open"; + id_tag = "voxshutters"; + name = "Blast Shutters"; + opacity = 0 + }, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/administration) +"aj" = ( +/obj/docking_port/mobile{ + dir = 2; + dwidth = 9; + height = 18; + id = "admin"; + name = "skipjack"; + roundstart_move = "cc_bay_1"; + timid = 1; + width = 19 + }, +/obj/machinery/door/airlock/external, +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 2; + icon_state = "open"; + id_tag = "voxshutters"; + name = "Blast Shutters"; + opacity = 0 + }, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/administration) +"aq" = ( +/obj/machinery/airlock_sensor{ + frequency = 1331; + id_tag = "vox_west_sensor"; + pixel_x = 25; + req_access_txt = "152" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"au" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1; + icon_state = "propulsion_l" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/administration) +"av" = ( +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1331; + master_tag = "vox_west_control"; + req_one_access_txt = "152" + }, +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/administration) +"az" = ( +/turf/space, +/area/shuttle/administration) +"aB" = ( +/obj/machinery/airlock_sensor{ + frequency = 1331; + id_tag = "vox_east_sensor"; + pixel_x = -25; + req_access_txt = "152" + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"aG" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + frequency = 1331; + id_tag = "vox_west_control"; + pixel_x = 24; + req_access_txt = "152"; + tag_airpump = "vox_west_vent"; + tag_chamber_sensor = "vox_west_sensor"; + tag_exterior_door = "vox_northwest_lock"; + tag_interior_door = "vox_southwest_lock" + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"aH" = ( +/obj/structure/shuttle/engine/heater{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/administration) +"aI" = ( +/obj/item/clothing/head/bearpelt, +/obj/item/xenos_claw, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"aJ" = ( +/obj/structure/shuttle/engine/heater{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/administration) +"aM" = ( +/obj/machinery/door/airlock/hatch{ + frequency = 1331; + id_tag = "vox_northeast_lock"; + locked = 1; + req_access_txt = "152" + }, +/obj/structure/fans/tiny, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"aN" = ( +/obj/machinery/door/airlock/hatch{ + frequency = 1331; + id_tag = "vox_southwest_lock"; + locked = 1; + req_access_txt = "152" + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"aP" = ( +/obj/item/broken_bottle, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"aR" = ( +/obj/item/stack/spacecash/c50, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"aT" = ( +/obj/item/clothing/mask/breath, +/obj/machinery/light, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"aU" = ( +/obj/item/stack/spacecash/c50, +/obj/machinery/light, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"bb" = ( +/obj/machinery/door/airlock/hatch{ + req_access_txt = "152" + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"bd" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"bj" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table, +/obj/item/broken_device, +/obj/item/robot_parts/chest, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"bo" = ( +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 8; + icon_state = "open"; + id_tag = "voxshutters"; + name = "Blast Shutters"; + opacity = 0 + }, +/obj/effect/spawner/window/plastitanium, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/administration) +"bt" = ( +/obj/item/storage/toolbox/syndicate, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"bv" = ( +/obj/structure/table, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"bC" = ( +/obj/machinery/atmospherics/unary/tank/nitrogen{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"bD" = ( +/obj/structure/rack, +/obj/item/rcd, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"bG" = ( +/obj/machinery/sleeper/upgraded{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"bJ" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/administration) +"bO" = ( +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1331; + master_tag = "vox_east_control"; + req_access_txt = "152" + }, +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/administration) +"bQ" = ( +/obj/structure/rack, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"bR" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"bV" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_l" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/administration) +"bY" = ( +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"ca" = ( +/obj/structure/rack, +/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/suit/space/vox/stealth, +/obj/item/clothing/head/helmet/space/vox/stealth, +/obj/item/clothing/mask/breath, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"cb" = ( +/obj/structure/rack, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"cf" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + frequency = 1331; + id_tag = "vox_east_control"; + pixel_x = -24; + req_access_txt = "152"; + tag_airpump = "vox_east_vent"; + tag_chamber_sensor = "vox_east_sensor"; + tag_exterior_door = "vox_northeast_lock"; + tag_interior_door = "vox_southeast_lock" + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"cg" = ( +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1331; + master_tag = "vox_west_control"; + req_one_access_txt = "152" + }, +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/administration) +"ci" = ( +/obj/effect/spawner/window/plastitanium, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/administration) +"cj" = ( +/obj/item/clothing/mask/breath, +/obj/item/stack/spacecash/c50, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"ck" = ( +/obj/item/clothing/head/collectable/xenom, +/obj/item/clothing/head/chicken, +/obj/item/aiModule/syndicate, +/obj/item/storage/box/zipties, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"cl" = ( +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c500, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"cm" = ( +/obj/machinery/door/poddoor/shutters{ + density = 0; + icon_state = "open"; + id_tag = "voxshutters"; + name = "Blast Shutters"; + opacity = 0 + }, +/obj/effect/spawner/window/plastitanium, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/administration) +"cn" = ( +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1331; + master_tag = "vox_east_control"; + req_one_access_txt = "152" + }, +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/administration) +"co" = ( +/obj/machinery/door/airlock/hatch{ + frequency = 1331; + id_tag = "vox_southeast_lock"; + locked = 1; + req_access_txt = "152" + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"cp" = ( +/obj/structure/AIcore, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"cu" = ( +/obj/item/clothing/head/bearpelt, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"cv" = ( +/obj/item/xenos_claw, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"cw" = ( +/obj/structure/shuttle/engine/heater{ + dir = 1 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating/airless, +/area/shuttle/administration) +"cx" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/recharger, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"eP" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"jg" = ( +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"nk" = ( +/obj/structure/rack, +/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/suit/space/vox/pressure, +/obj/item/clothing/head/helmet/space/vox/pressure, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"qa" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/weed_extract, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"sd" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/machinery/light, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"ue" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table, +/obj/item/pickaxe, +/obj/item/storage/firstaid/toxin, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"wb" = ( +/obj/effect/spawner/window/plastitanium, +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 2; + icon_state = "open"; + id_tag = "voxshutters"; + name = "Blast Shutters"; + opacity = 0 + }, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/administration) +"wk" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"wB" = ( +/obj/structure/rack, +/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/suit/space/vox/carapace, +/obj/item/clothing/head/helmet/space/vox/carapace, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"wZ" = ( +/obj/structure/rack, +/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/suit/space/vox/medic, +/obj/item/clothing/head/helmet/space/vox/medic, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"xi" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table, +/obj/item/circular_saw, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"zD" = ( +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/administration) +"CD" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"Gs" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table, +/obj/item/scalpel, +/obj/item/stack/cable_coil, +/obj/item/storage/firstaid/regular, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"IH" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table, +/mob/living/simple_animal/bot/floorbot{ + on = 0 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"Jk" = ( +/obj/structure/table, +/obj/machinery/door_control{ + id = "voxshutters"; + name = "remote shutter control"; + req_access_txt = "152" + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"JJ" = ( +/obj/structure/rack, +/obj/item/tank/internals/nitrogen, +/obj/item/tank/internals/nitrogen, +/obj/item/tank/internals/nitrogen, +/obj/item/tank/internals/nitrogen, +/obj/item/tank/internals/nitrogen, +/obj/item/tank/internals/nitrogen, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"MT" = ( +/obj/structure/rack, +/obj/item/pneumatic_cannon, +/obj/item/harpoon, +/obj/item/harpoon, +/obj/item/harpoon, +/obj/item/harpoon, +/obj/item/tank/internals/nitrogen, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"Ua" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/optable, +/obj/item/organ/internal/brain, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"Vl" = ( +/obj/machinery/bodyscanner, +/obj/machinery/light, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"XB" = ( +/obj/machinery/portable_atmospherics/canister/toxins, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) +"XK" = ( +/obj/item/clothing/head/collectable/petehat{ + desc = "It smells faintly of reptile."; + name = "fancy leader hat" + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/administration) + +(1,1,1) = {" +zD +zD +zD +zD +zD +zD +bo +bo +bo +zD +zD +zD +aa +aa +aa +aa +aa +aa +"} +(2,1,1) = {" +av +jg +jg +aN +jg +jg +jg +jg +jg +bC +bJ +bV +aa +aa +aa +aa +aa +aa +"} +(3,1,1) = {" +ad +aq +aG +cg +zD +zD +jg +cx +jg +XB +bJ +bV +aa +aa +aa +aa +aa +aa +"} +(4,1,1) = {" +zD +zD +zD +zD +az +zD +jg +qa +jg +sd +zD +zD +aa +aa +aa +aa +aa +aa +"} +(5,1,1) = {" +az +az +az +az +au +cw +jg +IH +jg +bD +zD +aa +aa +aa +aa +aa +aa +aa +"} +(6,1,1) = {" +az +az +zD +bo +bo +zD +jg +bj +bt +JJ +zD +aa +aa +aa +aa +aa +aa +aa +"} +(7,1,1) = {" +az +au +aH +aP +aT +zD +bb +zD +zD +zD +zD +zD +zD +zD +zD +zD +zD +zD +"} +(8,1,1) = {" +zD +zD +aP +cj +cp +zD +bd +bR +bR +wB +wZ +nk +ca +ci +CD +bR +ae +zD +"} +(9,1,1) = {" +ai +jg +jg +ck +jg +bb +jg +jg +jg +jg +jg +jg +jg +bb +jg +jg +wk +wb +"} +(10,1,1) = {" +aj +jg +bY +cl +cu +bb +jg +jg +jg +jg +jg +jg +jg +bb +XK +jg +bR +wb +"} +(11,1,1) = {" +zD +zD +aI +aR +cv +zD +bd +wk +bv +ab +MT +bQ +cb +ci +eP +Jk +ac +zD +"} +(12,1,1) = {" +az +au +aJ +jg +aU +zD +bb +zD +zD +zD +zD +zD +zD +zD +zD +zD +zD +zD +"} +(13,1,1) = {" +az +az +zD +cm +cm +zD +jg +ue +jg +bG +zD +aa +aa +aa +aa +aa +aa +aa +"} +(14,1,1) = {" +az +az +az +az +au +cw +jg +Gs +jg +jg +zD +aa +aa +aa +aa +aa +aa +aa +"} +(15,1,1) = {" +zD +zD +zD +zD +az +zD +jg +xi +jg +Vl +zD +zD +aa +aa +aa +aa +aa +aa +"} +(16,1,1) = {" +aM +aB +cf +cn +zD +zD +jg +Ua +jg +jg +bJ +bV +aa +aa +aa +aa +aa +aa +"} +(17,1,1) = {" +bO +jg +jg +co +jg +jg +jg +jg +jg +bC +bJ +bV +aa +aa +aa +aa +aa +aa +"} +(18,1,1) = {" +zD +zD +zD +zD +zD +zD +cm +cm +cm +zD +zD +zD +aa +aa +aa +aa +aa +aa +"} +(19,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} diff --git a/code/__DEFINES/gamemode.dm b/code/__DEFINES/gamemode.dm index 042fdc6e3e9..02fc864d292 100644 --- a/code/__DEFINES/gamemode.dm +++ b/code/__DEFINES/gamemode.dm @@ -37,7 +37,6 @@ #define SPECIAL_ROLE_MULTIVERSE "Multiverse Traveller" #define SPECIAL_ROLE_NUKEOPS "Syndicate" #define SPECIAL_ROLE_PYROCLASTIC_SLIME "Pyroclastic Anomaly Slime" -#define SPECIAL_ROLE_RAIDER "Vox Raider" #define SPECIAL_ROLE_REVENANT "Revenant" #define SPECIAL_ROLE_SHADOWLING "Shadowling" #define SPECIAL_ROLE_SHADOWLING_THRALL "Shadowling Thrall" diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm index 45c7a5d0f99..d6597343e46 100644 --- a/code/__DEFINES/role_preferences.dm +++ b/code/__DEFINES/role_preferences.dm @@ -26,7 +26,6 @@ #define ROLE_REVENANT "revenant" #define ROLE_HOG_GOD "hand of god: god" // We're prolly gonna port this one day or another #define ROLE_HOG_CULTIST "hand of god: cultist" -#define ROLE_RAIDER "vox raider" #define ROLE_TRADER "trader" #define ROLE_VAMPIRE "vampire" // Role tags for EVERYONE! @@ -73,7 +72,6 @@ GLOBAL_LIST_INIT(special_roles, list( ROLE_TRADER, // Trader ROLE_TRAITOR = /datum/game_mode/traitor, // Traitor ROLE_VAMPIRE = /datum/game_mode/vampire, // Vampire - ROLE_RAIDER = /datum/game_mode/heist, // Vox raider ROLE_ALIEN, // Xenomorph ROLE_WIZARD = /datum/game_mode/wizard // Wizard // UNUSED/BROKEN ANTAGS diff --git a/code/__DEFINES/rolebans.dm b/code/__DEFINES/rolebans.dm index 58670bcbb77..20f5e758dc1 100644 --- a/code/__DEFINES/rolebans.dm +++ b/code/__DEFINES/rolebans.dm @@ -10,7 +10,6 @@ GLOBAL_LIST_INIT(antag_roles, list( ROLE_BLOB, ROLE_NINJA, ROLE_SHADOWLING, - ROLE_RAIDER, ROLE_VAMPIRE, ROLE_BORER, ROLE_DEMON, diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index e465013853d..84f870384cf 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -325,13 +325,6 @@ /obj/item/gun/energy/noisecannon = 1 ) -/datum/outfit/admin/vox/equip(mob/living/carbon/human/H, visualsOnly = FALSE) - if(isvoxarmalis(H)) - . = ..() - else - H.equip_vox_raider() - H.regenerate_icons() - /datum/outfit/admin/vox/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index dacc08dee31..790a14e3f81 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -138,3 +138,8 @@ suffix = "armory" name = "NRV Sparta" description = "Armory Shuttle, with plenty of guns to hand out and some general supplies." + +/datum/map_template/shuttle/admin/skipjack + suffix = "skipjack" + name = "Vox Skipjack" + description = "Vox skipjack ship." diff --git a/code/game/area/ss13_areas.dm b/code/game/area/ss13_areas.dm index 26a7144585a..b82a6dd2050 100644 --- a/code/game/area/ss13_areas.dm +++ b/code/game/area/ss13_areas.dm @@ -293,14 +293,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/shuttle/research/outpost icon_state = "shuttle" -/area/shuttle/vox - name = "\improper Vox Skipjack" - icon_state = "shuttle" - -/area/shuttle/vox/station - name = "\improper Vox Skipjack" - icon_state = "yellow" - /area/shuttle/salvage name = "\improper Salvage Ship" icon_state = "yellow" diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm deleted file mode 100644 index e36411a506a..00000000000 --- a/code/game/gamemodes/heist/heist.dm +++ /dev/null @@ -1,316 +0,0 @@ -/* -VOX HEIST ROUNDTYPE -*/ -GLOBAL_LIST_EMPTY(raider_spawn) -GLOBAL_LIST_EMPTY(cortical_stacks) //Stacks for 'leave nobody behind' objective. Clumsy, rewrite sometime. - -/datum/game_mode/ - var/list/datum/mind/raiders = list() //Antags. - var/list/raid_objectives = list() //Raid objectives - -/datum/game_mode/heist - name = "heist" - config_tag = "heist" - required_players = 25 - required_enemies = 4 - recommended_enemies = 5 - votable = 0 - - var/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' objective. - var/win_button_triggered = 0 - -/datum/game_mode/heist/announce() - to_chat(world, "The current game mode is - Heist!") - to_chat(world, "An unidentified bluespace signature has slipped past the Icarus and is approaching [station_name()]!") - to_chat(world, "Whoever they are, they're likely up to no good. Protect the crew and station resources against this dastardly threat!") - to_chat(world, "Raiders: Loot [station_name()] for anything and everything you need, or choose the peaceful route and attempt to trade with them.") - to_chat(world, "Personnel: Trade with the raiders, or repel them and their low, low prices and/or crossbows.") - -/datum/game_mode/heist/can_start() - - if(!..()) - return 0 - - var/list/candidates = get_players_for_role(ROLE_RAIDER) - var/raider_num = 0 - - //Check that we have enough vox. - if(candidates.len < required_enemies) - return 0 - else if(candidates.len < recommended_enemies) - raider_num = candidates.len - else - raider_num = recommended_enemies - - //Grab candidates randomly until we have enough. - while(raider_num > 0) - var/datum/mind/new_raider = pick(candidates) - raiders += new_raider - candidates -= new_raider - raider_num-- - - for(var/datum/mind/raider in raiders) - raider.assigned_role = SPECIAL_ROLE_RAIDER - raider.special_role = SPECIAL_ROLE_RAIDER - raider.offstation_role = TRUE - ..() - return 1 - -/datum/game_mode/heist/pre_setup() - return 1 - -/datum/game_mode/heist/post_setup() - - //Generate objectives for the group. - raid_objectives = forge_vox_objectives() - - var/index = 1 - - //Spawn the vox! - for(var/datum/mind/raider in raiders) - - if(index > GLOB.raider_spawn.len) - index = 1 - - raider.current.loc = GLOB.raider_spawn[index] - index++ - - create_vox(raider) - greet_vox(raider) - - if(raid_objectives) - raider.objectives = raid_objectives - - return ..() - -/datum/game_mode/proc/create_vox(datum/mind/newraider) - - var/sounds = rand(2,8) - var/i = 0 - var/newname = "" - - while(i<=sounds) - i++ - newname += pick(list("ti","hi","ki","ya","ta","ha","ka","ya","chi","cha","kah")) - - var/mob/living/carbon/human/vox = newraider.current - var/obj/item/organ/external/head/head_organ = vox.get_organ("head") - - vox.real_name = capitalize(newname) - vox.dna.real_name = vox.real_name - vox.name = vox.real_name - newraider.name = vox.name - vox.age = rand(12,20) - vox.set_species(/datum/species/vox) - vox.s_tone = rand(1, 6) - vox.languages = list() // Removing language from chargen. - vox.flavor_text = "" - vox.add_language("Vox-pidgin") - vox.add_language("Galactic Common") - vox.add_language("Tradeband") - head_organ.h_style = "Short Vox Quills" - head_organ.f_style = "Shaved" - vox.change_hair_color(97, 79, 25) //Same as the species default colour. - vox.change_eye_color(rand(1, 255), rand(1, 255), rand(1, 255)) - vox.underwear = "Nude" - vox.undershirt = "Nude" - vox.socks = "Nude" - - // Do the initial caching of the player's body icons. - vox.force_update_limbs() - vox.update_dna() - vox.update_eyes() - - for(var/obj/item/organ/external/limb in vox.bodyparts) - limb.status &= ~ORGAN_ROBOT - - //Now apply cortical stack. - var/obj/item/implant/cortical/I = new(vox) - I.implant(vox) - GLOB.cortical_stacks += I - - vox.equip_vox_raider() - vox.regenerate_icons() - -/datum/game_mode/proc/is_raider_crew_safe() - if(GLOB.cortical_stacks.len == 0) - return 0 - - for(var/obj/stack in GLOB.cortical_stacks) - if(get_area(stack) != locate(/area/shuttle/vox) && get_area(stack) != locate(/area/vox_station)) - return 0 //this is stupid as fuck - return 1 - -/datum/game_mode/proc/is_raider_crew_alive() - for(var/datum/mind/raider in raiders) - if(raider.current) - if(istype(raider.current,/mob/living/carbon/human) && raider.current.stat != DEAD) - return 1 - return 0 - -/datum/game_mode/proc/forge_vox_objectives() - var/i = 1 - var/max_objectives = pick(2,2,2,2,3,3,3,4) - var/list/objs = list() - var/list/goals = list("kidnap","loot","salvage") - while(i<= max_objectives) - var/goal = pick(goals) - var/datum/objective/heist/O - - if(goal == "kidnap") - goals -= "kidnap" - O = new /datum/objective/heist/kidnap() - else if(goal == "loot") - O = new /datum/objective/heist/loot() - else - O = new /datum/objective/heist/salvage() - O.choose_target() - objs += O - - i++ - - //-All- vox raids have these two objectives. Failing them loses the game. - objs += new /datum/objective/heist/inviolate_crew - objs += new /datum/objective/heist/inviolate_death - - return objs - -/datum/game_mode/proc/greet_vox(datum/mind/raider) - to_chat(raider.current, "You are a Vox Raider, fresh from the Shoal!") - to_chat(raider.current, "The Vox are a race of cunning, sharp-eyed nomadic raiders and traders endemic to the frontier and much of the unexplored galaxy. You and the crew have come to the [station_name()] for plunder, trade or both.") - to_chat(raider.current, "Vox are cowardly and will flee from larger groups, but corner one or find them en masse and they are vicious.") - to_chat(raider.current, "Use :V to voxtalk, :H to talk on your encrypted channel, and don't forget to turn on your nitrogen internals!") - to_chat(raider.current, "Choose to accomplish your objectives by either raiding the crew and taking what you need, or by attempting to trade with them.") - to_chat(raider.current, "For more information, check the wiki page: ([GLOB.configuration.url.wiki_url]/index.php/Vox_Raider)") - spawn(25) - show_objectives(raider) - -/datum/game_mode/heist/declare_completion() - //No objectives, go straight to the feedback. - if(!(raid_objectives.len)) return ..() - - var/win_type = "Major" - var/win_group = "Crew" - var/win_msg = "" - - var/success = raid_objectives.len - - //Decrease success for failed objectives. - for(var/datum/objective/O in raid_objectives) - if(!(O.check_completion())) success-- - - //Set result by objectives. - if(success == raid_objectives.len) - win_type = "Major" - win_group = "Vox" - else if(success > 2) - win_type = "Minor" - win_group = "Vox" - else - win_type = "Minor" - win_group = "Crew" - - //Now we modify that result by the state of the vox crew. - if(!is_raider_crew_alive()) - - win_type = "Major" - win_group = "Crew" - win_msg += "The Vox Raiders have been wiped out!" - - else if(!is_raider_crew_safe()) - - if(win_group == "Crew" && win_type == "Minor") - win_type = "Major" - - win_group = "Crew" - win_msg += "The Vox Raiders have left someone behind!" - - else - - if(win_group == "Vox") - if(win_type == "Minor") - - win_type = "Major" - win_msg += "The Vox Raiders escaped the station!" - else - win_msg += "The Vox Raiders were repelled!" - - to_chat(world, "[win_type] [win_group] victory!") - to_chat(world, "[win_msg]") - SSticker.mode_result = "heist - [win_type] [win_group]" - - var/count = 1 - for(var/datum/objective/objective in raid_objectives) - if(objective.check_completion()) - to_chat(world, "
Objective #[count]: [objective.explanation_text] Success!") - SSblackbox.record_feedback("nested tally", "traitor_objective", 1, list("[objective.type]", "SUCCESS")) - else - to_chat(world, "
Objective #[count]: [objective.explanation_text] Fail.") - SSblackbox.record_feedback("nested tally", "traitor_objective", 1, list("[objective.type]", "FAIL")) - count++ - - ..() - -/datum/game_mode/proc/auto_declare_completion_heist() - if(raiders.len) - var/check_return = 0 - if(GAMEMODE_IS_HEIST) - check_return = 1 - var/text = "The Vox raiders were:" - - for(var/datum/mind/vox in raiders) - text += "
[vox.key] was [vox.name] (" - if(check_return) - var/obj/stack = raiders[vox] - if(get_area(stack.loc) != locate(/area/shuttle/vox)) - text += "left behind)" - continue - if(vox.current) - if(vox.current.stat == DEAD) - text += "died" - else - text += "survived" - if(vox.current.real_name != vox.name) - text += " as [vox.current.real_name]" - else - text += "body destroyed" - text += ")" - - to_chat(world, text) - - return 1 - -/datum/game_mode/heist/check_finished() - if(!(is_raider_crew_alive())) - return 1 - if(win_button_triggered) - return 1 - return ..() - - -/obj/machinery/vox_win_button - name = "shoal contact computer" - desc = "Used to contact the Vox Shoal, generally to arrange for pickup." - icon = 'icons/obj/computer.dmi' - icon_state = "tcstation" - -/obj/machinery/vox_win_button/New() - . = ..() - overlays += icon('icons/obj/computer.dmi', "syndie") - -/obj/machinery/vox_win_button/attack_hand(mob/user) - if(!GAMEMODE_IS_HEIST || (world.time < 10 MINUTES)) //has to be heist, and at least ten minutes into the round - to_chat(user, "\The [src] does not appear to have a connection.") - return 0 - - if(alert(user, "Warning: This will end the round. Are you sure you wish to end the round?", "Vox End", "Yes", "No") == "No") - return 0 - - if(alert(user, "Are you *absolutely* sure you want to end the round?", "!!WARNING!!", "Yes", "No") == "No") - return 0 - - message_admins("[key_name_admin(user)] has pressed the vox win button.") - log_admin("[key_name(user)] pressed the vox win button during a vox round.") - - var/datum/game_mode/heist/H = SSticker.mode - H.win_button_triggered = 1 diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 2b958a2f4b9..9f47adb4568 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -619,219 +619,6 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) else return 0 -// /vg/; Vox Inviolate for humans :V -/datum/objective/minimize_casualties - explanation_text = "Minimise casualties." - -/datum/objective/minimize_casualties/check_completion() - return TRUE - - -//Vox heist objectives. - -/datum/objective/heist -/datum/objective/heist/proc/choose_target() - return - -/datum/objective/heist/kidnap -/datum/objective/heist/kidnap/choose_target() - var/list/roles = list("Chief Engineer","Research Director","Roboticist","Chemist","Station Engineer") - var/list/possible_targets = list() - var/list/priority_targets = list() - - for(var/datum/mind/possible_target in SSticker.minds) - if(possible_target != owner && ishuman(possible_target.current) && (possible_target.current.stat != DEAD) && (possible_target.assigned_role != possible_target.special_role) && !possible_target.offstation_role) - possible_targets += possible_target - for(var/role in roles) - if(possible_target.assigned_role == role) - priority_targets += possible_target - continue - - if(priority_targets.len > 0) - target = pick(priority_targets) - else if(possible_targets.len > 0) - target = pick(possible_targets) - - if(target && target.current) - explanation_text = "The Shoal has a need for [target.current.real_name], the [target.assigned_role]. Take [target.current.p_them()] alive." - else - explanation_text = "Free Objective" - return target - -/datum/objective/heist/kidnap/check_completion() - if(target && target.current) - if(target.current.stat == DEAD) - return 0 - - var/area/shuttle/vox/A = locate() //stupid fucking hardcoding - var/area/vox_station/B = locate() //but necessary - - for(var/mob/living/carbon/human/M in A) - if(target.current == M) - return 1 - for(var/mob/living/carbon/human/M in B) - if(target.current == M) - return 1 - else - return 0 - -/datum/objective/heist/loot -/datum/objective/heist/loot/choose_target() - var/loot = "an object" - switch(rand(1,8)) - if(1) - target = /obj/structure/particle_accelerator - target_amount = 6 - loot = "a complete particle accelerator" - if(2) - target = /obj/machinery/the_singularitygen - target_amount = 1 - loot = "a gravitational singularity generator" - if(3) - target = /obj/machinery/power/emitter - target_amount = 4 - loot = "four emitters" - if(4) - target = /obj/machinery/nuclearbomb - target_amount = 1 - loot = "a nuclear bomb" - if(5) - target = /obj/item/gun - target_amount = 6 - loot = "six guns. Tasers and other non-lethal guns are acceptable" - if(6) - target = /obj/item/gun/energy - target_amount = 4 - loot = "four energy guns" - if(7) - target = /obj/item/gun/energy/laser - target_amount = 2 - loot = "two laser guns" - if(8) - target = /obj/item/gun/energy/ionrifle - target_amount = 1 - loot = "an ion gun" - - explanation_text = "We are lacking in hardware. Steal or trade [loot]." - -/datum/objective/heist/loot/check_completion() - var/total_amount = 0 - - for(var/obj/O in locate(/area/shuttle/vox)) - if(istype(O, target)) - total_amount++ - for(var/obj/I in O.contents) - if(istype(I, target)) - total_amount++ - if(total_amount >= target_amount) - return 1 - - for(var/obj/O in locate(/area/vox_station)) - if(istype(O, target)) - total_amount++ - for(var/obj/I in O.contents) - if(istype(I, target)) - total_amount++ - if(total_amount >= target_amount) - return 1 - - var/datum/game_mode/heist/H = SSticker.mode - for(var/datum/mind/raider in H.raiders) - if(raider.current) - for(var/obj/O in raider.current.get_contents()) - if(istype(O,target)) - total_amount++ - if(total_amount >= target_amount) - return 1 - - return 0 - -/datum/objective/heist/salvage -/datum/objective/heist/salvage/choose_target() - switch(rand(1,8)) - if(1) - target = "metal" - target_amount = 300 - if(2) - target = "glass" - target_amount = 200 - if(3) - target = "plasteel" - target_amount = 100 - if(4) - target = "solid plasma" - target_amount = 100 - if(5) - target = "silver" - target_amount = 50 - if(6) - target = "gold" - target_amount = 20 - if(7) - target = "uranium" - target_amount = 20 - if(8) - target = "diamond" - target_amount = 20 - - explanation_text = "Ransack or trade with the station and escape with [target_amount] [target]." - -/datum/objective/heist/salvage/check_completion() - var/total_amount = 0 - - for(var/obj/item/O in locate(/area/shuttle/vox)) - var/obj/item/stack/sheet/S - if(istype(O,/obj/item/stack/sheet)) - if(O.name == target) - S = O - total_amount += S.get_amount() - - for(var/obj/I in O.contents) - if(istype(I,/obj/item/stack/sheet)) - if(I.name == target) - S = I - total_amount += S.get_amount() - - for(var/obj/item/O in locate(/area/vox_station)) - var/obj/item/stack/sheet/S - if(istype(O,/obj/item/stack/sheet)) - if(O.name == target) - S = O - total_amount += S.get_amount() - - for(var/obj/I in O.contents) - if(istype(I,/obj/item/stack/sheet)) - if(I.name == target) - S = I - total_amount += S.get_amount() - - var/datum/game_mode/heist/H = SSticker.mode - for(var/datum/mind/raider in H.raiders) - if(raider.current) - for(var/obj/item/O in raider.current.get_contents()) - if(istype(O,/obj/item/stack/sheet)) - if(O.name == target) - var/obj/item/stack/sheet/S = O - total_amount += S.get_amount() - - if(total_amount >= target_amount) return 1 - return 0 - - -/datum/objective/heist/inviolate_crew - explanation_text = "Do not leave any Vox behind, alive or dead." - -/datum/objective/heist/inviolate_crew/check_completion() - var/datum/game_mode/heist/H = SSticker.mode - if(H.is_raider_crew_safe()) - return 1 - return 0 - -/datum/objective/heist/inviolate_death - explanation_text = "Follow the Inviolate. Minimise death and loss of resources." - -/datum/objective/heist/inviolate_death/check_completion() - return TRUE // Traders // These objectives have no check_completion, they exist only to tell Sol Traders what to aim for. diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 324e0929f19..41c2eb3c782 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -119,10 +119,6 @@ return list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) if("Syndicate Agent") return list(ACCESS_SYNDICATE, ACCESS_MAINT_TUNNELS) - if("Vox Raider") - return list(ACCESS_VOX) - if("Vox Trader") - return list(ACCESS_VOX) if("Syndicate Commando") return list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) if("Syndicate Officer") @@ -143,7 +139,7 @@ return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SHUTTLES, ACCESS_CENT_TELECOMMS, ACCESS_CENT_TELEPORTER, ACCESS_CENT_SPECOPS, ACCESS_CENT_SPECOPS_COMMANDER, ACCESS_CENT_BLACKOPS, ACCESS_CENT_THUNDER, ACCESS_CENT_BRIDGE, ACCESS_CENT_COMMANDER) /proc/get_all_syndicate_access() - return list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_VOX, ACCESS_SYNDICATE_COMMAND) + return list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_SYNDICATE_COMMAND) /proc/get_all_misc_access() return list(ACCESS_SALVAGE_CAPTAIN, ACCESS_TRADE_SOL, ACCESS_CRATE_CASH, ACCESS_AWAY01) @@ -380,8 +376,6 @@ return "Syndicate Operative" if(ACCESS_SYNDICATE_LEADER) return "Syndicate Operative Leader" - if(ACCESS_VOX) - return "Vox" if(ACCESS_SYNDICATE_COMMAND) return "Syndicate Command" diff --git a/code/game/jobs/job_exp.dm b/code/game/jobs/job_exp.dm index 1c9ef7de79f..89148d88557 100644 --- a/code/game/jobs/job_exp.dm +++ b/code/game/jobs/job_exp.dm @@ -32,7 +32,6 @@ GLOBAL_LIST_INIT(role_playtime_requirements, list( ROLE_REV = 10, ROLE_OPERATIVE = 20, ROLE_CULTIST = 20, - ROLE_RAIDER = 10, ROLE_ALIEN = 10, ROLE_ABDUCTOR = 20, )) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 6d9c8ee2a6c..d671c5debdf 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -152,13 +152,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission spawner_list = GLOB.ertdirector return ..() -/obj/effect/landmark/spawner/raider_spawn - name = "voxstart" - -/obj/effect/landmark/spawner/raider_spawn/Initialize(mapload) - spawner_list = GLOB.raider_spawn - return ..() - /obj/effect/landmark/spawner/ninjastart name = "ninjastart" diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 7fe431e737d..608427116cd 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -435,9 +435,6 @@ if(SSticker.mode.apprentices.len) dat += check_role_table("Apprentices", SSticker.mode.apprentices) - if(SSticker.mode.raiders.len) - dat += check_role_table("Raiders", SSticker.mode.raiders) - /*if(ticker.mode.ninjas.len) dat += check_role_table("Ninjas", ticker.mode.ninjas)*/ diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 23bb2600d98..d60fc9c658c 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -67,10 +67,6 @@ if(!makeVampires()) to_chat(usr, "Unfortunately there weren't enough candidates available.") if("7") - log_admin("[key_name(usr)] has spawned vox raiders.") - if(!makeVoxRaiders()) - to_chat(usr, "Unfortunately there weren't enough candidates available.") - if("8") log_admin("[key_name(usr)] has spawned an abductor team.") if(!makeAbductorTeam()) to_chat(usr, "Unfortunately there weren't enough candidates available.") diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 511e337df97..3a7f48e6df8 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -19,8 +19,7 @@ Make Cult
Make Wizard (Requires Ghosts)
Make Vampires
- Make Vox Raiders (Requires Ghosts)
- Make Abductor Team (Requires Ghosts)
+ Make Abductor Team (Requires Ghosts)
"} usr << browse(dat, "window=oneclickantag;size=400x400") return @@ -410,111 +409,6 @@ return new_syndicate_commando -/datum/admins/proc/makeVoxRaiders() - - var/list/mob/candidates = list() - var/mob/theghost = null - var/time_passed = world.time - var/input = "Disregard shinies, acquire hardware." - - var/leader_chosen = 0 //when the leader is chosen. The last person spawned. - - var/antnum = input(owner, "How many raiders you want to create? Enter 0 to cancel.","Amount:", 0) as num - if(!antnum || antnum <= 0) - return - log_admin("[key_name(owner)] tried making Vox Raiders with One-Click-Antag") - message_admins("[key_name_admin(owner)] tried making Vox Raiders with One-Click-Antag") -//Generates a list of candidates from active ghosts. - for(var/mob/G in GLOB.respawnable_list) - if(istype(G) && G.client && (ROLE_RAIDER in G.client.prefs.be_special)) - if(player_old_enough_antag(G.client,ROLE_RAIDER)) - if(!jobban_isbanned(G, ROLE_RAIDER) && !jobban_isbanned(G, ROLE_SYNDICATE)) - spawn(0) - switch(alert(G,"Do you wish to be considered for a vox raiding party arriving on the station?","Please answer in 30 seconds!","Yes","No")) - if("Yes") - if((world.time-time_passed)>300)//If more than 30 game seconds passed. - return - candidates += G - if("No") - return - else - return - - sleep(300) //Debug. - - for(var/mob/dead/observer/G in candidates) - if(!G.key) - candidates.Remove(G) - - if(candidates.len) - var/raiders = min(antnum, candidates.len) - //Spawns vox raiders and equips them. - for(var/thing in GLOB.landmarks_list) - var/obj/effect/landmark/L = thing - if(L.name == "voxstart") - if(raiders<=0) - break - - var/mob/living/carbon/human/new_vox = create_vox_raider(L, leader_chosen) - - while((!theghost || !theghost.client) && candidates.len) - theghost = pick(candidates) - candidates.Remove(theghost) - - if(!theghost) - qdel(new_vox) - break - - new_vox.key = theghost.key - SSticker.mode.traitors += new_vox.mind - - to_chat(new_vox, "You are a Vox Primalis, fresh out of the Shoal. Your ship has arrived at the Tau Ceti system hosting the NSV Exodus... or was it the Luna? NSS? Utopia? Nobody is really sure, but everyong is raring to start pillaging! Your current goal is: [input]") - to_chat(new_vox, "Don't forget to turn on your nitrogen internals!") - - raiders-- - else - return 0 - return 1 - -/datum/admins/proc/create_vox_raider(obj/spawn_location, leader_chosen = 0) - - var/sounds = rand(2,8) - var/i = 0 - var/newname = "" - - while(i<=sounds) - i++ - newname += pick(list("ti","hi","ki","ya","ta","ha","ka","ya","chi","cha","kah")) - - var/mob/living/carbon/human/new_vox = new /mob/living/carbon/human/vox(spawn_location.loc) - - new_vox.add_language("Tradeband") - new_vox.real_name = capitalize(newname) - new_vox.dna.real_name = new_vox.real_name - new_vox.name = new_vox.real_name - new_vox.age = rand(12,20) - new_vox.flavor_text = "" - new_vox.change_eye_color(rand(1, 255), rand(1, 255), rand(1, 255)) - new_vox.s_tone = rand(1, 6) - - // Do the initial caching of the player's body icons. - new_vox.force_update_limbs() - new_vox.update_dna() - new_vox.update_eyes() - - for(var/obj/item/organ/external/limb in new_vox.bodyparts) - limb.status &= ~ORGAN_ROBOT - - //Now apply cortical stack. - var/obj/item/implant/cortical/I = new(new_vox) - I.implant(new_vox) - GLOB.cortical_stacks += I - - new_vox.equip_vox_raider() - new_vox.regenerate_icons() - - return new_vox - /datum/admins/proc/makeVampires() var/datum/game_mode/vampire/temp = new diff --git a/code/modules/admin/verbs/vox_raiders.dm b/code/modules/admin/verbs/vox_raiders.dm deleted file mode 100644 index 9a15b0b15db..00000000000 --- a/code/modules/admin/verbs/vox_raiders.dm +++ /dev/null @@ -1,65 +0,0 @@ -GLOBAL_VAR_INIT(vox_tick, 1) - -/mob/living/carbon/human/proc/equip_vox_raider() - - var/obj/item/radio/R = new /obj/item/radio/headset/syndicate(src) - R.set_frequency(SYND_FREQ) //Same frequency as the syndicate team in Nuke mode. - equip_to_slot_or_del(R, slot_l_ear) - - equip_to_slot_or_del(new /obj/item/clothing/under/vox/vox_robes(src), slot_w_uniform) - equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/vox(src), slot_shoes) // REPLACE THESE WITH CODED VOX ALTERNATIVES. - equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow/vox(src), slot_gloves) // AS ABOVE. - - switch(GLOB.vox_tick) - if(1) // Vox raider! - equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/carapace(src), slot_wear_suit) - equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/vox/carapace(src), slot_head) - equip_to_slot_or_del(new /obj/item/melee/classic_baton/telescopic(src), slot_belt) - equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(src), slot_glasses) // REPLACE WITH CODED VOX ALTERNATIVE. - equip_to_slot_or_del(new /obj/item/chameleon(src), slot_l_store) - - var/obj/item/gun/energy/spikethrower/W = new(src) - equip_to_slot_or_del(W, slot_r_hand) - - - if(2) // Vox engineer! - equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/pressure(src), slot_wear_suit) - equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/vox/pressure(src), slot_head) - equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(src), slot_belt) - equip_to_slot_or_del(new /obj/item/clothing/glasses/meson(src), slot_glasses) // REPLACE WITH CODED VOX ALTERNATIVE. - equip_to_slot_or_del(new /obj/item/storage/box/emps(src), slot_r_hand) - equip_to_slot_or_del(new /obj/item/multitool(src), slot_l_hand) - - - if(3) // Vox saboteur! - equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/stealth(src), slot_wear_suit) - equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/vox/stealth(src), slot_head) - equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(src), slot_belt) - equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(src), slot_glasses) // REPLACE WITH CODED VOX ALTERNATIVE. - equip_to_slot_or_del(new /obj/item/card/emag(src), slot_l_store) - equip_to_slot_or_del(new /obj/item/gun/dartgun/vox/raider(src), slot_r_hand) - equip_to_slot_or_del(new /obj/item/multitool(src), slot_l_hand) - - if(4) // Vox medic! - equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/medic(src), slot_wear_suit) - equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/vox/medic(src), slot_head) - equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(src), slot_belt) // Who needs actual surgical tools? - equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(src), slot_glasses) // REPLACE WITH CODED VOX ALTERNATIVE. - equip_to_slot_or_del(new /obj/item/circular_saw(src), slot_l_store) - equip_to_slot_or_del(new /obj/item/gun/dartgun/vox/medical, slot_r_hand) - - equip_to_slot_or_del(new /obj/item/clothing/mask/breath/vox(src), slot_wear_mask) - equip_to_slot_or_del(new /obj/item/tank/internals/nitrogen(src), slot_back) - equip_to_slot_or_del(new /obj/item/flashlight(src), slot_r_store) - - var/obj/item/card/id/syndicate/vox/W = new(src) - W.name = "[real_name]'s Legitimate Human ID Card" - W.assignment = "Trader" - W.registered_name = real_name - W.registered_user = src - equip_to_slot_or_del(W, slot_wear_id) - - GLOB.vox_tick++ - if(GLOB.vox_tick > 4) GLOB.vox_tick = 1 - - return 1 diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index d3d1610b248..f2915879ab3 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -12,7 +12,6 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts ROLE_REVENANT = 14, ROLE_OPERATIVE = 21, ROLE_CULTIST = 21, - ROLE_RAIDER = 21, ROLE_ALIEN = 21, ROLE_DEMON = 21, ROLE_SENTIENT = 21, diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index c56db84d610..308e2c2bf0f 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -1,46 +1,3 @@ -/obj/item/gun/energy/spikethrower //It's like the cyborg LMG, uses energy to make spikes - name = "\improper Vox spike thrower" - desc = "A vicious alien projectile weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive." - icon = 'icons/obj/guns/projectile.dmi' - icon_state = "spikethrower" - item_state = "spikethrower" - w_class = WEIGHT_CLASS_SMALL - fire_sound_text = "a strange noise" - can_suppress = 0 - burst_size = 2 // burst has to be stored here - can_charge = FALSE - selfcharge = TRUE - charge_delay = 10 - restricted_species = list(/datum/species/vox) - ammo_type = list(/obj/item/ammo_casing/energy/spike) - -/obj/item/gun/energy/spikethrower/emp_act() - return - -/obj/item/ammo_casing/energy/spike - name = "alloy spike" - desc = "A broadhead spike made out of a weird silvery metal." - projectile_type = /obj/item/projectile/bullet/spike - muzzle_flash_effect = null - e_cost = 100 - delay = 3 //and delay has to be stored here on energy guns - select_name = "spike" - fire_sound = 'sound/weapons/bladeslice.ogg' - -/obj/item/projectile/bullet/spike - name = "alloy spike" - desc = "It's about a foot of weird silvery metal with a wicked point." - damage = 25 - stun = 1 - armour_penetration = 30 - icon_state = "magspear" - -/obj/item/projectile/bullet/spike/on_hit(atom/target, blocked = 0) - if((blocked != 100) && istype(target, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = target - H.bleed(50) - ..() - //This gun only functions for armalis. The on-sprite is too huge to render properly on other sprites. /obj/item/gun/energy/noisecannon name = "alien heavy cannon" diff --git a/code/modules/projectiles/guns/dartgun.dm b/code/modules/projectiles/guns/dartgun.dm deleted file mode 100644 index 3707e00fb91..00000000000 --- a/code/modules/projectiles/guns/dartgun.dm +++ /dev/null @@ -1,298 +0,0 @@ -/obj/item/dart_cartridge - name = "dart cartridge" - desc = "A rack of hollow darts." - icon = 'icons/obj/ammo.dmi' - icon_state = "darts-5" - item_state = "rcdammo" - opacity = 0 - density = 0 - anchored = 0.0 - origin_tech = "materials=2" - var/darts = 5 - -/obj/item/dart_cartridge/update_icon() - if(!darts) - icon_state = "darts-0" - else if(darts > 5) - icon_state = "darts-5" - else - icon_state = "darts-[darts]" - return 1 - -/obj/item/gun/dartgun - name = "dart gun" - desc = "A small gas-powered dartgun, capable of delivering chemical cocktails swiftly across short distances." - icon_state = "dartgun-empty" - - var/list/beakers = list() //All containers inside the gun. - var/list/mixing = list() //Containers being used for mixing. - var/obj/item/dart_cartridge/cartridge = null //Container of darts. - var/max_beakers = 3 - var/dart_reagent_amount = 15 - var/containers_type = /obj/item/reagent_containers/glass/beaker - var/list/starting_chems = null - -/obj/item/gun/dartgun/update_icon() - if(!cartridge) - icon_state = "dartgun-e" - return 1 - - if(!cartridge.darts) - icon_state = "dartgun-0" - else if(cartridge.darts > 5) - icon_state = "dartgun-5" - else - icon_state = "dartgun-[cartridge.darts]" - return 1 - -/obj/item/gun/dartgun/New() - ..() - if(starting_chems) - for(var/chem in starting_chems) - var/obj/B = new containers_type(src) - B.reagents.add_reagent(chem, 50) - beakers += B - cartridge = new /obj/item/dart_cartridge(src) - update_icon() - -/obj/item/gun/dartgun/examine(mob/user) - . = ..() - if(get_dist(user, src) <= 2) - if(beakers.len) - . += "[src] contains:" - for(var/obj/item/reagent_containers/glass/beaker/B in beakers) - if(B.reagents && B.reagents.reagent_list.len) - for(var/datum/reagent/R in B.reagents.reagent_list) - . += "[R.volume] units of [R.name]" - -/obj/item/gun/dartgun/attackby(obj/item/I as obj, mob/user as mob, params) - if(istype(I, /obj/item/dart_cartridge)) - - var/obj/item/dart_cartridge/D = I - - if(!D.darts) - to_chat(user, "[D] is empty.") - return 0 - - if(cartridge) - if(cartridge.darts <= 0) - src.remove_cartridge() - else - to_chat(user, "There's already a cartridge in [src].") - return 0 - - user.drop_item() - cartridge = D - D.forceMove(src) - to_chat(user, "You slot [D] into [src].") - update_icon() - return - if(istype(I, /obj/item/reagent_containers/glass)) - if(!istype(I, containers_type)) - to_chat(user, "[I] doesn't seem to fit into [src].") - return - if(beakers.len >= max_beakers) - to_chat(user, "[src] already has [max_beakers] beakers in it - another one isn't going to fit!") - return - var/obj/item/reagent_containers/glass/beaker/B = I - if(!user.drop_item()) - to_chat(user, "\The [B] is stuck to you!") - return - B.forceMove(src) - beakers += B - to_chat(user, "You slot [B] into [src].") - src.updateUsrDialog() - else - return ..() - -/obj/item/gun/dartgun/can_shoot() - if(!cartridge) - return 0 - else - return cartridge.darts - -/obj/item/gun/dartgun/proc/has_selected_beaker_reagents() - return 0 - -/obj/item/gun/dartgun/proc/remove_cartridge() - if(cartridge) - to_chat(usr, "You pop the cartridge out of [src].") - var/obj/item/dart_cartridge/C = cartridge - C.forceMove(get_turf(src)) - C.update_icon() - cartridge = null - src.update_icon() - -/obj/item/gun/dartgun/proc/get_mixed_syringe() - if(!cartridge) - return 0 - if(!cartridge.darts) - return 0 - - var/obj/item/reagent_containers/syringe/dart = new(src) - - if(mixing.len) - var/mix_amount = dart_reagent_amount/mixing.len - for(var/obj/item/reagent_containers/glass/beaker/B in mixing) - B.reagents.trans_to(dart,mix_amount) - - return dart - -/obj/item/gun/dartgun/proc/fire_dart(atom/target, mob/user) - if(locate (/obj/structure/table, src.loc)) - return - else - var/turf/trg = get_turf(target) - var/obj/effect/syringe_gun_dummy/D = new/obj/effect/syringe_gun_dummy(get_turf(src)) - var/obj/item/reagent_containers/syringe/S = get_mixed_syringe() - if(!S) - to_chat(user, "There are no darts in [src]!") - return - if(!S.reagents) - to_chat(user, "There are no reagents available!") - return - cartridge.darts-- - src.update_icon() - S.reagents.trans_to(D, S.reagents.total_volume) - qdel(S) - D.icon_state = "syringeproj" - D.name = "syringe" - D.reagents.set_reacting(FALSE) - playsound(user.loc, 'sound/items/syringeproj.ogg', 50, 1) - - for(var/i=0, i<6, i++) - if(!D) break - if(D.loc == trg) break - step_towards(D,trg) - - if(D) - for(var/mob/living/carbon/M in D.loc) - if(!istype(M,/mob/living/carbon)) continue - if(M == user) continue - //Syringe gun attack logging by Yvarov - var/R - if(D.reagents) - for(var/datum/reagent/A in D.reagents.reagent_list) - R += A.id + " (" - R += num2text(A.volume) + ")," - - add_attack_logs(user, M, "Shot with dartgun containing [R]") - - if(D.reagents) - D.reagents.trans_to(M, 15) - to_chat(M, "You feel a slight prick.") - - qdel(D) - break - if(D) - for(var/atom/A in D.loc) - if(A == user) continue - if(A.density) qdel(D) - - sleep(1) - - if(D) spawn(10) qdel(D) - - return - -/obj/item/gun/dartgun/afterattack(atom/target, mob/living/user, flag, params) - if(!isturf(target.loc) || target == user) - return - ..() - -/obj/item/gun/dartgun/attack_self(mob/user) - user.set_machine(src) - var/dat = "[src] mixing control:

" - - if(beakers.len) - var/i = 1 - for(var/obj/item/reagent_containers/glass/beaker/B in beakers) - dat += "Beaker [i] contains: " - if(B.reagents && B.reagents.reagent_list.len) - for(var/datum/reagent/R in B.reagents.reagent_list) - dat += "
[R.volume] units of [R.name], " - if(check_beaker_mixing(B)) - dat += text("Mixing ") - else - dat += text("Not mixing ") - else - dat += "nothing." - dat += " \[Eject\]
" - i++ - else - dat += "There are no beakers inserted!

" - - if(cartridge) - if(cartridge.darts) - dat += "The dart cartridge has [cartridge.darts] shots remaining." - else - dat += "The dart cartridge is empty!" - dat += " \[Eject\]" - - user << browse(dat, "window=dartgun") - onclose(user, "dartgun", src) - -/obj/item/gun/dartgun/proc/check_beaker_mixing(obj/item/B) - if(!mixing || !beakers) - return 0 - for(var/obj/item/M in mixing) - if(M == B) - return 1 - return 0 - -/obj/item/gun/dartgun/Topic(href, href_list) - src.add_fingerprint(usr) - if(href_list["stop_mix"]) - var/index = text2num(href_list["stop_mix"]) - if(index <= beakers.len) - for(var/obj/item/M in mixing) - if(M == beakers[index]) - mixing -= M - break - else if(href_list["mix"]) - var/index = text2num(href_list["mix"]) - if(index <= beakers.len) - mixing += beakers[index] - else if(href_list["eject"]) - var/index = text2num(href_list["eject"]) - if(index <= beakers.len) - if(beakers[index]) - var/obj/item/reagent_containers/glass/beaker/B = beakers[index] - to_chat(usr, "You remove [B] from [src].") - mixing -= B - beakers -= B - B.forceMove(get_turf(src)) - else if(href_list["eject_cart"]) - remove_cartridge() - src.updateUsrDialog() - return - -/obj/item/gun/dartgun/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override) - if(cartridge) - spawn(0) - fire_dart(target,user) - else - to_chat(usr, "[src] is empty.") - - -/obj/item/gun/dartgun/vox - name = "alien dart gun" - desc = "A small gas-powered dartgun, fitted for nonhuman hands." - -/obj/item/gun/dartgun/vox/medical - starting_chems = list("silver_sulfadiazine","styptic_powder","charcoal") - -/obj/item/gun/dartgun/vox/raider - starting_chems = list("space_drugs","ether","haloperidol") - -/obj/effect/syringe_gun_dummy //moved this shitty thing here - name = "" - desc = "" - icon = 'icons/obj/chemical.dmi' - icon_state = "null" - anchored = 1 - density = 0 - -/obj/effect/syringe_gun_dummy/New() - . = ..() - create_reagents(15) diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm index 87a03e2e8e9..3d867e3ab65 100644 --- a/code/modules/shuttle/syndicate.dm +++ b/code/modules/shuttle/syndicate.dm @@ -100,3 +100,15 @@ y_offset = 0 #undef SYNDICATE_CHALLENGE_TIMER + +// Fuck it its syndicate now +/obj/machinery/computer/camera_advanced/shuttle_docker/admin/vox + name = "skipjack navigation computer" + desc = "Used to designate a precise transit location for the skipjack." + flags = NODECONSTRUCT + access_mining = FALSE + +/obj/machinery/computer/shuttle/admin/vox + name = "vox skipjack console" + req_access = list(ACCESS_VOX) + possible_destinations = "admin_home;admin_custom" diff --git a/code/modules/shuttle/vox.dm b/code/modules/shuttle/vox.dm deleted file mode 100644 index 713389e325a..00000000000 --- a/code/modules/shuttle/vox.dm +++ /dev/null @@ -1,20 +0,0 @@ -/obj/machinery/computer/shuttle/vox - name = "skipjack control console" - req_access = list(ACCESS_VOX) - shuttleId = "skipjack" - possible_destinations = "skipjack_away;skipjack_ne;skipjack_nw;skipjack_se;skipjack_sw;skipjack_z5;skipjack_custom" - resistance_flags = INDESTRUCTIBLE - flags = NODECONSTRUCT - -/obj/machinery/computer/camera_advanced/shuttle_docker/vox - name = "skipjack navigation computer" - desc = "Used to designate a precise transit location for the skipjack." - icon_screen = "navigation" - icon_keyboard = "med_key" - shuttleId = "skipjack" - shuttlePortId = "skipjack_custom" - view_range = 13 - x_offset = -10 - y_offset = -10 - resistance_flags = INDESTRUCTIBLE - flags = NODECONSTRUCT diff --git a/config/example/config.toml b/config/example/config.toml index fa0d6b008f2..aa869d91c10 100644 --- a/config/example/config.toml +++ b/config/example/config.toml @@ -231,7 +231,6 @@ gamemode_probabilities = [ {gamemode = "cult", probability = 3}, {gamemode = "extend-a-traitormongous", probability = 2}, # Autotraitor {gamemode = "extended", probability = 3}, - {gamemode = "heist", probability = 0}, {gamemode = "nuclear", probability = 2}, {gamemode = "raginmages", probability = 0}, {gamemode = "revolution", probability = 0}, diff --git a/paradise.dme b/paradise.dme index 5faf4da8fb6..35ba942fe3c 100644 --- a/paradise.dme +++ b/paradise.dme @@ -579,7 +579,6 @@ #include "code\game\gamemodes\cult\ritual.dm" #include "code\game\gamemodes\cult\runes.dm" #include "code\game\gamemodes\extended\extended.dm" -#include "code\game\gamemodes\heist\heist.dm" #include "code\game\gamemodes\malfunction\Malf_Modules.dm" #include "code\game\gamemodes\miniantags\abduction\abductee_objectives.dm" #include "code\game\gamemodes\miniantags\abduction\abduction.dm" @@ -1262,7 +1261,6 @@ #include "code\modules\admin\verbs\toggledebugverbs.dm" #include "code\modules\admin\verbs\tripAI.dm" #include "code\modules\admin\verbs\view_instances.dm" -#include "code\modules\admin\verbs\vox_raiders.dm" #include "code\modules\admin\verbs\SDQL2\SDQL_2.dm" #include "code\modules\admin\verbs\SDQL2\SDQL_2_parser.dm" #include "code\modules\admin\verbs\SDQL2\useful_procs.dm" @@ -2281,7 +2279,6 @@ #include "code\modules\projectiles\ammunition\magazines.dm" #include "code\modules\projectiles\ammunition\special.dm" #include "code\modules\projectiles\guns\alien.dm" -#include "code\modules\projectiles\guns\dartgun.dm" #include "code\modules\projectiles\guns\energy.dm" #include "code\modules\projectiles\guns\grenade_launcher.dm" #include "code\modules\projectiles\guns\magic.dm" @@ -2433,7 +2430,6 @@ #include "code\modules\shuttle\shuttle_rotate.dm" #include "code\modules\shuttle\supply.dm" #include "code\modules\shuttle\syndicate.dm" -#include "code\modules\shuttle\vox.dm" #include "code\modules\space_management\heap_space_level.dm" #include "code\modules\space_management\level_check.dm" #include "code\modules\space_management\level_traits.dm"