diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index a1a29d8d3cf1..dca8bf3e5d03 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -181,6 +181,10 @@ }, /turf/open/floor/stone, /area/centcom/central_command_areas/hall) +"aB" = ( +/obj/structure/table/reinforced, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range_checkpoint_control) "aC" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -334,6 +338,12 @@ }, /turf/open/floor/carpet/purple, /area/centcom/central_command_areas/admin) +"aX" = ( +/obj/effect/turf_decal/trimline/green/line, +/obj/structure/reagent_dispensers/watertank/high, +/obj/structure/railing/wood, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/botany) "aZ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/table/reinforced, @@ -609,10 +619,17 @@ /turf/open/floor/plating, /area/centcom/syndicate_mothership/expansion_bombthreat) "bK" = ( -/obj/item/clothing/mask/facehugger/dead, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/plating, +/obj/structure/centcom_teleporter/admin_offices, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin) +"bL" = ( +/obj/structure/noticeboard/directional/east, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/centcom_teleporter/cargo, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) "bM" = ( /turf/open/floor/glass/reinforced, /area/centcom/central_command_areas/evacuation) @@ -1031,6 +1048,11 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) +"cW" = ( +/obj/effect/gibspawner/human/bodypartless, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) "cX" = ( /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/expansion_bioterrorism) @@ -1068,6 +1090,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"dc" = ( +/obj/machinery/door/window/right/directional/west, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range) "dd" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/stripes/line{ @@ -1207,11 +1234,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/control) -"ds" = ( -/obj/effect/decal/cleanable/garbage, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin) "dt" = ( /obj/structure/window/reinforced/tinted/frosted, /obj/structure/closet/mini_fridge, @@ -1519,19 +1541,6 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) -"el" = ( -/obj/machinery/computer/atmos_control/noreconnect{ - atmos_chambers = list("nukiebase"="Burn Chamber"); - desc = "Used to monitor the Syndicate Ordnance Laboratory's burn chamber."; - dir = 1; - name = "Ordnance Chamber Monitor" - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light/cold/directional/west{ - dir = 2 - }, -/turf/open/floor/mineral/titanium/tiled/yellow, -/area/centcom/syndicate_mothership/expansion_bombthreat) "em" = ( /obj/machinery/chem_mass_spec, /turf/open/floor/mineral/titanium/tiled/yellow, @@ -1628,14 +1637,12 @@ /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/admin) "eB" = ( -/obj/structure/disposalpipe/loafer{ - dir = 4 +/obj/structure/sign/painting/library{ + pixel_x = 32 }, /obj/structure/fans/tiny/invisible, -/obj/machinery/light/very_dim/directional{ - dir = 1 - }, -/turf/open/floor/plating, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/admin) "eC" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, @@ -1643,6 +1650,11 @@ /obj/machinery/chem_dispenser/drinks, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/borbop) +"eD" = ( +/obj/effect/gibspawner/human/bodypartless, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "eE" = ( /obj/structure/table/reinforced, /obj/item/toy/figure/dsquad{ @@ -1920,11 +1932,6 @@ "fB" = ( /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) -"fC" = ( -/obj/effect/gibspawner/human/bodypartless, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin) "fD" = ( /obj/machinery/light/neon_lining{ icon_state = "pink2_1" @@ -1995,6 +2002,13 @@ }, /turf/open/floor/mineral/titanium, /area/centcom/syndicate_mothership/control) +"fO" = ( +/obj/machinery/door/poddoor/shutters/indestructible/preopen{ + id = "CC_firing_range_checkpoint" + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range) "fP" = ( /obj/structure/table/wood/fancy, /obj/item/storage/photo_album, @@ -2281,6 +2295,14 @@ }, /turf/open/misc/ice/icemoon, /area/centcom/syndicate_mothership/control) +"gD" = ( +/obj/structure/table/wood, +/obj/item/mod/control/pre_equipped/chrono{ + desc = "It smells freshly laundered." + }, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "gE" = ( /obj/machinery/light/floor/has_bulb, /obj/structure/flora/tree/jungle/style_3, @@ -2592,6 +2614,10 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/misc/grass, /area/centcom/central_command_areas/admin) +"hB" = ( +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) "hC" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -2616,11 +2642,6 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) -"hF" = ( -/obj/structure/falsewall/reinforced, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/plating, -/area/centcom/central_command_areas/admin) "hG" = ( /obj/structure/chair/sofa/bench/right{ dir = 4 @@ -2890,6 +2911,12 @@ "iu" = ( /turf/open/floor/wood/large, /area/centcom/central_command_areas/ghost_spawn) +"iv" = ( +/obj/machinery/door/airlock/centcom{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range) "iw" = ( /obj/structure/table/glass/plasmaglass, /obj/item/plunger{ @@ -3002,6 +3029,10 @@ /obj/effect/turf_decal/siding/thinplating_new/dark, /turf/open/floor/iron/dark/textured_large, /area/centcom/syndicate_mothership/control) +"iM" = ( +/obj/machinery/door/airlock/centcom, +/turf/open/floor/iron/dark/herringbone, +/area/centcom/central_command_areas/medical) "iN" = ( /obj/machinery/status_display/supply, /turf/closed/indestructible/riveted, @@ -3106,6 +3137,13 @@ /obj/machinery/vending/wardrobe/engi_wardrobe, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/hall) +"jh" = ( +/obj/machinery/computer/camera_advanced{ + dir = 4 + }, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "ji" = ( /obj/machinery/computer/camera_advanced, /turf/open/floor/wood, @@ -3260,6 +3298,15 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/evacuation/ship) +"jE" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/structure/railing/wood{ + dir = 1 + }, +/turf/open/floor/iron/dark/diagonal, +/area/centcom/central_command_areas/medical) "jF" = ( /obj/effect/turf_decal/siding/wideplating{ dir = 1 @@ -3326,10 +3373,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) -"jM" = ( -/obj/machinery/vending/medical, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/medical) "jN" = ( /obj/structure/flora/tree/dead/style_random, /obj/structure/flora/grass/both/style_random, @@ -3515,6 +3558,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured_large, /area/centcom/central_command_areas/evacuation/ship) +"ks" = ( +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/structure/fans/tiny/invisible, +/obj/machinery/light/very_dim/directional, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) "ku" = ( /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership/expansion_chemicalwarfare) @@ -3547,6 +3597,12 @@ /obj/machinery/vending/boozeomat, /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership/control) +"kC" = ( +/obj/structure/railing/wood{ + dir = 1 + }, +/turf/open/floor/iron/dark/diagonal, +/area/centcom/central_command_areas/medical) "kD" = ( /obj/structure/table/rolling, /obj/item/reagent_containers/condiment/soymilk, @@ -3613,6 +3669,15 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) +"kP" = ( +/obj/structure/closet/secure_closet/armory1, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range_checkpoint_control) +"kQ" = ( +/obj/structure/closet/secure_closet/armory3, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range_checkpoint_control) "kS" = ( /obj/effect/turf_decal/siding/dark, /turf/open/floor/carpet, @@ -3699,6 +3764,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, /turf/open/floor/catwalk_floor/titanium, /area/centcom/syndicate_mothership/control) +"la" = ( +/obj/effect/gun_check_blocker{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range) "lb" = ( /obj/structure/railing, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, @@ -3753,14 +3824,6 @@ /obj/effect/turf_decal/tile/dark/opposingcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin_hangout) -"ll" = ( -/obj/machinery/door/airlock/centcom{ - dir = 4; - name = "Glyphee's Garbage Dump" - }, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin) "lm" = ( /obj/structure/window/plasma/spawner/directional/north, /obj/structure/window/plasma/spawner/directional/west, @@ -3778,6 +3841,9 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"lr" = ( +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/firing_range_checkpoint_control) "lt" = ( /obj/structure/lattice/catwalk, /obj/effect/turf_decal/stripes/line{ @@ -3796,13 +3862,6 @@ /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/centcom/central_command_areas/hall) -"lv" = ( -/obj/effect/spawner/random/trash/garbage, -/obj/effect/spawner/random/maintenance/two, -/obj/machinery/recycler/deathtrap, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/plating, -/area/centcom/central_command_areas/admin) "lw" = ( /obj/structure/sign/poster/contraband/lizard{ pixel_x = -32 @@ -3997,6 +4056,11 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/carpet, /area/centcom/central_command_areas/admin) +"mb" = ( +/obj/machinery/light/floor/has_bulb, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/medical) "mc" = ( /obj/effect/turf_decal/siding/dark{ dir = 9 @@ -4123,13 +4187,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, /turf/open/floor/catwalk_floor/iron_smooth, /area/centcom/syndicate_mothership/control) -"mv" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin) +"mw" = ( +/turf/closed/indestructible/fakeglass, +/area/centcom/central_command_areas/firing_range_checkpoint_control) "mx" = ( /obj/machinery/power/shuttle_engine/heater{ resistance_flags = 3 @@ -4237,13 +4297,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) -"mJ" = ( -/obj/structure/noticeboard/directional/east, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supply) "mK" = ( /obj/machinery/light/cold/directional/east, /obj/item/kirbyplants/random, @@ -4405,6 +4458,11 @@ /obj/structure/railing/wood, /turf/open/floor/grass, /area/centcom/central_command_areas/hall) +"ni" = ( +/obj/item/fish/chasm_crab, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) "nj" = ( /obj/item/kirbyplants{ icon_state = "plant-22" @@ -4477,6 +4535,15 @@ /obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/airless, /area/centcom/syndicate_mothership) +"nv" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/obj/structure/railing/wood{ + dir = 1 + }, +/turf/open/floor/iron/dark/diagonal, +/area/centcom/central_command_areas/medical) "nw" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/structure/table/wood/fancy/royalblue, @@ -4646,6 +4713,10 @@ /obj/effect/turf_decal/siding/thinplating_new/dark, /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/control) +"ob" = ( +/obj/structure/closet/secure_closet/armory2, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range_checkpoint_control) "oc" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -4831,6 +4902,11 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) +"oF" = ( +/obj/machinery/door/airlock/centcom, +/obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range_checkpoint_control) "oG" = ( /obj/structure/chair/wood{ dir = 8 @@ -5236,6 +5312,13 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/expansion_bioterrorism) +"pF" = ( +/obj/machinery/door/airlock/centcom{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range_checkpoint_control) "pG" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/hall) @@ -5261,6 +5344,12 @@ }, /turf/open/space/basic, /area/space) +"pK" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/firing_range) "pN" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -5325,6 +5414,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/ferry) +"pS" = ( +/obj/structure/rack, +/obj/item/clothing/ears/earmuffs{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_y = 7 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range) "pT" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -5375,6 +5475,22 @@ "qc" = ( /turf/open/floor/mineral/titanium/tiled/yellow, /area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"qd" = ( +/obj/structure/rack, +/obj/item/gun/energy/laser/practice{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/gun/energy/laser/practice{ + pixel_x = 2; + pixel_y = 1 + }, +/obj/item/gun/energy/laser/practice{ + pixel_x = 2; + pixel_y = -2 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range) "qe" = ( /obj/structure/table/reinforced/titaniumglass, /obj/machinery/fax{ @@ -5522,6 +5638,24 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark/textured_large, /area/centcom/syndicate_mothership/control) +"qB" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/beaker/bluespace, +/obj/item/reagent_containers/cup/beaker/bluespace, +/obj/item/reagent_containers/cup/beaker/bluespace, +/obj/item/reagent_containers/cup/beaker/bluespace, +/obj/item/reagent_containers/cup/beaker/bluespace, +/obj/item/reagent_containers/cup/beaker/bluespace, +/obj/item/reagent_containers/cup/beaker/bluespace, +/obj/item/reagent_containers/cup/beaker/bluespace, +/obj/item/reagent_containers/cup/beaker/bluespace, +/obj/item/reagent_containers/cup/beaker/bluespace, +/obj/effect/turf_decal/siding/blue{ + dir = 1 + }, +/obj/machinery/door/window/right/directional/south, +/turf/open/floor/iron/dark/diagonal, +/area/centcom/central_command_areas/medical) "qC" = ( /obj/machinery/door/window/survival_pod{ dir = 8; @@ -5843,10 +5977,11 @@ /obj/effect/turf_decal/trimline/red, /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/expansion_chemicalwarfare) -"rD" = ( -/obj/structure/fans/tiny/invisible, -/turf/open/floor/carpet/green, -/area/centcom/central_command_areas/admin) +"rE" = ( +/obj/structure/table/reinforced, +/obj/item/radio, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range_checkpoint_control) "rF" = ( /obj/structure/chair/sofa/right{ dir = 8 @@ -5864,13 +5999,6 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) -"rI" = ( -/obj/effect/spawner/random/trash/garbage, -/obj/effect/spawner/random/structure/closet_maintenance, -/obj/structure/fans/tiny/invisible, -/obj/machinery/light/very_dim/directional, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin) "rJ" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/components/tank/nitrogen, @@ -5958,6 +6086,11 @@ /obj/effect/baseturf_helper/asteroid/snow, /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership/expansion_bioterrorism) +"rV" = ( +/obj/structure/falsewall/reinforced, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "rW" = ( /obj/structure/railing{ dir = 8; @@ -6076,17 +6209,14 @@ /obj/effect/baseturf_helper/asteroid/snow, /turf/closed/indestructible/rock/snow, /area/centcom/syndicate_mothership) +"sl" = ( +/obj/structure/closet/gimmick/tacticool, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range_checkpoint_control) "sm" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/evacuation/ship) -"sn" = ( -/obj/machinery/computer/camera_advanced{ - dir = 4 - }, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/carpet/green, -/area/centcom/central_command_areas/admin) "so" = ( /obj/effect/turf_decal/siding/green{ dir = 9 @@ -6199,6 +6329,13 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark/textured_large, /area/centcom/central_command_areas/evacuation/ship) +"sC" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range) "sD" = ( /obj/machinery/door/airlock/external/ruin, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -6237,6 +6374,15 @@ /obj/effect/turf_decal/tile/dark/opposingcorners, /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/hall) +"sK" = ( +/obj/machinery/door/airlock/centcom{ + dir = 4; + name = "Glyphee's Secret Office" + }, +/obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "sL" = ( /obj/effect/decal/cleanable/blood/splatter, /mob/living/basic/creature{ @@ -6277,6 +6423,12 @@ color = "#008000" }, /area/centcom/wizard_station) +"sR" = ( +/obj/structure/railing/wood, +/obj/structure/table/reinforced, +/obj/item/storage/medkit/tactical, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/medical) "sS" = ( /obj/effect/turf_decal/siding/dark{ dir = 5 @@ -6300,6 +6452,11 @@ }, /turf/open/floor/engine/cult, /area/centcom/wizard_station) +"sY" = ( +/obj/structure/table/reinforced, +/obj/machinery/vending/medical, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/medical) "sZ" = ( /obj/structure/railing/corner{ dir = 4 @@ -6528,12 +6685,6 @@ /obj/machinery/vending/wardrobe/science_wardrobe, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/hall) -"tD" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 1 - }, -/turf/open/floor/iron/dark/diagonal, -/area/centcom/central_command_areas/medical) "tE" = ( /obj/structure/sign/poster/contraband/masked_men{ pixel_x = 32 @@ -6618,6 +6769,9 @@ }, /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership/expansion_bombthreat) +"tU" = ( +/turf/closed/indestructible/fakeglass, +/area/centcom/central_command_areas/firing_range) "tV" = ( /obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/closed/indestructible/opsglass, @@ -6713,6 +6867,13 @@ "uk" = ( /turf/open/misc/grass, /area/centcom/central_command_areas/admin) +"ul" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) "um" = ( /obj/machinery/computer/communications{ dir = 1 @@ -6733,11 +6894,24 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plating, /area/centcom/syndicate_mothership/expansion_bombthreat) +"uo" = ( +/obj/structure/fans/tiny/invisible, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "uq" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/structure/chair/stool/bar/directional/south, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/borbop) +"ur" = ( +/obj/machinery/modular_computer/console/preset/id/centcom{ + dir = 4; + desc = "A specialized console to connect to gaming computers to be able to broadcast live. Seriously, where does Ook find this stuff?" + }, +/obj/structure/fans/tiny/invisible, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "us" = ( /obj/effect/turf_decal/siding/blue{ dir = 6 @@ -6760,6 +6934,14 @@ /obj/machinery/computer/records/medical/laptop, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) +"uv" = ( +/obj/machinery/door/airlock/centcom{ + dir = 4; + name = "Glyphee's Garbage Dump" + }, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) "uw" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -6929,6 +7111,16 @@ /obj/machinery/light/directional/north, /turf/open/floor/engine/cult, /area/centcom/wizard_station) +"uX" = ( +/obj/structure/railing/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/wood/parquet, +/area/centcom/central_command_areas/borbop) "uZ" = ( /obj/effect/turf_decal/siding/dark{ dir = 9 @@ -6968,6 +7160,13 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/medical) +"vf" = ( +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "vg" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /obj/effect/turf_decal/siding/dark{ @@ -7250,6 +7449,10 @@ }, /turf/open/floor/iron/freezer, /area/centcom/syndicate_mothership/control) +"vV" = ( +/obj/structure/hedge, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range) "vW" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -7380,6 +7583,10 @@ }, /turf/open/floor/carpet, /area/centcom/central_command_areas/admin) +"wq" = ( +/obj/structure/hedge, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range_checkpoint_control) "wr" = ( /obj/structure/chair{ dir = 4 @@ -7487,12 +7694,6 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/wood/large, /area/centcom/central_command_areas/ghost_spawn) -"wI" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/wood/large, -/area/centcom/central_command_areas/medical) "wK" = ( /obj/effect/turf_decal/siding/blue/corner{ dir = 4 @@ -7599,6 +7800,11 @@ /obj/structure/window/plasma/spawner/directional/north, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) +"xb" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/material, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/botany) "xc" = ( /obj/machinery/door/airlock/external/ruin{ name = "Ferry Airlock" @@ -7709,6 +7915,10 @@ }, /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"xs" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range) "xt" = ( /obj/docking_port/stationary{ area_type = /area/centcom/syndicate_mothership/control; @@ -7745,6 +7955,10 @@ /obj/item/kirbyplants/random, /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership) +"xy" = ( +/obj/structure/closet/secure_closet/contraband/armory, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range_checkpoint_control) "xz" = ( /obj/machinery/door/airlock/centcom, /turf/open/floor/iron/dark/diagonal, @@ -7788,14 +8002,6 @@ "xE" = ( /turf/open/misc/asteroid/snow/airless, /area/centcom/syndicate_mothership) -"xF" = ( -/obj/structure/sign/painting/library{ - pixel_x = 32 - }, -/obj/structure/fans/tiny/invisible, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/carpet/green, -/area/centcom/central_command_areas/admin) "xG" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/machinery/vending/wardrobe/det_wardrobe, @@ -7894,12 +8100,6 @@ "xU" = ( /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/control) -"xV" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood/large, -/area/centcom/central_command_areas/medical) "xW" = ( /obj/structure/bookcase/random/reference/wizard, /turf/open/floor/engine/cult, @@ -7946,12 +8146,6 @@ "yg" = ( /turf/open/floor/circuit/green, /area/centcom/central_command_areas/admin) -"yh" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/glass/reinforced, -/area/centcom/central_command_areas/hall) "yi" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, @@ -8945,6 +9139,12 @@ /obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/centcom/central_command_areas/hall) +"Bb" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/firing_range) "Bc" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, @@ -9061,6 +9261,33 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"Bn" = ( +/obj/structure/table/reinforced/titaniumglass, +/obj/machinery/door/window/left/directional/west{ + name = "Secret Stuff"; + req_access = list("robotics"); + dir = 4 + }, +/obj/item/reagent_containers/pill/adminordrazine{ + list_reagents = list(/datum/reagent/medicine/adminordrazine = 99999); + name = "sv_cheats 1"; + desc = "god"; + color = "#fcba03" + }, +/obj/structure/fans/tiny/invisible, +/obj/item/tank/internals/oxygen/yellow{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/tank/internals/oxygen/yellow{ + pixel_y = -7; + pixel_x = 7 + }, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) +"Bo" = ( +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range) "Bp" = ( /obj/structure/fence/door, /turf/open/misc/asteroid/snow/airless, @@ -9097,6 +9324,14 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/centcom/syndicate_mothership/control) +"Bw" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/delivery_chute, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "Bx" = ( /obj/structure/table/wood, /obj/item/food/syndicake{ @@ -9217,6 +9452,11 @@ }, /turf/open/floor/plastic, /area/centcom/syndicate_mothership/expansion_fridgerummage) +"BM" = ( +/obj/effect/decal/cleanable/garbage, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) "BO" = ( /obj/structure/bed{ dir = 4 @@ -9294,11 +9534,6 @@ }, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/borbop) -"Ca" = ( -/obj/structure/railing/wood, -/obj/structure/table/reinforced, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/medical) "Cc" = ( /obj/structure/chair/comfy/shuttle, /turf/open/floor/circuit/green, @@ -9451,6 +9686,11 @@ /obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/centcom/syndicate_mothership/control) +"CD" = ( +/obj/structure/table/reinforced, +/obj/item/megaphone/sec, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range_checkpoint_control) "CF" = ( /obj/machinery/suit_storage_unit/industrial, /obj/structure/window/reinforced/survival_pod/spawner/directional/east, @@ -9587,6 +9827,11 @@ }, /turf/open/floor/mineral/titanium, /area/centcom/syndicate_mothership/control) +"CZ" = ( +/obj/item/clothing/mask/facehugger/dead, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "Da" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/bodycontainer/morgue, @@ -9699,6 +9944,15 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/centcom/syndicate_mothership/control) +"Ds" = ( +/obj/structure/table/wood, +/obj/machinery/fax{ + name = "Glyphee's Fax Machine"; + fax_name = "Glyphee's Spam Mail" + }, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "Dt" = ( /obj/machinery/modular_computer/console/preset/id/centcom, /obj/effect/turf_decal/siding/dark{ @@ -9924,14 +10178,6 @@ }, /turf/open/floor/carpet, /area/centcom/wizard_station) -"Ef" = ( -/obj/structure/table/wood, -/obj/item/mod/control/pre_equipped/chrono{ - desc = "It smells freshly laundered." - }, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/carpet/green, -/area/centcom/central_command_areas/admin) "Eg" = ( /obj/machinery/door/airlock{ icon = 'icons/obj/doors/airlocks/station/uranium.dmi'; @@ -10140,6 +10386,11 @@ }, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/hall) +"EJ" = ( +/obj/effect/spawner/random/trash/garbage, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "EL" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 4 @@ -10236,12 +10487,13 @@ }, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/evacuation/ship) -"EW" = ( -/obj/structure/railing/wood, -/obj/structure/table/reinforced, -/obj/item/storage/backpack/duffelbag/med/surgery, +"EY" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/light/directional/south, /turf/open/floor/iron/dark, -/area/centcom/central_command_areas/medical) +/area/centcom/central_command_areas/firing_range_checkpoint_control) "EZ" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 @@ -10329,9 +10581,8 @@ /turf/open/floor/carpet/royalblue, /area/centcom/central_command_areas/admin) "Fn" = ( -/obj/structure/fans/tiny/invisible, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin) +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/firing_range) "Fo" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/machinery/vending/wardrobe/law_wardrobe, @@ -10384,11 +10635,11 @@ dir = 4 }, /area/centcom/syndicate_mothership/expansion_fridgerummage) -"Fy" = ( -/obj/effect/gibspawner/human/bodypartless, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/plating, -/area/centcom/central_command_areas/admin) +"Fx" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/centcom_teleporter/spawn_area, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/ghost_spawn) "Fz" = ( /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership) @@ -10519,10 +10770,6 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) -"FQ" = ( -/obj/structure/fans/tiny/invisible, -/turf/open/chasm, -/area/centcom/central_command_areas/admin) "FS" = ( /obj/machinery/computer/records/medical/laptop{ dir = 4 @@ -10586,6 +10833,10 @@ }, /turf/open/floor/circuit/telecomms, /area/centcom/central_command_areas/admin) +"Gd" = ( +/obj/structure/centcom_item_spawner/gun_and_ammo_creator, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range) "Ge" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -10603,10 +10854,12 @@ /turf/open/floor/engine/cult, /area/centcom/wizard_station) "Gg" = ( -/obj/effect/spawner/random/trash/garbage, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/plating, -/area/centcom/central_command_areas/admin) +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/firing_range) "Gh" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -10687,6 +10940,10 @@ }, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/borbop) +"Gq" = ( +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "Gr" = ( /obj/effect/turf_decal/siding/wideplating{ dir = 4 @@ -10825,6 +11082,9 @@ /obj/effect/spawner/random/bureaucracy/briefcase, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"GM" = ( +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range_checkpoint_control) "GN" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -10982,14 +11242,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/hall) -"Hj" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/delivery_chute, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/plating, -/area/centcom/central_command_areas/admin) "Hk" = ( /obj/effect/turf_decal/loading_area{ dir = 4 @@ -11265,6 +11517,13 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) +"Ia" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 9 + }, +/obj/machinery/smartfridge/chemistry/preloaded, +/turf/open/floor/iron/dark/diagonal, +/area/centcom/central_command_areas/medical) "Ib" = ( /obj/effect/turf_decal/siding/blue{ dir = 5 @@ -11405,10 +11664,6 @@ /obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid/snow/airless, /area/centcom/syndicate_mothership) -"IA" = ( -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/wood/large, -/area/centcom/central_command_areas/medical) "IB" = ( /obj/structure/closet, /obj/structure/window/plasma/spawner/directional/east, @@ -11796,6 +12051,10 @@ /obj/structure/mannequin, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/hall) +"JK" = ( +/obj/structure/fans/tiny/invisible, +/turf/open/chasm, +/area/centcom/central_command_areas/admin) "JL" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 1 @@ -11892,21 +12151,6 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) -"JY" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/beaker/bluespace, -/obj/item/reagent_containers/cup/beaker/bluespace, -/obj/item/reagent_containers/cup/beaker/bluespace, -/obj/item/reagent_containers/cup/beaker/bluespace, -/obj/item/reagent_containers/cup/beaker/bluespace, -/obj/item/reagent_containers/cup/beaker/bluespace, -/obj/item/reagent_containers/cup/beaker/bluespace, -/obj/item/reagent_containers/cup/beaker/bluespace, -/obj/item/reagent_containers/cup/beaker/bluespace, -/obj/item/reagent_containers/cup/beaker/bluespace, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood/large, -/area/centcom/central_command_areas/medical) "JZ" = ( /obj/machinery/smartfridge/chemistry/virology/preloaded, /turf/closed/indestructible/syndicate, @@ -12265,6 +12509,10 @@ }, /turf/open/space/basic, /area/space) +"KT" = ( +/obj/structure/closet/secure_closet/brig, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range_checkpoint_control) "KU" = ( /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/large, @@ -13034,6 +13282,12 @@ /obj/structure/noticeboard/directional/east, /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/expansion_bioterrorism) +"MU" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/firing_range) "MV" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 5 @@ -13152,13 +13406,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/centcom/syndicate_mothership/control) -"No" = ( -/obj/effect/turf_decal/tile/dark/opposingcorners, -/obj/effect/portal/permanent{ - id = "arena" - }, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) "Np" = ( /obj/structure/chair/office, /turf/open/floor/mineral/titanium/tiled/yellow, @@ -13338,6 +13585,16 @@ /obj/machinery/rnd/production/techfab/department/medical, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/medical) +"NT" = ( +/obj/structure/disposalpipe/loafer{ + dir = 4 + }, +/obj/structure/fans/tiny/invisible, +/obj/machinery/light/very_dim/directional{ + dir = 1 + }, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "NU" = ( /obj/effect/turf_decal/siding/wideplating/dark, /obj/structure/chair/sofa/bench, @@ -13509,17 +13766,14 @@ /obj/structure/railing, /turf/open/misc/asteroid/snow/icemoon, /area/centcom/syndicate_mothership/control) -"Ou" = ( -/obj/structure/chair/comfy/lime{ - dir = 8 - }, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/carpet/green, -/area/centcom/central_command_areas/admin) "Ov" = ( /obj/structure/chair/wood/wings, /turf/open/floor/engine/cult, /area/centcom/wizard_station) +"Ow" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range) "Ox" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/machinery/griddle, @@ -13751,12 +14005,6 @@ /obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/centcom/central_command_areas/hall) -"Pf" = ( -/obj/effect/turf_decal/siding/dark/end{ - dir = 1 - }, -/turf/closed/indestructible/riveted, -/area/centcom/central_command_areas/admin) "Pg" = ( /obj/structure/fake_stairs/wood/directional/north, /turf/open/indestructible/hotelwood, @@ -14148,30 +14396,6 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/iron/smooth_large, /area/centcom/central_command_areas/evacuation/ship) -"Qu" = ( -/obj/structure/table/reinforced/titaniumglass, -/obj/machinery/door/window/left/directional/west{ - name = "Secret Stuff"; - req_access = list("robotics"); - dir = 4 - }, -/obj/item/reagent_containers/pill/adminordrazine{ - list_reagents = list(/datum/reagent/medicine/adminordrazine = 99999); - name = "sv_cheats 1"; - desc = "god"; - color = "#fcba03" - }, -/obj/structure/fans/tiny/invisible, -/obj/item/tank/internals/oxygen/yellow{ - pixel_x = -7; - pixel_y = 7 - }, -/obj/item/tank/internals/oxygen/yellow{ - pixel_y = -7; - pixel_x = 7 - }, -/turf/open/floor/carpet/green, -/area/centcom/central_command_areas/admin) "Qv" = ( /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/siding/wood{ @@ -14346,6 +14570,12 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/admin_hangout) +"QT" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/firing_range) "QU" = ( /obj/structure/flora/tree/pine/style_random, /obj/structure/flora/grass/both/style_random, @@ -14376,6 +14606,14 @@ "QZ" = ( /turf/open/floor/engine/cult, /area/centcom/wizard_station) +"Ra" = ( +/obj/machinery/button/door/indestructible{ + id = "CC_firing_range_checkpoint"; + name = "Checkpoint Shutters" + }, +/obj/structure/table/reinforced, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range_checkpoint_control) "Rb" = ( /obj/machinery/chem_heater/withbuffer, /turf/open/floor/mineral/titanium/tiled/yellow, @@ -14412,6 +14650,13 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/supply) +"Rj" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/centcom_teleporter/arena, +/turf/open/floor/wood/large, +/area/centcom/tdome/observation) "Rk" = ( /obj/structure/cable, /obj/structure/marker_beacon/burgundy, @@ -14514,6 +14759,10 @@ icon_state = "boxing" }, /area/centcom/central_command_areas/hall) +"Ry" = ( +/obj/structure/table/reinforced, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range) "Rz" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -14669,6 +14918,9 @@ }, /turf/open/lava/plasma/ice_moon, /area/centcom/syndicate_mothership/control) +"RS" = ( +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/firing_range) "RT" = ( /obj/machinery/light/directional/south, /turf/open/floor/grass, @@ -14754,6 +15006,13 @@ /obj/structure/fans/tiny, /turf/open/floor/mineral/titanium, /area/centcom/syndicate_mothership/control) +"Sh" = ( +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/maintenance/two, +/obj/machinery/recycler/deathtrap, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating, +/area/centcom/central_command_areas/admin) "Si" = ( /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/two) @@ -14831,34 +15090,6 @@ /obj/structure/fake_stairs/wood/directional/south, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) -"Su" = ( -/obj/structure/table/reinforced/titaniumglass, -/obj/structure/window/reinforced/survival_pod/spawner/directional{ - dir = 1 - }, -/obj/machinery/door/window/left/directional/west{ - name = "Secret Stuff"; - req_access = list("robotics"); - dir = 4 - }, -/obj/item/melee/powerfist{ - name = "Iron"; - desc = "You load sixteen tons..."; - force = 1000; - pixel_y = 4; - color = "#fcba03" - }, -/obj/structure/fans/tiny/invisible, -/obj/machinery/light/floor/has_bulb, -/obj/item/melee/powerfist{ - name = "Steel"; - desc = "Another day older and deeper in debt..."; - force = 1000; - pixel_y = -4; - color = "#fcba03" - }, -/turf/open/floor/carpet/green, -/area/centcom/central_command_areas/admin) "Sv" = ( /obj/effect/turf_decal/trimline/blue, /turf/open/floor/iron/dark, @@ -15062,6 +15293,13 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/centcom/central_command_areas/armory) +"SV" = ( +/obj/structure/chair/comfy/lime{ + dir = 8 + }, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "SW" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -15147,6 +15385,14 @@ /obj/effect/spawner/random/bureaucracy/paper, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"Tl" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 5 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/chem_heater/debug, +/turf/open/floor/iron/dark/diagonal, +/area/centcom/central_command_areas/medical) "Tm" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/red, @@ -15391,6 +15637,34 @@ /obj/structure/window/plasma/spawner/directional/north, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) +"Ua" = ( +/obj/structure/table/reinforced/titaniumglass, +/obj/structure/window/reinforced/survival_pod/spawner/directional{ + dir = 1 + }, +/obj/machinery/door/window/left/directional/west{ + name = "Secret Stuff"; + req_access = list("robotics"); + dir = 4 + }, +/obj/item/melee/powerfist{ + name = "Iron"; + desc = "You load sixteen tons..."; + force = 1000; + pixel_y = 4; + color = "#fcba03" + }, +/obj/structure/fans/tiny/invisible, +/obj/machinery/light/floor/has_bulb, +/obj/item/melee/powerfist{ + name = "Steel"; + desc = "Another day older and deeper in debt..."; + force = 1000; + pixel_y = -4; + color = "#fcba03" + }, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/admin) "Ub" = ( /obj/machinery/vending/tool, /turf/open/floor/mineral/titanium/yellow, @@ -15446,6 +15720,10 @@ /obj/item/radio/headset, /turf/open/floor/wood, /area/centcom/wizard_station) +"Un" = ( +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/firing_range) "Up" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/light/neon_lining{ @@ -15500,19 +15778,6 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/ghost_spawn) -"Uy" = ( -/obj/structure/railing/wood{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/light/floor/has_bulb, -/obj/effect/portal/permanent{ - id = "arena" - }, -/turf/open/floor/wood/parquet, -/area/centcom/central_command_areas/borbop) "Uz" = ( /turf/closed/indestructible/fakeglass, /area/centcom/central_command_areas/hall) @@ -15631,12 +15896,9 @@ /turf/open/floor/mineral/titanium, /area/centcom/syndicate_mothership/control) "UR" = ( -/obj/structure/sign/painting/library{ - pixel_x = 32 - }, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/carpet/green, -/area/centcom/central_command_areas/admin) +/obj/structure/training_machine, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range) "US" = ( /obj/structure/window/plasma/spawner/directional/north, /turf/open/indestructible/hotelwood, @@ -15654,6 +15916,11 @@ /obj/effect/spawner/random/exotic/antag_gear, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"UU" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin/carbon, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range_checkpoint_control) "UX" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -15667,14 +15934,18 @@ "UY" = ( /turf/open/floor/iron/dark/diagonal, /area/centcom/central_command_areas/medical) +"UZ" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/firing_range) "Va" = ( /obj/machinery/fishing_portal_generator, /turf/open/floor/carpet/neon/simple/cyan, /area/centcom/central_command_areas/admin) -"Vb" = ( -/obj/machinery/door/airlock/centcom, -/turf/open/floor/iron/dark/diagonal, -/area/centcom/central_command_areas/medical) "Vc" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp, @@ -15781,12 +16052,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/three) -"Vo" = ( -/obj/effect/spawner/random/trash/garbage, -/obj/effect/spawner/random/structure/closet_maintenance, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin) "Vp" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/structure/table/wood/fancy/royalblue, @@ -15807,6 +16072,11 @@ }, /turf/open/misc/asteroid/snow/airless, /area/centcom/syndicate_mothership) +"Vr" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/material, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/medical) "Vs" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/structure/table/wood/fancy/royalblue, @@ -15905,11 +16175,6 @@ dir = 4 }, /area/centcom/syndicate_mothership/control) -"VD" = ( -/obj/item/fish/chasm_crab, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin) "VE" = ( /obj/structure/table/reinforced, /obj/item/gun/ballistic/automatic/wt550, @@ -16257,6 +16522,12 @@ }, /turf/open/floor/circuit/telecomms, /area/centcom/central_command_areas/admin) +"WI" = ( +/obj/effect/turf_decal/siding/dark/end{ + dir = 1 + }, +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/admin) "WJ" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -16437,15 +16708,6 @@ "Xh" = ( /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/four) -"Xi" = ( -/obj/machinery/door/airlock/centcom{ - dir = 4; - name = "Glyphee's Secret Office" - }, -/obj/effect/mapping_helpers/airlock/access/any/admin/captain, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/carpet/green, -/area/centcom/central_command_areas/admin) "Xj" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ @@ -16501,10 +16763,6 @@ /obj/machinery/computer/monitor, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) -"Xq" = ( -/obj/structure/fans/tiny/invisible, -/turf/open/floor/plating, -/area/centcom/central_command_areas/admin) "Xr" = ( /obj/machinery/keycard_auth/directional/south, /obj/structure/table/reinforced, @@ -16607,15 +16865,6 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/supply) -"XG" = ( -/obj/machinery/modular_computer/console/preset/id/centcom{ - dir = 4; - desc = "A specialized console to connect to gaming computers to be able to broadcast live. Seriously, where does Ook find this stuff?" - }, -/obj/structure/fans/tiny/invisible, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/carpet/green, -/area/centcom/central_command_areas/admin) "XH" = ( /obj/effect/turf_decal/stripes/end{ dir = 8 @@ -16814,15 +17063,6 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) -"Yl" = ( -/obj/structure/table/wood, -/obj/machinery/fax{ - name = "Glyphee's Fax Machine"; - fax_name = "Glyphee's Spam Mail" - }, -/obj/structure/fans/tiny/invisible, -/turf/open/floor/carpet/green, -/area/centcom/central_command_areas/admin) "Yn" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/supplypod) @@ -16849,19 +17089,6 @@ /obj/structure/sink/directional/south, /turf/open/floor/iron/white, /area/centcom/wizard_station) -"Yw" = ( -/obj/structure/table/reinforced, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_y = 10; - pixel_x = -10 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/medical) "Yx" = ( /turf/open/floor/iron/white/herringbone, /area/centcom/central_command_areas/evacuation/ship) @@ -16885,10 +17112,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/wood, /area/centcom/wizard_station) -"YB" = ( -/obj/structure/reagent_dispensers/watertank/high, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/botany) "YC" = ( /obj/structure/hedge, /obj/structure/railing/wood, @@ -16947,6 +17170,12 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/hall) +"YP" = ( +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/structure/closet_maintenance, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin) "YR" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -16992,6 +17221,19 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) +"YY" = ( +/obj/machinery/computer/atmos_control/noreconnect{ + atmos_chambers = list("nukiebase"="Burn Chamber"); + desc = "Used to monitor the Syndicate Ordnance Laboratory's burn chamber."; + dir = 1; + name = "Ordnance Chamber Monitor" + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/cold/directional/west{ + dir = 2 + }, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bombthreat) "YZ" = ( /obj/effect/turf_decal/siding/green{ dir = 1 @@ -22148,7 +22390,7 @@ DJ gJ fM SB -el +YY gM hJ hJ @@ -46324,11 +46566,11 @@ aa aa aa On -Yl -XG -sn -Su -Qu +Ds +ur +jh +Ua +Bn On bF KB @@ -46581,11 +46823,11 @@ Zf Zf On On -Ef -rD -Ou -rD -rD +gD +uo +SV +uo +uo On lm Zn @@ -46838,11 +47080,11 @@ nO uk hp On -rD -xF -UR -xF -rD +uo +eB +vf +eB +uo On TQ AS @@ -47095,7 +47337,7 @@ uk uk RK On -Xi +sK On On On @@ -47352,11 +47594,11 @@ Ji RZ yw On -hF +rV On -Vo -fC -FQ +YP +cW +JK On TQ FI @@ -47609,11 +47851,11 @@ Ji uk xP On -mv -bK -Fy -VD -rI +ul +CZ +eD +ni +ks On TQ FI @@ -47843,7 +48085,7 @@ wM ac iF XA -mJ +bL lq XK iF @@ -47866,11 +48108,11 @@ Ji uk uk On -eB -Fn -Xq -Xq -ds +NT +hB +Gq +Gq +BM On TQ AS @@ -48123,11 +48365,11 @@ Ji uk dU On -Hj -Gg -Xq -Fy -lv +Bw +EJ +Gq +eD +Sh On aO qx @@ -48382,10 +48624,10 @@ On On On On -ll +uv On On -Pf +WI qZ qZ qZ @@ -48891,7 +49133,7 @@ Mc Mc Mc dQ -Mc +bK Mc Mc Mc @@ -55296,7 +55538,7 @@ rL dS pG pG -pG +rj rj Xb uQ @@ -56311,7 +56553,7 @@ yG dS dS LK -RX +aX Wi XE tv @@ -56899,18 +57141,18 @@ pq ew gc QC -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Fn +Fn +Fn +Fn +Fn +Fn +Fn +lr +lr +lr +lr +lr aa "} (155,1,1) = {" @@ -57153,21 +57395,21 @@ TV qM Mo Jd -ew -ew -QC -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +xp +Ht +Ht +pK +pK +pK +Gg +pK +pK +Bb +mw +rE +GM +KT +lr aa "} (156,1,1) = {" @@ -57339,7 +57581,7 @@ NJ dS dS LK -RX +aX Wi XE tv @@ -57406,25 +57648,25 @@ TV ok Mo St -TV +Rj qM Mo Jd -No -dh -QC -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +TV +Nf +Wb +RS +RS +RS +RS +RS +RS +Un +oF +GM +GM +EY +lr aa "} (157,1,1) = {" @@ -57667,21 +57909,21 @@ TV qM Mo Jd -ew -ew -QC -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Xx +Mp +Mp +MU +MU +MU +MU +MU +MU +QT +mw +wq +GM +xy +lr aa "} (158,1,1) = {" @@ -57927,18 +58169,18 @@ pq ew qH QC -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +tU +tU +la +tU +la +tU +tU +lr +lr +pF +lr +lr aa "} (159,1,1) = {" @@ -58107,7 +58349,7 @@ aa aa aa gL -YB +xb LK LK IM @@ -58184,18 +58426,18 @@ ae ew Fo QC -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Bo +Bo +Bo +tU +Bo +Bo +Bo +mw +Ra +GM +kQ +lr aa "} (160,1,1) = {" @@ -58380,7 +58622,7 @@ et dS pG pG -pG +rj rj Xb uQ @@ -58441,18 +58683,18 @@ ae ew UL QC -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +fO +tU +tU +tU +tU +tU +fO +mw +aB +GM +kP +lr aa "} (161,1,1) = {" @@ -58621,7 +58863,7 @@ aa aa aa gL -YB +Hn LK LK RX @@ -58698,18 +58940,18 @@ pq ew Ik QC -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Bo +Bo +Bo +tU +Bo +Bo +Bo +mw +UU +GM +ob +lr aa "} (162,1,1) = {" @@ -58955,18 +59197,18 @@ Jd ew ew QC -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +tU +tU +la +tU +la +tU +tU +lr +lr +pF +lr +lr aa "} (163,1,1) = {" @@ -59212,18 +59454,18 @@ Jd ew dh QC -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Bo +Bo +Bo +Bo +Bo +Bo +Bo +mw +wq +GM +xy +lr aa "} (164,1,1) = {" @@ -59419,7 +59661,7 @@ Of Ka Ch hQ -Uy +uX Eo Ch te @@ -59469,18 +59711,18 @@ pq ew ew QC -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Bo +Bo +Bo +Bo +Bo +Bo +Bo +oF +GM +GM +EY +lr aa "} (165,1,1) = {" @@ -59726,18 +59968,18 @@ ae ew ew QC -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +vV +Bo +Bo +xs +Bo +Bo +Bo +mw +CD +GM +sl +lr aa "} (166,1,1) = {" @@ -59983,18 +60225,18 @@ QC TN df QC -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Fn +Fn +iv +Fn +iv +Fn +Fn +lr +lr +lr +lr +lr aa "} (167,1,1) = {" @@ -60240,18 +60482,18 @@ QC QC QC QC -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +vV +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +vV +Fn aa "} (168,1,1) = {" @@ -60496,19 +60738,19 @@ yi pG aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Fn +Bo +Bo +Bo +Ow +Bo +Gd +Bo +Ow +Bo +Bo +pS +Fn aa "} (169,1,1) = {" @@ -60699,7 +60941,7 @@ DR hL uC wH -Xc +Fx Pg fH lX @@ -60753,19 +60995,19 @@ yi pG aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Fn +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +qd +Fn aa "} (170,1,1) = {" @@ -61010,19 +61252,19 @@ yi pG aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Fn +dc +Ry +sC +Ry +sC +Ry +sC +Ry +sC +Ry +UZ +Fn aa "} (171,1,1) = {" @@ -61267,19 +61509,19 @@ Ct pG aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Fn +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Fn aa "} (172,1,1) = {" @@ -61524,19 +61766,19 @@ yi pG aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Fn +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Fn aa "} (173,1,1) = {" @@ -61781,19 +62023,19 @@ yi pG aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Fn +Bo +Bo +Bo +Ow +Bo +Bo +Bo +Ow +Bo +Bo +Bo +Fn aa "} (174,1,1) = {" @@ -62038,19 +62280,19 @@ yi pG aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Fn +Bo +UR +Bo +UR +Bo +UR +Bo +UR +Bo +UR +Bo +Fn aa "} (175,1,1) = {" @@ -62295,19 +62537,19 @@ yi pG aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Fn +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Fn aa "} (176,1,1) = {" @@ -62552,19 +62794,19 @@ yi pG aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Fn +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Bo +Fn aa "} (177,1,1) = {" @@ -62733,7 +62975,7 @@ aa aa aa dl -jM +sY Nb Nb YL @@ -62809,19 +63051,19 @@ yi pG aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Fn +vV +Bo +xs +Bo +Bo +Bo +Bo +Bo +xs +Bo +vV +Fn aa "} (178,1,1) = {" @@ -63006,7 +63248,7 @@ cR we pG pG -pG +rj rj Xb uQ @@ -63068,17 +63310,17 @@ pG pG pG pG -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Fn +Fn +Fn +Fn +Fn +Fn +Fn +Fn +Fn +Fn +Fn aa "} (179,1,1) = {" @@ -63247,17 +63489,17 @@ aa aa aa dl -Yw +Vr Nb Nb Nb yj Qm -zp -dl -Kq +vR +Rq +Ia wG -UY +kC UY zH we @@ -63510,11 +63752,11 @@ Nb Nb yj CW +vS zp -Vb -tD +qB tk -UY +kC tk zI WW @@ -63767,11 +64009,11 @@ Nb YL yo NR -zp -dl -OJ -cK +fF +xq +Tl cK +jE cK HI WW @@ -64278,12 +64520,12 @@ Nb Zz dl Nb -FF +sR ux vS vR -xV -Rq +lH +iM rP pw gz @@ -64535,12 +64777,12 @@ Nb XW Cx UA -Ca +FF Re vS vS -IA -JY +mb +dl rP zk zk @@ -64792,12 +65034,12 @@ Nb FV dl Nb -EW +sR ux vS fF -wI -xq +vW +iM rP pw HW @@ -65309,11 +65551,11 @@ Nb YL eK hM -zp -dl -Kq -mr +vR +Rq +Ia mr +nv mr hm WW @@ -65566,11 +65808,11 @@ Nb Nb yj CW +vS zp -Vb -tD +qB tk -UY +kC tk zI WW @@ -65823,11 +66065,11 @@ Nb Nb yj Qm -zp -dl -OJ +fF +xq +Tl wK -UY +kC UY zH we @@ -65888,7 +66130,7 @@ rj rj rj JB -yh +ET YX rj rj @@ -66090,7 +66332,7 @@ us we pG pG -pG +rj rj Xb uQ @@ -66139,7 +66381,7 @@ aa aa aa aa -aa +pG pG pG pG diff --git a/monkestation/code/modules/ghost_players/area_changes.dm b/monkestation/code/modules/ghost_players/area_changes.dm index 7d9d14b28b11..cd4be4ef0685 100644 --- a/monkestation/code/modules/ghost_players/area_changes.dm +++ b/monkestation/code/modules/ghost_players/area_changes.dm @@ -55,6 +55,13 @@ /area/centcom/central_command_areas/admin area_flags = NOTELEPORT | GHOST_AREA | NO_EXPLOSIONS_DURING | NO_GHOSTS_DURING_ROUND +/area/centcom/central_command_areas/firing_range + name = "Centcom Firing Range" + area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA | NO_EXPLOSIONS_DURING + +/area/centcom/central_command_areas/firing_range_checkpoint_control + area_flags = UNIQUE_AREA | NOTELEPORT | NO_EXPLOSIONS_DURING + /area/Entered(mob/M) . = ..() if(!(area_flags & GHOST_AREA) && istype(M, /mob/living/carbon/human/ghost)) diff --git a/monkestation/code/modules/ghost_players/arena/arena_items.dm b/monkestation/code/modules/ghost_players/arena/arena_items.dm new file mode 100644 index 000000000000..7f8b85f43425 --- /dev/null +++ b/monkestation/code/modules/ghost_players/arena/arena_items.dm @@ -0,0 +1,5 @@ +//variant that grants CQC as soon as it is used +/obj/item/book/granter/martial/cqc/fast_read/attack_self(mob/living/user) + uses-- + on_reading_finished(user) + . = ..() diff --git a/monkestation/code/modules/ghost_players/arena/fight_button.dm b/monkestation/code/modules/ghost_players/arena/fight_button.dm index 5bcbb6f429c2..fc4e063bac70 100644 --- a/monkestation/code/modules/ghost_players/arena/fight_button.dm +++ b/monkestation/code/modules/ghost_players/arena/fight_button.dm @@ -15,12 +15,23 @@ var/obj/item/weapon_of_choice = /obj/item/storage/toolbox ///the wager in monkecoins thats paid out to the winner var/payout = 0 + ///list of weakrefs to spawned weapons for deletion on duel end + var/list/spawned_weapons = list() + ///what weapons can players choose to duel with var/list/weapon_choices = list( /obj/item/storage/toolbox, /obj/item/knife/shiv, /obj/item/grenade/clusterbuster, /obj/item/spear/bamboospear, + /obj/item/reagent_containers/spray/chemsprayer/magical, //unsure if this would cause issues but they do already have access to a full chem lab so it should be fine + /obj/item/gun/energy/laser/instakill, //first to hit the other wins, very fast matches + /obj/item/melee/baton/security/loaded, + /obj/item/chainsaw, + /obj/item/melee/energy/sword/saber, + /obj/item/book/granter/martial/cqc/fast_read, + /obj/item/gun/ballistic/revolver, + /obj/item/melee/energy/axe, ) /obj/structure/fight_button/Initialize(mapload) @@ -138,6 +149,7 @@ player_two.fully_heal() var/obj/item/one_weapon = new weapon_of_choice(src) + spawned_weapons += WEAKREF(one_weapon) var/turf/one_spot = locate(148, 34, SSmapping.levels_by_trait(ZTRAIT_CENTCOM)[1]) player_one.forceMove(one_spot) player_one.equipOutfit(/datum/outfit/job/assistant) @@ -145,6 +157,7 @@ player_one.dueling = TRUE var/obj/item/two_weapon = new weapon_of_choice(src) + spawned_weapons += WEAKREF(two_weapon) var/turf/two_spot = locate(164, 34, SSmapping.levels_by_trait(ZTRAIT_CENTCOM)[1]) player_two.forceMove(two_spot) player_two.equipOutfit(/datum/outfit/job/assistant) @@ -168,3 +181,7 @@ payout = 0 update_maptext() + for(var/datum/weakref/weapon in spawned_weapons) + var/obj/item/spawned_weapon = weapon?.resolve() + if(spawned_weapon) + qdel(spawned_weapon) diff --git a/monkestation/code/modules/ghost_players/centcom_teleporter.dm b/monkestation/code/modules/ghost_players/centcom_teleporter.dm new file mode 100644 index 000000000000..8f69b7cf7016 --- /dev/null +++ b/monkestation/code/modules/ghost_players/centcom_teleporter.dm @@ -0,0 +1,63 @@ +#define RIGHTS_NONE "none" +//can be used to teleport to any other centcom_teleporter(admin teleporters can only be used by people with R_ADMIN) +/obj/structure/centcom_teleporter + name = "centcom teleporter" + desc = "Can teleport you to any other centcom teleporter you have access to." + + resistance_flags = INDESTRUCTIBLE + anchored = TRUE + + icon = 'icons/obj/money_machine.dmi' + icon_state = "bogdanoff" + ///static assoc list of lists of centcom teleporters, keyed to strings of what rights they require to use + var/static/list/all_teleporters = list() + ///what rights do we need to be used + var/needed_rights = RIGHTS_NONE + +/obj/structure/centcom_teleporter/Initialize(mapload) + . = ..() + if(!all_teleporters["[needed_rights]"]) + all_teleporters["[needed_rights]"] = list(src) + else + all_teleporters["[needed_rights]"] += src + +/obj/structure/centcom_teleporter/Destroy() + all_teleporters["[needed_rights]"] -= src + return ..() + +/obj/structure/centcom_teleporter/attack_hand(mob/living/user, list/modifiers) + . = ..() + if(!user.client || (needed_rights != RIGHTS_NONE && !check_rights_for(user.client, needed_rights))) + return + + var/list/choice_list = list() + for(var/teleporter_list in all_teleporters) + if((teleporter_list == RIGHTS_NONE) || check_rights_for(user.client, text2num(teleporter_list))) + choice_list += all_teleporters[teleporter_list] + + var/obj/structure/centcom_teleporter/choice = tgui_input_list(user, "Where do you want to teleport to?", "Teleporter", choice_list) + if(!istype(choice)) + return + + if((choice.needed_rights != RIGHTS_NONE) && !check_rights_for(user.client, choice.needed_rights)) + to_chat(user, span_warning("You dont have the admin rights to teleport here.")) + message_admins("[user][ADMIN_LOOKUPFLW(user)] is trying to use a centcom teleporter they dont have access to.") //these should not be visible to them so tell admins + return + + do_teleport(user, get_turf(choice), no_effects = TRUE, forced = TRUE) + +/obj/structure/centcom_teleporter/spawn_area + name = "spawn area teleporter" + +/obj/structure/centcom_teleporter/arena + name = "arena teleporter" + +/obj/structure/centcom_teleporter/cargo + name = "centcom cargo teleporter" + needed_rights = R_ADMIN + +/obj/structure/centcom_teleporter/admin_offices + name = "admin offices teleporter" + needed_rights = R_ADMIN + +#undef RIGHTS_NONE diff --git a/monkestation/code/modules/ghost_players/job_helpers/_centcom_item_spawner.dm b/monkestation/code/modules/ghost_players/job_helpers/_centcom_item_spawner.dm new file mode 100644 index 000000000000..2ddfe10c0dad --- /dev/null +++ b/monkestation/code/modules/ghost_players/job_helpers/_centcom_item_spawner.dm @@ -0,0 +1,54 @@ +/obj/structure/centcom_item_spawner + name = "centcom item spawner" + desc = "This is the abstract type of an object, you should not see this." + resistance_flags = INDESTRUCTIBLE + anchored = TRUE + icon = 'icons/obj/money_machine.dmi' + icon_state = "bogdanoff" + ///what do we say() when we fabricate something + var/fabrication_phrase = "fabrication complete" + ///list of exact types this spawner will not be able to spawn + var/list/blacklisted_items = list() + ///typesof() these types will not be able to be spawned + var/list/blacklisted_types = list() + /** + * assoc list of category name stings as keys with lists of what types they can spawn as values. + * category is always required, even if you only have 1. however, if there is only 1 category then it will be removed and category selection for the player will be skipped + **/ + var/list/items_to_spawn = list() + +/obj/structure/centcom_item_spawner/Initialize(mapload) + . = ..() + build_items_to_spawn() + +/obj/structure/centcom_item_spawner/attack_hand(mob/living/user, list/modifiers) + . = ..() + var/choice + if(length(items_to_spawn == 1)) + choice = 1 //this will act as an access key + else + choice = tgui_input_list(user, "What do you wish to fabricate?", "[src.name]", items_to_spawn) + + if(!choice) + return + + var/atom/second_choice = tgui_input_list(user, "Choose what to fabricate", "[choice]", items_to_spawn[choice]) + if(type in blacklisted_items) //should not be visible but just be extra sure we cant print these + return + + new second_choice(get_turf(src)) + say("[fabrication_phrase]") + playsound(src, 'sound/machines/ding.ogg', 50, TRUE) + +///build our items to spawn, override this to generate items_to_spawn, call parent at the END of your override +/obj/structure/centcom_item_spawner/proc/build_items_to_spawn() + for(var/type as anything in blacklisted_types) + blacklisted_items += typesof(type) + + for(var/category in items_to_spawn) + if(length(items_to_spawn) == 1) //if our length is 1 then turn us into a normal list that just contains our single category list + items_to_spawn = list(items_to_spawn[category]) + break + for(var/type in items_to_spawn[category]) + if(type in blacklisted_items) + items_to_spawn[category] -= type diff --git a/monkestation/code/modules/ghost_players/job_helpers/firing_range_helper.dm b/monkestation/code/modules/ghost_players/job_helpers/firing_range_helper.dm new file mode 100644 index 000000000000..1973d381578a --- /dev/null +++ b/monkestation/code/modules/ghost_players/job_helpers/firing_range_helper.dm @@ -0,0 +1,84 @@ +/obj/structure/centcom_item_spawner/gun_and_ammo_creator + name = "firing range fabrication device" + desc = "Able to print most guns and ammo your heart could ever desire.(not liable for any damages)" + resistance_flags = INDESTRUCTIBLE + anchored = TRUE + icon = 'icons/obj/money_machine.dmi' + icon_state = "bogdanoff" + blacklisted_items = list( + /obj/item/gun/ballistic, + /obj/item/gun/ballistic/automatic, + /obj/item/gun/blastcannon, + /obj/item/gun/energy, + /obj/item/gun/energy/minigun, //might runtime + /obj/item/gun/energy/pulse/prize, //dont spam ghosts + /obj/item/gun/energy/shrink_ray, + /obj/item/gun/energy/mindflayer, + /obj/item/gun/energy/recharge, + /obj/item/gun/energy/wiremod_gun, + /obj/item/gun/energy/xray, + /obj/item/gun/magic, + /obj/item/gun/magic/bloodchill, + /obj/item/gun/magic/staff, + /obj/item/gun/magic/staff/animate, + /obj/item/gun/magic/staff/change, + /obj/item/gun/magic/staff/chaos, + /obj/item/gun/magic/staff/door, + /obj/item/gun/magic/staff/flying, + /obj/item/gun/magic/staff/honk, + /obj/item/gun/magic/staff/necropotence, + /obj/item/gun/magic/staff/wipe, + /obj/item/gun/magic/tentacle, + /obj/item/gun/magic/wand, + /obj/item/gun/magic/wand/door, + /obj/item/gun/magic/wand/polymorph, + /obj/item/gun/magic/wand/teleport, + /obj/item/ammo_box/c38/trac, + /obj/item/ammo_box/magazine/m556/phasic, + /obj/item/ammo_box/magazine/sniper_rounds/penetrator, + /obj/item/ammo_box/magazine, + /obj/item/ammo_box/magazine/toy, + ) + blacklisted_types = list( + /obj/item/ammo_box/magazine/internal, + /obj/item/gun/energy/e_gun/dragnet, + /obj/item/gun/energy/ionrifle, + /obj/item/gun/energy/laser/instakill, + /obj/item/gun/energy/meteorgun, + /obj/item/gun/energy/wormhole_projector, + /obj/item/gun/magic/staff/chaos, + /obj/item/gun/magic/wand/death, + /obj/item/gun/magic/wand/safety, + /obj/item/gun/medbeam, + ) + +/obj/structure/centcom_item_spawner/gun_and_ammo_creator/build_items_to_spawn() + items_to_spawn["Ballistic"] = subtypesof(/obj/item/gun/ballistic) + items_to_spawn["Energy"] = subtypesof(/obj/item/gun/energy) + items_to_spawn["Magic"] = subtypesof(/obj/item/gun/magic) + items_to_spawn["Ammo"] = subtypesof(/obj/item/ammo_box) + items_to_spawn["Other"] = list( + /obj/item/gun/chem, + /obj/item/gun/grenadelauncher, + /obj/structure/training_machine, + /mob/living/carbon/human) + typesof(/obj/item/gun/syringe, /obj/item/target) + . = ..() + +//blocks passage if you have a gun +/obj/effect/gun_check_blocker + name = "anti gun barrier" + desc = "\"No guns outside the designated area\" is printed below it." + icon = 'goon/icons/obj/meteor_shield.dmi' + icon_state = "shieldw" + color = COLOR_RED + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + anchored = TRUE + +/obj/effect/gun_check_blocker/CanPass(atom/movable/mover, border_dir) + if(istype(mover, /obj/item/gun)) + return FALSE + for(var/object in mover.get_all_contents()) + if(istype(object, /obj/item/gun)) + return FALSE + return ..() + diff --git a/tgstation.dme b/tgstation.dme index 5731cf276e3d..ada172fa6251 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6026,8 +6026,10 @@ #include "monkestation\code\modules\events\wizard\summon_gifts.dm" #include "monkestation\code\modules\food_and_drinks\recipes\boiling.dm" #include "monkestation\code\modules\ghost_players\area_changes.dm" +#include "monkestation\code\modules\ghost_players\centcom_teleporter.dm" #include "monkestation\code\modules\ghost_players\ghost_player.dm" #include "monkestation\code\modules\ghost_players\arena\arena_cleanser.dm" +#include "monkestation\code\modules\ghost_players\arena\arena_items.dm" #include "monkestation\code\modules\ghost_players\arena\fight_button.dm" #include "monkestation\code\modules\ghost_players\arena\map_templates.dm" #include "monkestation\code\modules\ghost_players\arena\arena_assets\alien.dm" @@ -6037,6 +6039,8 @@ #include "monkestation\code\modules\ghost_players\arena\arena_assets\fish.dm" #include "monkestation\code\modules\ghost_players\arena\arena_assets\statues.dm" #include "monkestation\code\modules\ghost_players\arena\arena_assets\water.dm" +#include "monkestation\code\modules\ghost_players\job_helpers\_centcom_item_spawner.dm" +#include "monkestation\code\modules\ghost_players\job_helpers\firing_range_helper.dm" #include "monkestation\code\modules\ghost_players\job_helpers\food_machine.dm" #include "monkestation\code\modules\ghost_players\job_helpers\hydroponics_helper.dm" #include "monkestation\code\modules\ghost_players\job_helpers\injured_spawner.dm"