diff --git a/_maps/map_files/MetaStation/MetaStation.v41G.dmm b/_maps/map_files/MetaStation/MetaStation.v41G.dmm index 51cf098c9f5..a746099e299 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41G.dmm +++ b/_maps/map_files/MetaStation/MetaStation.v41G.dmm @@ -170,13 +170,6 @@ "adn" = (/turf/simulated/floor/plating,/obj/structure/shuttle/engine/propulsion/burst{dir = 4},/turf/simulated/wall/shuttle{icon_state = "swall_f6"; dir = 2},/area/shuttle/pod_3) "ado" = (/turf/simulated/wall/shuttle{icon_state = "swall12"; dir = 2},/area/shuttle/pod_3) "adp" = (/turf/simulated/wall/shuttle{icon_state = "swall_s10"; dir = 2},/area/shuttle/pod_3) -"aht" = (/obj/structure/table,/obj/item/weapon/poster/contraband,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fore) -"ahK" = (/obj/item/stack/sheet/cardboard,/obj/machinery/light_construct/small{dir = 1},/obj/structure/closet/crate,/obj/item/weapon/coin/silver,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/watertank,/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/poster/contraband,/obj/item/weapon/poster/contraband,/obj/item/weapon/poster/contraband,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"alV" = (/obj/structure/table/reinforced,/obj/machinery/light_construct/small{dir = 8},/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/structure/window/reinforced,/obj/item/weapon/poster/legit,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"aqj" = (/obj/structure/table/reinforced,/obj/machinery/door/window/westleft{base_state = "right"; dir = 4; icon_state = "right"; name = "Outer Window"; req_access_txt = "0"},/obj/machinery/door/window/brigdoor{dir = 8; name = "Brig Control Desk"; req_access_txt = "3"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/item/weapon/folder/red,/obj/item/weapon/folder/red,/obj/item/weapon/poster/legit,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) -"ase" = (/obj/structure/closet,/obj/item/weapon/poster/contraband,/obj/item/weapon/poster/contraband,/obj/item/weapon/poster/contraband,/obj/item/weapon/poster/contraband,/obj/item/weapon/poster/contraband,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/starboard) -"aFD" = (/obj/item/clothing/glasses/meson,/obj/structure/closet/crate,/obj/item/weapon/poster/contraband,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/starboard) -"aFH" = (/obj/structure/closet,/obj/item/weapon/poster/contraband,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "adq" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/obj/structure/reagent_dispensers/peppertank{pixel_x = -29; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/prison/solitary{name = "Prisoner Education Chamber"}) "adr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/stool/bed/chair/office/dark{dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/prison/solitary{name = "Prisoner Education Chamber"}) "ads" = (/obj/machinery/atmospherics/pipe/simple/general/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/prison/solitary{name = "Prisoner Education Chamber"}) @@ -1339,7 +1332,7 @@ "azF" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "brown"},/area/quartermaster/miningdock{name = "\improper Mining Office"}) "azG" = (/obj/structure/rack{dir = 1},/obj/item/weapon/storage/toolbox/emergency{pixel_x = 2; pixel_y = -3},/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/floor/plasteel{dir = 5; icon_state = "brown"},/area/quartermaster/miningdock{name = "\improper Mining Office"}) "azH" = (/obj/structure/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) -"azI" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light_switch{pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) +"azI" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light_switch{pixel_y = 28},/obj/structure/closet/cardboard,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) "azJ" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/sink/kitchen{desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) "azK" = (/obj/machinery/alarm{pixel_y = 28},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) "azL" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/sorting{name = "\improper Warehouse"}) @@ -3511,9 +3504,6 @@ "bpt" = (/obj/machinery/turretid{control_area = "\improper AI Satellite Antechamber"; enabled = 1; icon_state = "control_standby"; name = "Antechamber Turret Control"; pixel_x = 30; pixel_y = 0; req_access = list(65)},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/obj/machinery/ai_slipper{icon_state = "motion0"; uses = 10},/turf/simulated/floor/plasteel{dir = 1; icon_state = "darkbluecorners"; tag = "icon-darkbluecorners"},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Foyer"}) "bpu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/turret_protected/aisat_interior) "bpv" = (/obj/machinery/light/small{dir = 8},/obj/machinery/camera{c_tag = "MiniSat - Antechamber"; dir = 4; network = list("MiniSat")},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "darkbluecorners"; tag = "icon-darkbluecorners"},/area/turret_protected/aisat_interior) -"buz" = (/obj/structure/closet/crate,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/weapon/poster/legit,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"bzh" = (/obj/structure/closet,/obj/effect/decal/cleanable/cobweb2,/obj/item/weapon/poster/contraband,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"bTp" = (/obj/structure/table/wood,/obj/machinery/button/door{id = "corporate_privacy"; name = "corporate showroom shutters control"; pixel_x = 28; pixel_y = 0; req_access_txt = "19"},/obj/item/weapon/poster/legit,/obj/item/weapon/poster/legit,/obj/item/weapon/poster/legit,/obj/item/weapon/poster/legit,/obj/item/weapon/poster/legit,/obj/item/device/paicard{desc = "A real NanoTrasen success, these personal AIs provide all of the companionship of an AI without any law related red-tape."; name = "NanoTrasen-brand personal AI device exhibit"},/turf/simulated/floor/carpet,/area/assembly/showroom{name = "\improper Corporate Showroom"}) "bpw" = (/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "darkbluecorners"; tag = "icon-darkbluecorners"},/area/turret_protected/aisat_interior) "bpx" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/landmark/start{name = "Cyborg"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/turret_protected/aisat_interior) "bpy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-darkbluecorners (EAST)"; icon_state = "darkbluecorners"; dir = 4},/area/turret_protected/aisat_interior) @@ -4188,7 +4178,7 @@ "bCr" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/condiment/saltshaker{pixel_x = -3; pixel_y = 0},/obj/item/weapon/reagent_containers/food/condiment/peppermill{pixel_x = 3},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bCs" = (/obj/machinery/smartfridge/drinks{icon_state = "boozeomat"},/turf/simulated/wall,/area/crew_quarters/bar) "bCt" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/wood/poker,/obj/item/toy/cards/deck{pixel_y = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"bCu" = (/obj/structure/table/wood/poker,/obj/effect/spawner/lootdrop{loot = list(/obj/item/weapon/gun/projectile/revolver/russian = 5, /obj/item/weapon/storage/box/throwing_stars ,/obj/item/toy/cards/deck/syndicate = 2); name = "gambling valuables spawner"},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"bCu" = (/obj/structure/table/wood/poker,/obj/effect/spawner/lootdrop{loot = list(/obj/item/weapon/gun/projectile/revolver/russian = 5, /obj/item/weapon/storage/box/throwing_stars, /obj/item/toy/cards/deck/syndicate = 2); name = "gambling valuables spawner"},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bCv" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/stool{pixel_y = 8},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bCw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/carpet,/area/crew_quarters/theatre) "bCx" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/turf/simulated/floor/carpet,/area/crew_quarters/theatre) @@ -5308,9 +5298,6 @@ "bXT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 1; icon_state = "caution"},/area/atmos) "bXU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "blackcorner"},/area/atmos) "bXV" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{dir = 2},/obj/machinery/meter,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel,/area/atmos) -"ccl" = (/obj/item/weapon/poster/contraband,/obj/item/weapon/poster/contraband,/obj/item/weapon/poster/contraband,/obj/item/weapon/poster/contraband,/obj/item/weapon/poster/contraband,/obj/item/weapon/reagent_containers/food/drinks/beer{pixel_x = -3; pixel_y = 2},/obj/item/weapon/reagent_containers/food/drinks/ale,/obj/structure/table/wood,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/aft{name = "Aft Maintenance"}) -"ccJ" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 8},/obj/item/weapon/poster/contraband,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) -"cgv" = (/obj/structure/rack,/obj/item/weapon/poster/contraband,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bXW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/turf/simulated/floor/plasteel,/area/atmos) "bXX" = (/obj/machinery/atmospherics/components/binary/pump{dir = 0; name = "Port to Fuel Pipe"; on = 0},/turf/simulated/floor/plasteel,/area/atmos) "bXY" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "co2_in"; name = "Carbon Dioxide Supply Control"; output_tag = "co2_out"; sensors = list("co2_sensor" = "Tank")},/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/atmos) @@ -6774,7 +6761,6 @@ "cAa" = (/obj/machinery/door/airlock/external{req_access_txt = "0"; req_one_access_txt = "13;8"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cAb" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/aft{name = "Aft Maintenance"}) "cAc" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/device/flashlight,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) -"cFs" = (/obj/structure/closet/crate,/obj/item/weapon/poster/legit,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) "cAd" = (/obj/structure/rack,/obj/item/clothing/mask/gas,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cAe" = (/obj/item/latexballon,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cAf" = (/obj/item/clothing/suit/ianshirt,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -7981,6 +7967,7 @@ "cXk" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating/airless,/area/space) "cXl" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/structure/disposaloutlet,/turf/simulated/floor/plating/airless,/area/space) "cXm" = (/obj/docking_port/stationary{dheight = 9; dir = 2; dwidth = 5; height = 22; id = "syndicate_s"; name = "south of station"; turf_type = /turf/space; width = 18},/turf/space,/area/space) +"cXn" = (/obj/structure/closet/cardboard,/turf/simulated/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/maintenance/starboard) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -8116,7 +8103,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaYoaYoaYobdmbInalQbIoalQalQbBBbIpbIqbIrbDkbDkbDkbBBbIsbItbxZbIubxZbxZbxZbIvbIwbIxbBIbBIbFabIybIzbBIbBIbBIbBIbIAbIBbwibwmbICbIDbIEbIFbIGbIHbIIbIFbIFbIJbIJbIKbILbIJbIMbBVbINbIObIPbIQbIRbIObISbBVbIMbITbIUbIVbIWbITbITbIXbIYbIZbITbJabJbbJcbJdbJebJfbJgbJhbJgbJibJjbyRbyRbEbbEcbAGbJkbJlbJmbJlbHybJnbJobJpbJqbJrbARbJsalwbJtbJubJvbznbJwbJxbJybJzbznbzobJAbJBbCSbJCbBebJDbJEbJFbJGbJFbJHbJIbBeaafbCVbCVbCVbCVbCVaafaaabBnaaabBmaaabBnaagaaiaafaaiaagaagaaiaaiaagaagaagaagaagaaiaagaagaobaVfaPVaQaaaaaSHbJJbIkbIkbJKbJLbJMbIkbIkbJNaSHaaaaOraPVaQaaobaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaYobJObdmbJPalQbBGapHbJQbBBbJRbDlbJSbJTbGybDkbBBbJUbJVbxZbEUbJWbJXbxZbBGaojbwhbJYbJYbFabygbJZbJZbKabKbbKcbKdbwhbwhbFbbKebKfbIFbKgbKhbKibKjbKkbKlbKmbKnbKobKpbIJaafbDEbKqbIObIObKrbIObIObKsbKtaafbITbKubKvbKwbKxbITbITbITbITbITbKybdKbJcbKzbKAboGbKBbKCbDYbKDbKEbDYbKFboGbEcbKGbAGbAGbAGbAGbAGbKHbKIbKJbKKbKLbARbKMalwbKNbKObKPbzjbKQbKRbKSbKTbKUbKVbKWbKXbKYbKZbLabLbbLcbLdbLebLfbLgbLhbLibLjbEFbLkbLlbLlbCVaafaafbLmaafbLnaafbBnaaaaaaaafaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaobaOraPVaQaaaaaSHbLobLpbLqbIkbLrbLsbLtbLubLvaSHaaaaOraPVaQaaobaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaYoaYoaSJaYobaaaYoaSJaYoaYoaYoaSJaYoaSJaSJaSJblJbLwbLxbLybLzbLAbBBbLBbLCbJSbLDbLEbLFbBBbxZbxZbxZbxZbxZbxZbxZbBGaoibwhbLGbLHbFabygbBIbBIbLIbBIbLJbLKbwhbLLbwmbcfbLMbIFbLNbLObLPbLQbLRbKlbLSbLTbLUbLVbLWaafbDEbLXbLYbLZbMabLYbLZbMbbKtaafbMcbMdbMebMfbMgbMhbMibMjbMkbITbMlbdKbMmbyLbMnbMobMobMobMpbMqbMrbMsbMtbMobMubMobMvbMwbMxbMybMzbARbARbMAbARbARbARbJsbMBbMCbMDbMBbzfbzfbzfbzfbzfbMEbzjbMFbMGbMHbMIbMJbMKbMLbMMbMNbMObMPbMQbBeaafbBebMRbMSbMTbCVaafaaabBnaaabBmaaabMUaobaobaobaobaaiaobaobaobaobaaiaobaobaobaaiaobaagaobaOrbMVaViaVjaSHaSHbMWbMXbIkbMYbLsbMZbNaaSHaSHaVjaVobNbaOxaobaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaYobNcbvVaWQbNdaWQaWOaWObNeaWObvVaWObNfbvVaWObvWbNgalQbNhalIapIbBBbNibNjbDkbDkbDkbNkbBBbNlbNmbNnbNobNpbNqalQbBGaqWbwhbNrbNsbFabNtbNubNubNvbBIbBIbNwbwhbNxbwmbcfbKfbIFbNybNzbNAbNBbNCbKlbNDbNEbNFbNGbIJbNHbNIbNHbNIbNIbNJbNIbNIbNHbNIbNHbITbNKbNLbNMbNNbNObNPbNQbNRbITbNSbdKbNTaXBbKAbMobNUbNVbNWbNXbNYbNZbNZbOabObbMobMobMobMobMobMobMobARbOcbOdbOebARbOfbMBbOgbOhbOibMBbOjbOkapnbOlbzfbOmbOnbOobOpbOqbOrbOsbOtbOubOvbMObOwbOxbIebIfbIgbOybLlbOzbCVaafaaabBnaaabBmaaabBnaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaobaOraPVaQaaaabxwaSHbOAbIkbIkbOBbOCbODbOEaSHbxwaaaaOrbOFaQaaobaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaYobNcbvVaWQbNdaWQaWOaWObNeaWObvVaWObNfbvVaWObvWbNgalQbNhalIapIbBBbNibNjbDkbDkbDkbNkbBBbNlbNmbNnbNobNpbNqalQbBGaqWbwhbNrbNsbFabNtbNubNubNvbBIbBIbNwbwhbNxbwmbcfbKfbIFbNybNzbNAbNBbNCbKlbNDbNEbNFbNGbIJbNHbNIbNHbNIbNIbNJbNIbNIbNHbNIbNHbITbNKbNLbNMbNNbNObNPbNQbNRbITbNSbdKbNTaXBbKAbMobNUbNVbNWbNXbNYbNZbNZbOabObbMobMobMobMobMobMobMobARbOcbOdbOebARbOfbMBbOgbOhbOibMBbOjbOkcXnbOlbzfbOmbOnbOobOpbOqbOrbOsbOtbOubOvbMObOwbOxbIebIfbIgbOybLlbOzbCVaafaaabBnaaabBmaaabBnaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaobaOraPVaQaaaabxwaSHbOAbIkbIkbOBbOCbODbOEaSHbxwaaaaOrbOFaQaaobaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaYoaYpaYqaYqaYqaYqaYqbOGbOHbOIbzzbzzbOJbOKbOLbOMbONalQbdpaqSapIbBBbDmbOObDkbDkbOObOPbBBbOQaolaonbORbLAbNpalQbBGbOSbwhbOTbOUbOVbOWbBIbOXbOYbOZbPabPbbwhbPcbwmbcfbPdbIFbPebPfbPgbPhbKlbKlbPibPjbPkbPlbIJbPmbPnbPobPpbPqbPrbPsbPtbPubPvbPwbPxbPybNLbPzbPAbITbPBbPCbPDbITbPEbdKbPFaXBbPGbPHbPIbPJbPKbPLbPMbNWbNWbPNbPObMobPPbPQbPRbPQbPSbMobPTbPUbPVbPWbARbJsbMBbPXbPYbPZbMBatnapkapkbQabzfbOmbQbbQcbzgbQdbzgbQebQfbQgbEnbMObQhbMQbBeaafbCVbCVbCVbCVbCVaafaaaaaiaaabBmaaabBnaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaobaOraPVaQaaaabxwaSHbQibQjbQkbQlbQmbQnbQoaSHbxwaaaaOrbOFaQaaobaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaYoaYobQpbQpaYoaYoaYoaSJaYoaSJaYoaSJaSJalQbQqalQalQalQbdpaqWapIbBBbOPbQrbQsbDkbQsbQtbBBbQuapFaojapHbQvanaalQbBGalIbwhbwhbwibQwbQxbwibwhbwhbwhbwhbQybwhbwhbAcbfvbQzbIFbQAbQBbQCbQDbQEbKlbQFbQGbPkbQHbQIbQJbQKbQLbQMbQNbQLbQObQLbQPbQQbQRbPxbQSbNLbQTbQUbQVbQWbQXbQYbITbQZbdKbRaaXBbKAbRbbRcbRdbRebRfbRgbRhbRdbPNbRibMobRjbRkbRlbRmbPSbMobRnbRobRpbRqbRrbRsbMBbRtbRubRvbMBbRwbRxbRybRzbzfbRAbRBbRCbRDbQdbREbRFbEnbOsbRGbRHbRIbLhbLibLjbEFbRJbRKbRLbCVaafaaabBnaaabBmaaabBnaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaobaVfaPVaQaaaaaaaaSHaSHaSHaSHaSIaSHaSHaSHaSHaaaaaaaOrbOFaQaaobaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaYobRMbbyaYoaaaaafbRNbRNbRNaafaaaaaaalQbRObRPbRQbRRbRSbRRbRTbBBbBBbBBbBBbRUbBBbBBbBBbRVaqSalIaojbRWbRXalQbRYbRZbwhbSabSbbScbSdbSebSfbSgbwhbShbSibSjbwhbwmbcfbSkbIFbLNbPfbSlbSmbLNbKlbSnbSobSpbSqbQIbSrbSsbStbSubSvbSwbSxbSsbSybSzbSAbPxbSBbSCbSDbSEbSFbSGbSHbSIbSJbSKbdKbSLaXBbKAbRbbSMbSNbSNbSObSPbSQbSRbSSbSTbMobSUbRkbSVbSWbSXbMobSYbSZbTabTbbARbJsbMBbMBbMBbMBbMBbTcapkapkbTdbzfbRAbRBbRCbTebTfbREbTgbMNbThbRGbMObTibMQbBeaafbBebTjbTkbTlbCVaafaaabBnaaabBmaaabBnaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaobaOraPVaQaaaaaaaaaaaaabxwbxwbTmbxwbxwaaaaaaaaaaaaaOrbOFaQaaobaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -8239,3 +8226,4 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa "} + diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 0142726ff92..98a0943fd2d 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -5968,7 +5968,9 @@ "ckN" = (/obj/machinery/door/airlock/glass_research{name = "Test Chamber"; req_access_txt = "47"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/toxins/misc_lab) "ckO" = (/obj/structure/grille,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/engine/chiefs_office) "ckP" = (/obj/machinery/door/airlock/glass_command{name = "Chief Engineer"; req_access_txt = "56"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) +"ckQ" = (/obj/structure/closet/cardboard,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/quartermaster/storage) "ckR" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area/engine/chiefs_office) +"ckS" = (/obj/structure/closet/cardboard,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "ckT" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 1; icon_state = "yellow"},/area/engine/engineering) "ckU" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2_sensor"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) "ckV" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 1; frequency = 1441; id = "n2_in"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) @@ -6643,7 +6645,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawWawYawZawZawZawZawZawZawZawZawYawZbbbaIKaIKbbcbhNbbdbbebbebbebbfbbgbcIaPzbcKbcMbcLaXQaXQaXQbbqbcOaXQaPAaPAaPAaPAaZBaZAbbsbbraPAaZDaZFaZEbgAbcRbaSbbtbcSaZEbaWbcTbbRbbRbbRbbRbcVaZKbcWaJqaYlbcXbcYbbXbdabcZbbMbbCbcdbddbbkbdfbbmaZRbdhbdgbdhaZRbbmaZUbbpbdibdkbejbaQbbZbcmbbwbbwaZVbdnaJqaJqaHPbcqaYVaYVaYVaYVaYVaYVaYVaYVaYVbdoaYVaYVaYVaYVaYVbdqbdpbdpbdpbdpbdraYVbcqaYVaYVaYVaYVaYVaYVbcibcbbckbcjaXqaXqaXqaXqaXqaXqaXqaXqaXqaXqaXqaXqaXqaXqaXqaXqaXqaXqaXqbdvbdxbdwbdybdybdzaTmaPqaPqbdAaQEaQEbdAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafawWaykaylaykaymaylaylaynaykaylaykaymaylaylaylbeObclbeObeObeObeObeTbdGaPzaPzaPzbdHaWkaXQaZtbdJbctbawaXQbdMbdLbdMaPAaPAaPAbcwbcuaPAaZDaZFaZEbcFbcEbbPbcGbcHaZEbaWaZKbdSbbRbbRbcJbdVbdUbdWaJqaYlbcXbdXbbXbdabdYbcNbbCbcdbbXbbkbebbecaZRbeebedbefaZRbehbegbbpbeibekbdjbcQbcPbembbwbenaZVbepbeobeqaHPbcqaYVaYVberaYVbesbetbetbetbetbeubetbetbevaYVaYVaYVaYVaYVaYVbdcbdbbeybcqaYVaYVaYVaYVaYVbezbeBbdlbdmbeCaYVaYVaYVaYVaYVbeEbdsaYVaYVaYVaYVaYVaYVaYVaYVaYVaYVaYVaYVaYVbcqbeGbeIbeHbeJaTmaPqaPsaNaaNaaNaaNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasEawWbeKawWazzaylaylazAawWbeLawWazBbeNbeMbeMbeObeQbePbeSbeRbeUbeTbdubdtbdBbdBbdDbdCaXQaXQaXQbfabfbaXQaPzaPzaPzaPzbfcaWvbfdbfeaWvbffaZFaZEbfgbaSbaSbdEbaSaZEbfjaZKbfkbbRbcUbbRbfnbfmbfoaJqaYlaZMbbXbfpbcabdFbdKbdIbcdbfrbfsaYvbfubftbfvbfvbfvbfwbfxaYBbfzbfybfBbfAbfCbbwbfDbbwbfEaZVaYGaJqaJqbfFbfFbfFbfFbfFbfFbfFbfHbfGbfGbfGbvkbfJbfHbfKbfKbfKbfKbfKbfLbfLbfLbdNbfLbfLbfLbfLbfOaYVbeEbfPbfSbdObdPaYVaYVaYVbfUbfUbfVbfVbfVbfVbfVbfWbfXbfXbfXbfYbfXbfZbgabfXbfXbgbbgcbgcbgcbgcbgebgdbggbgfaNaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaACarBaADauPawWaAFaAEbgibghawWauPaADawWarBaACasEbeObgkbgjbgjbgjbglbdQbdTbdRaWvaWvbeabdZaXQaZtbgrbfabgsaXQbgtbgtaSgbelbewaYbbgwbgxbgxbgxbgyaZEbgAbexbeDbeAbaSbgBbgCaZKbgDbbRbeFbkMbeWbeVbkSbeXbgGaZMbgHaZPbgJbgIbgLbgKbcdbgMaZMaafbgObgNbgNbgNbgNbgNbijaafaZVbgSbgUbgTbgVbbwbgWbbwbgXaZVaYGaJqbgYbfFbhabgZbhcbhbbhdbfFbhfbhebhebhebiubhhbhhbhibhkbhjbhlbfKbhnbhmbeYblrbhmbhpbhqbfLbfSbhrbfSbfSbfSbPvbdPbfTbhtbfTbhubhubfVbhvbhxbhwbfVbhybhzbhybfVbhAbhBbhAbgcbhCbhDbhCbgcbhEbhFbgcbhHbhGaNaaNaaNaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaACarBaADauPawWaAFaAEbgibghawWauPaADawWarBaACasEbeObgkbgjbgjbgjbglbdQbdTbdRaWvaWvbeabdZaXQaZtbgrbfabgsaXQbgtbgtaSgbelbewaYbbgwbgxbgxbgxbgyaZEbgAbexbeDbeAckQbgBbgCaZKbgDbbRbeFbkMbeWbeVbkSbeXbgGaZMbgHaZPbgJbgIbgLbgKbcdbgMaZMaafbgObgNbgNbgNbgNbgNbijaafaZVbgSbgUbgTbgVbbwbgWbbwbgXaZVaYGaJqbgYbfFbhabgZbhcbhbbhdbfFbhfbhebhebhebiubhhbhhbhibhkbhjbhlbfKbhnbhmbeYblrbhmbhpbhqbfLbfSbhrbfSbfSbfSbPvbdPbfTbhtbfTbhubhubfVbhvbhxbhwbfVbhybhzbhybfVbhAbhBbhAbgcbhCbhDbhCbgcbhEbhFbgcbhHbhGaNaaNaaNaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafawWbeKawWawWawWawWawWawWbeLawWaafaafaafaaabeObhIbeObhJbgjbhLbeZbeOaSgaTubfhbfqbhObhQbhQbhQbhQbhQbhQbhSbhRbhTbfIbfMaZEaZEaZEaZEaZEaZEaZEbhWbhYaZEaZEaZEbhXbiabhZbfNboUbmiboUbfRbfQbgnbgmbidaZMbieaZPaZPaZPaZPbgKbcdbifaZMaafbgObgNbihbigbiibgNbijaafaZVbikbdkbilbimbbwbfDbbwbbwaZVaYGaJqaJqbfFbiobinbipbipbisbirbhhbitbhhbhhbiubhhbhhbhibixbiwbiybfKbizbhmbizbhobizbiBbhmbfLbiCbiCbiEbiDbfSbgobdPbiGbiIbiHbiJbiJbfVbiKbiMbiLbiObiNbiQbiPbfVbiRbgpbiSbgcbiUbiVbiUbiXbiWbiWbgcbiYbhGaaaaafaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaabiZaaaaaaaafaafaaaaaaaaaaaaaaaaafaafaaabeObjbbjabjdbjcbjcbjebjfaYfbjgaPzbjibjhbjjbjjbjjbjkbjkbjkbjkbjkbjkbgqbjlaZEbjnbjmbjpbjobjrbjqbjtbguaZEbjubgzbgvaZKaZKbgEbbRbflbbRbbRaZKbfoaLxaYlbjzbjBbjAbjDbjCaZPbjEbcdaZMaZMaafbgObgNbigbgNbigbgNbijaafaZVaZVbjFbejbjGbbwbjIbjHbjJaZVaYGaJqaJqbfFbgFbinbgPbjObjRbjQbhhbjSbjUbjVbjTbgQbhgbhibjXbhsbjYbfKbizbhmbizbhobizbiBbkbbfLbkdbkcbkfbkebfSbPvbdPbkgbkhbkhbhMbhKbklbkkbkmbhPbiLbiLbiLbkobfVbkqbhUbkrbgcbksbiWbiWbhVbkvbibbgcbiYbhGbkybkybkybkyaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaHraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaafaafaaabeObkzbeObkBbkAbkAbkCbeObkDbkDaPzbkFbkEbkFbkFbkFbkEbkFaPzaPzaZEaZEbhYbkGaZEbjrbjrbjrbjrbjrbjrbiqbicbiAbivbiTbiFbjsbkMbjvbkMbjwbbRbqsaZKbfobjxbBibkTbkWbkVbkYbkXaZPbgKbcdaZMaafaafbmubmvbiibkZbihbjybgRaafaafaZVblcblbaZVaZVaZVaZVbldaZVbleaJqaJqbfFblfbjKbjLbipbisblhbhhbliblkbljblmbllblnbfKblpbjMbjNbfKbizbhmbizbhobizbiBbhmbfLbfSbfSbfSbfSbfSbPvbdPblublwblvbjWbjPblAblzblCblBblBbnibiLblEbfVbjZbhUblHbgcblIblKblJbkablLbkibgcbiYblOblQblPblRblPaaaaaaaafaaaaafaaaaafaaaaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -6685,7 +6687,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaSaaaccacccccbaaaccacccccbaaaccacccccbaaaaaSaaaaaabLvccdbHEbCqbCqbCqbTzbCqbCqbCqbCqaaaaaaaaacceaaHaaHaafaaaaaabGpbVHbVIbYzccgccfbWBcchbYzbYzbXFccibOCbUybVbbUCbVdbVcbVfbVebVhbVgbVobVmbVqbVpcerbVrbWhbVKccwccvccyccxbRAbRAbRDbTOcczbTUbRFbURccAbQyaafbQAccCccBccDbOhbOibzsbzsbWeccFccEcbLccGbzscbMccIccHccKccJccLccHccNccMbhGccObDbbDbbDbbDbbDbbDbccQccPccQbDbbDbbDbbDbbDbbDbbQZbQZbQZbQZbQZbQZccRccRccSccTbQZbQZbQZbQZbQZbkyccUbTrbkyccWccVbtpbkyaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaSaafccaccXccbaaaccaccXccbaaaccaccXccbaafaafaaaaaabLvccYccZbCqbSqbHEbHEcdabQacdbbCqaaaaaaaaaaaaaafaaaaaaaaaaaabESbVHbVIbWBcddcdcbWBcdecdfbWBbXFcdgbWtbWsbWvbWubWKbWJbXmbXkbXobXnbXqbXpbXIbXHccsbXNcdtbYbccwcdwbOdcbAbTObTPcdycdxcdAcdzbMWcdBcdCbRIbRKbPjcdDcbHcbHbOhbOibzsbAwcdEcdGcdFcdIcdHbzscdJcdLcdKccMcdMccMbFrbHdcdNbhGcdObkyaaaaaaaaaaafaaaaaacdPaaaaafaaaaaaaaaaaabkycdQbNBblQcdRcdRbQZcdScdSccSbScbQZcmobtpbtpbtpbDhccUbXubkycdVbtpbtpbkybkybkyaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaSaaaccaccXccbaafccaccXccbaafccaccXccbaaaaafaafaafbCqbLvbCqbCqbCqcdWcdYcdXbHEbSsbCqaaaaaaaaaaaaaafaaaaaaaafaaabESbVHbVIbWBceacdZceccebcedbWBcefceecehcegceibVJbYpbYnbYEbYqbYMbYGbZebYObZgbZfbZubZtbZAbZwceycexbOdcbAcezbOdbOdbOdcezcezcezbURceBceAaafbOhbOhbOhbOhbOhbOibzscaKceCceEceDceGceFbzsbzsceIceHceJbLSceLceKbzsbzsbhGcdObkyaaaaaaaaaaafaaaaaacdPaaaaafaaaaaaaaaaaabkybtpceMbrGceOceNbQZcePcePceQbScbQZbkybkyceSceRbDhccUbTrbtpbtpbtpceTblPceUblPaagaagaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafccaccXccbaaaccaccXccbaaaccaccXccbaafaafaaaaaaaafaafbCqceVbCqceWceYceXbTzbCqbCqaaaaafaaaaaaaafaaaaaaaafaaabESbVHbVIbVIbVIbVIbVIbVIbVIbVIbVJbVJbVJbVJbVJbVJbCqbZBbCqccwcfbcfbcfbcfcbZDbZCcfbbZEcfhcapccwbOdbQucficezbOdbOdbOdbOebULcezbURcezbLKaafaafaafaafaafaafbOicfjcfjcfjcflcfkcfjcfjcfjcfmcfocfnceJcfpceJceJbzscfqcbKcdObkybZibZibZibkybZibZicfrbZibkybZibZibZibZibkybkyccUcfsbkybkybQZbQZbQZcftcfubQZbDhbkycaebtpbqhccUcbgbkybkycfvbkybkybkybkyaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafccaccXccbaaaccaccXccbaaaccaccXccbaafaafaaaaaaaafaafbCqceVbCqceWceYceXbTzbCqbCqaaaaafaaaaaaaafaaaaaaaafaaabESbVHbVIbVIbVIbVIbVIbVIbVIbVIbVJbVJbVJbVJbVJbVJbCqbZBbCqccwcfbcfbcfbcfcbZDbZCcfbbZEcfhcapccwbOdbQucficezbOdbOdbOdbOebULcezbURcezbLKaafaafaafaafaafaafbOicfjcfjcfjcflcfkcfjcfjcfjcfmcfocfnceJcfpceJceJbzscfqcbKcdObkybZibZibZibkybZibZicfrbZibkybZibZibZibZibkybkyccUcfsbkybkybQZbQZbQZcftcfubQZbDhbkycaebtpckSccUcbgbkybkycfvbkybkybkybkyaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaSaaSaaSaafaaaccaccXccbaaaccaccXccbaaaccaccXccbaaaaafaaaaaacfxcfwcfwcfwcfwbCqbCqcfybHEbCqbLvbLvbLvbLvbLvbLvbLvbLvbLvbCqcarcaqbTAcaxcazcaycaycaycaycaycaycaycaycaycaBcaBcaycaCceWccwcfFcfEcfHcgOcbqcbpcfbcbscfMctRccwcfNcfObRHcfQcfPcfRcfPcfQcfScfQcfTcezbLKbLKbLKaaaaaaaafaaacfVcfUcfXcfWcfZcfYcgbcgacfjcgcbAwcgdcgfcgecghcggbKTbKTcgjcgicgkcgkcgkcgkcgkcgkcgkcglcgmcgmcgmcgmcgmcgmcgncgmcgocgmcgmcgpcgrcgqcgtcgscgubkybkybkybkycbvbkyccUbTrbkycgybtpbtpbkyaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaSaaaaafaaaaaaaaacgzaaaaaaaaacgzaaaaaaaaacgzaaaaaaaafcfxcfxcfxcgAcgCcgBcgEcgDbHEcgFcgHcgGcgHcgHcgHcgHcgHcgHcgHcgHcgHcgHcgHcbwbEPcbxcbyccwccwccwccwccwccwccwccwccwccwccwccwccwccwccwcfbcgMcgOccjcclcckcgSccmccoccnccwcfNcgWcgVcgYcgXchacgZchbbOdchdchcchfchechgcheaaaaaaaafaaacfjchhchjchichlchkchnchmcfjbAwbAwceJceJcbKceJccMbFrbHdchpchochochochochochochochrchqchochochochochochochtchschubnschwchvchxchxchxchychAchzchCccpccqccqccqccrcctbkyccVbtpchHbkyaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaSaafchJchIchIchKchLchLchLchLchLchLchLchLchLchLchLchMchOchNchOchPchRchQchScgHchUchTbQabCqbLvbLvbLvbLvbLvbLvbLvbLvbLvbCqbCqccucdicdhcdjccwchYchYchZccwcibciacidciccifciecihcigcijcdkcfbcikcimcdlcdmcinciqcdncdpcdoccwbLKcitbMQciubMQcivbMQciubMQciwbMQcixbLKbLKbLKaafaafaafaaacfjciyciAcizciCciBciEciDcfjciFbAwccMccMciGceJccMccMciHbzsbkybZibZibZibZibkybZibZibZibZibkybZibZibZibZibkyciIbtpbkyciKciJbkybkybZibZibkybkyciLcbfcdqbnscdscdrcdubkybkybkybkybkyaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 1271e091a59..34b888def5d 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -26,9 +26,6 @@ /obj/structure/closet/New() ..() - if(type == /obj/structure/closet && ticker && ticker.current_state == GAME_STATE_PREGAME && prob(20)) //only roundstart generic closets - new /obj/structure/closet/cardboard(src.loc) - qdel(src) update_icon() /obj/structure/closet/initialize() diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index a7c46237d98..609ba076b93 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -11,7 +11,7 @@ cutting_sound = 'sound/items/poster_ripped.ogg' material_drop = /obj/item/stack/sheet/cardboard var/move_delay = 0 - var/egg_cooldown = 0 + var/egged = 0 /obj/structure/closet/cardboard/relaymove(mob/user, direction) if(opened || move_delay || user.stat || user.stunned || user.weakened || user.paralysis || !isturf(loc) || !has_gravity(loc)) @@ -24,7 +24,7 @@ /obj/structure/closet/cardboard/open() if(opened || !can_open()) return 0 - if(!egg_cooldown) + if(!egged) var/mob/living/Snake = null for(var/mob/living/L in src.contents) Snake = L @@ -35,10 +35,8 @@ for(var/mob/living/L in alerted) if(!L.stat) L.do_alert_animation(L) + egged = 1 alerted << sound('sound/machines/chime.ogg') - egg_cooldown = 1 - spawn(3000) - egg_cooldown = 0 ..() /mob/living/proc/do_alert_animation(atom/A)