diff --git a/GainStation13/code/mechanics/wand.dm b/GainStation13/code/mechanics/wand.dm index 465959d6..dc4485cb 100644 --- a/GainStation13/code/mechanics/wand.dm +++ b/GainStation13/code/mechanics/wand.dm @@ -1,11 +1,11 @@ /obj/item/gun/magic/wand/food - name = "wand of gluttony" - desc = "summons delicious fattening foods" + name = "Wand of Gluttony" + desc = "Summons delicious fattening foods" max_charges = 15 ammo_type = /obj/item/ammo_casing/magic/food /obj/item/gun/magic/wand/food/overpowered //This is a more overpowered version of the item - name = "strong wand of gluttony" + name = "Strong wand of Gluttony" max_charges = 100 ammo_type = /obj/item/ammo_casing/magic/food/strong @@ -24,7 +24,6 @@ /obj/item/reagent_containers/food/snacks/donut/plain, /obj/item/reagent_containers/food/snacks/donut/glaze, /obj/item/reagent_containers/food/snacks/store/cake/cheese, - /obj/item/reagent_containers/food/snacks/store/cake/birthday, /obj/item/reagent_containers/food/snacks/store/cake/chocolate, /obj/item/reagent_containers/food/snacks/hotdog, /obj/item/reagent_containers/food/snacks/pizza/margherita, diff --git a/GainStation13/code/obj/weapons/fatoray.dm b/GainStation13/code/obj/weapons/fatoray.dm index b66466e6..acb19959 100644 --- a/GainStation13/code/obj/weapons/fatoray.dm +++ b/GainStation13/code/obj/weapons/fatoray.dm @@ -32,10 +32,11 @@ /obj/item/gun/energy/fatoray/cannon name = "Fatoray Cannon" - desc = "An energy gun that fattens up anyone it hits. This version functions as a glass cannon of some sorts." + desc = "An energy gun that fattens up anyone it hits. This version functions as a glass cannon of some sorts. It cannot be recharged." icon = 'GainStation13/icons/obj/fatoray.dmi' /// REPLACE THESE LATER WITH UNIQUE SPRITES - Sono icon_state = "fatoray_cannon" recoil = 3 + can charge = 0 slowdown = 1 // charge_sections = 3 weapon_weight = WEAPON_HEAVY @@ -87,7 +88,7 @@ ///Single shot glass cannon fatoray /obj/item/gun/energy/fatoray/cannon_weak name = "Basic Fatoray Cannon" - desc = "An energy gun that fattens up anyone it hits. This version functions as a glass cannon of some sorts." + desc = "An energy gun that fattens up anyone it hits. This version functions as a glass cannon of some sorts. It cannot be recharged." icon = 'GainStation13/icons/obj/fatoray.dmi' icon_state = "fatoray_cannon_weak" can_charge = 0 diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index af3b7f1f..91f07500 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -7275,6 +7275,7 @@ "kBc" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/freezer,/area/crew_quarters/locker{name = "Saunas"}) "kJj" = (/obj/effect/spawner/lootdrop/maintenance{lootcount = 8; name = "8maintenance loot spawner"},/turf/open/floor/plating,/area/maintenance/port/aft) "kOh" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_x = -6; pixel_y = 6},/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_x = 6; pixel_y = -2},/obj/item/reagent_containers/food/drinks/bottle/champagne,/turf/open/floor/carpet,/area/hallway/secondary/exit) +"kUV" = (/obj/machinery/door/poddoor/shutters/preopen{id = "rnd"; name = "research lab shutters"},/obj/machinery/autolathe,/obj/machinery/door/window/southright{name = "Research and Development Desk"; req_one_access_txt = "7;29"},/turf/open/floor/plating,/area/science/lab) "kWD" = (/obj/structure/chair/bench{dir = 8},/turf/open/floor/plaswood,/area/crew_quarters/locker{name = "Saunas"}) "lbn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/table,/obj/item/reagent_containers/rag/towel,/obj/item/reagent_containers/rag/towel{pixel_y = 3},/obj/item/reagent_containers/rag/towel{pixel_y = 3; pixel_x = 16},/turf/open/floor/plasteel/dark/side{dir = 1},/area/crew_quarters/locker{name = "Saunas"}) "lfC" = (/obj/structure/table,/obj/item/storage/firstaid/regular,/turf/open/floor/wood,/area/crew_quarters/fitness) @@ -7484,7 +7485,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRMatJbhrbanauSaPcaQqbpqayUawiawhawiawiawiawiawiawiawiawiawhawibprbpsaxDbcmbcnbcobcpbcpbcpbcqbcrbcsaPjbctbcubcvaPlaPlduzaPluYcaPlrzmaPlaPlaPlkhQlQXbdybptaPlaZhaZiaZjbcAbcBbcCbcDbcEbcFbcGbcGbcGbcHbcIaZsbcJaWdaQUaNhbbZbcKbcLbaJbcMbcNbcObcPbcQbcRbaNbcSbaPaZAbcTbcUbcTaZAbaPaZCbaSbbPbbNbpjaXWbdVaYabaWbpuaZDbpvaIPaIPaIPbaabaabaabaabpwbpxbaabaabaabaabcYbaabaabaabaabaabcZaYzaYzaYzaYzaYzaYzbpyaYzbpzbaabaabaabaabdbbdcbddbdebdfbdfbdfbdgbdibdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdhbdibpAbdkbdkbdlbpBbpCaXaaXabpDbpEbpFbpdbpGaRkaRkbpHaRkbpIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaayUaBdbpJaxBbpKbdqaxAaXbaxAazaaxBaxBbdqaxAaXbaxAazaaxBaxBaxBbdrbdsbdrbdrbdrbdrbdtbduaPjaPjaPjbdvaVLaPlaUDbfRaTiaPlaUDbfRbpNaPlaPlaPlaPlbdAbdBaPlaZhaZibdCbdDbdEbdFaZmbdzaWdaWdaWdaWdaWdaWdaWdbdGaWdbfPaIPbbZbcKbdIbaJbcMbdJbdKbcPbcQaBrbaNbdLbdMaZAbdNbdObdPaZAbdQbdRbaSaBtbbTbcVbdWbdXbpRbaWbdSaZDbnYbeaaIPbedbgBbgBbgBbpSbpTbpUbgBbgBbgBbpVbefbeebeebpWbgBbgBbgBbgBbgBbpXbpYbgBbgBbpZbqabqbbqcbgBbgDbqdbqebenbqfbqgbeqbeqbeqbaabpZbgDbqhbgBbgBbaabaabaabaabaabaabaabaabaabaabaabbWbqibqjbevbqkbfUbqlbqlbqlbqlbqmbqnbqoaMzaMzaMzaMzaMzaMzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRMatJaaebanauSayYaxAbqpayUbqqayUbqrayUayWaxBaxBayXayUbqsayUayYbezbeAbeAbdrbeBbeCbqtbeEbeFbdtbeGbeHbeIbeIbeJbeKaPlbfRbfRbfRaPlbfRbfRbfRaPlbqzbqAbeObePbeQbeObeRaZibeSbeTaZjbqBaZmaPjbeVbeWbeXbeXbeXbeXbeYbeZbeVbqCaIPbbZaZvbaJbfbbfcbfdbfebffbcQbfgbfhaXYbfibfjbfkbfkbfkbflbfmaYdbfnaCRbdUbdYbqDbfobpRbaWbfpaZDbnYaIPbjXbfvbfvbfvbfvbfvbfvbfvbfwbfxbfxbfxbqEbqFbqFbfwbqGbqGbqGberberberberberbfBbfBbfBbfCbfBbfBbfBbfBbqHbfGbqIbqJbfJbfJbfJbfKbfLbfLbfLbfLbfLbqKbqLbqLbqLbqMbqLbqNbqObqLbqLbqPbfSbfSbfSbfSbqQbmtbqRbqSbqSbqRaMybqTbqTaMzatJatJatJatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhrbclauSauSayUayUbqUayUaAbaRJayUaAcaAdbfXbfYayUaRJaAbayUauSaAaauSbdrbfZbgabgabgabgbbgcbgdbgebcnbqVbqWbggaPlbpObgjwixaPlbpObgjwixaPlbgkbglbgmbgnbgmbgmbrbbgpbgqaZkbgrbgsaZmbeUbgtbgubeVbgvbgwbgxbgyaPNbgAbrcbgCbrdaZvbgEaZvbgFbgGbgHbgIaXNaXObrebfrbbQbdTbfqbfsaCUaFAaFBbrfbrgbftaZBbrhbribftbrjbaWbgNaZDbnYaIPbrkbfvbrlbrmbrnbrobrpbfvbrqbrrbrrbrrbrsbrtbrtbrubrvbrwbrxbfDbfEbfFbryberbrzbrAbrBbrCbrAbrDbrEbfBbqHbrFbrGbrHbrIbrJbrKbrLbrMbrNbrObrPbfLbrQbrRbrQbfLbrSbrTbrSbfSbrUbrVbrUbfSbrWbrXbfSbrYbmtbrZbsabsbaSZaMyaMzaMzaMzaaaaaaatJaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhrbclauSauSayUayUbqUayUaAbaRJayUaAcaAdbfXbfYayUaRJaAbayUauSaAaauSbdrbfZbgabgabgabgbbgcbgdbgebcnbqVbqWbggaPlbpObgjwixaPlbpObgjwixaPlbgkbglbgmbgnbgmbgmbrbbgpbgqaZkbgrbgsaZmbeUbgtbgubeVbgvbgwbgxbgyaPNbgAbrcbgCbrdaZvbgEaZvbgFbgGbgHbgIaXNaXObrebfrbbQbdTbfqbfsaCUaFAaFBbrfbrgbftaZBbrhbribftbrjbaWbgNaZDbnYaIPbrkbfvbrlbrmbrnbrobrpbfvbrqbrrbrrbrrbrsbrtbrtbrubrvbrwbrxbfDbfEbfFbryberbrzbrAbrBbrCbrAbrDbrEbfBbqHbrFbrGbrHbrIbrJbrKbrLbrMbrNbrObrPbfLbrQbrRbrQbfLbrSbrTbrSbfSkUVbrVbrUbfSbrWbrXbfSbrYbmtbrZbsabsbaSZaMyaMzaMzaMzaaaaaaatJaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadayUbscayUayUayUayUayUayUbsdayUaadaadaadaaabdrbsebdrbsfbgabsgbshbdraRTbsiaPjbsjbskbsmbsmbsmbsmbsmbsmbsmbsmbsmbsobspbsqbsqbsqbsqbsqbsqaZmbsraZiaZmaZmbeVbssbstbsubsvbswbsxbswbsybszbqCaIPbsAaZvbsBaZvaZvaZvaZvbgIbcQbsCaZvbsDaAxaAxaAyaHcaAzaAxaAxbsDaZDbgObbNbgPbgQbaWbpRbaWbsEaZDbnYaIPbjXbfvbsFbsGbsHbsHbsIbsJbrtbsKbrtbrtbrsbsLbrtbrtbrtbrtbsMbfDbsNbsObsPberbsQbrAbrAbsRbsQbsSbrAbfBbsTbsUbqIbsVbsWbsXbsYbsZbtabtbbtcbtdbtebtfbtgbthbfLbtibtjbtkbfSbgRbgSbgRbtlbgRbgRbfSbrYbmtaMyaMyaMyaMyaMyaaaatJaaeaaaaaaatJaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabtmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoBaaabdrbtnbtobtpbtqbtqbtrbtsbttbtuaPjbtvbtwbtxbtxbtxbtybtybtybtybtybtybtzbtAbsqbtBbtCbtDbtEbtFbtGbtHbtIbsqbtJbtKbtLbeVbeVbtMbtNbtObtPbtQbtRbtSbtTbbZbtUbtVbtWbtXbtYaZvbgJbtZaZvaZvaadaAxbuaaBsbubbucaBvaAxaadaZDaZDbudbpjbuebaWbufbugbuhaZDbnYaIPbjXbfvbuibsGbujbukbulbumbrtbunbuobupbuqburbusbusbutbrtbsMbfDbuubuvbuwbuxbsQbrAbrAbsRbsQbsSbuybfBbuzbuAbqIbuBbuCbuDbuEbuBbtabuFbuGbtcbtcbtcbtcbuHbfLbuIbuJbuKbfSbuLbgRbgRbuMbuNbuObfSbrYbuPbuQbuRbuSbuTaaeaaeaaeaaeaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdrbuUbdrbuVbuWbuWbuXbdrbuYbuYaPjbuZbvabuZbuZbuZbvabuZaPjaPjbsqbsqbvbbvcbsqbvdbvdbvdbvdbvdbvdbvebvfbvgbvhbvibvjbvkbvlbvmbvnbvobswbvpbszbqCbvqbvrbvsbvtbvubvvbvwaZvbvxbvyaZvaadaadaAxbvzaCSbvAaFzbvBaAxaadaadaZDbvCbvDaZDaZDaZDaZDbvEaZDbvFaIPbvGbfvbvHbvIbvJbsHbsIbvKbrtbunbvLbvMbvNbvObvPbvQbvRbvSbsMberbvTbvUbvVbvWbsQbrAbrAbsRbsQbvXbvYbfBbvZbuAbqIbwabsWbwbbsYbwcbtabwdbwebwfbwgbwhbwibwjbfLbwkbuJbwlbfSbwmbwnbwobwpbwqbwrbfSbrYbuPbwsbwtbwtbwtatJaaaaaaaaeaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 07f47958..2600612c 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -1454,11 +1454,11 @@ "aCq" = (/obj/structure/closet/emcloset,/turf/open/floor/plasteel,/area/maintenance/port) "aCr" = (/obj/structure/cable/white{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/security/glass{name = "Security Checkpoint"; req_access_txt = "63"},/turf/open/floor/plasteel,/area/security/checkpoint) "aCs" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/light/small,/turf/open/floor/engine/o2,/area/engine/atmos) -"aCt" = (/obj/machinery/door/airlock/maintenance_hatch{name = "Maintenance Hatch"; req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/white{icon_state = "4-8"},/turf/open/floor/plating,/area/maintenance/starboard/aft) +"aCt" = (/obj/machinery/door/airlock/public/glass{name = "Xenoarch Teleporter"},/turf/open/floor/plasteel,/area/maintenance/starboard/aft) "aCu" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/science/research) -"aCv" = (/obj/effect/turf_decal/stripes/line{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/maintenance/starboard/aft) +"aCv" = (/obj/effect/turf_decal/stripes/line{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/delivery,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/white{icon_state = "4-8"},/turf/open/floor/plasteel,/area/maintenance/starboard/aft) "aCw" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/machinery/light/small,/turf/open/floor/engine/n2,/area/engine/atmos) -"aCx" = (/obj/effect/turf_decal/stripes/line{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/white{icon_state = "1-2"},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/maintenance/starboard/aft) +"aCx" = (/obj/effect/turf_decal/stripes/line{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/white{icon_state = "1-2"},/obj/effect/turf_decal/delivery,/obj/structure/cable/white{icon_state = "1-8"},/obj/structure/cable/white{icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/open/floor/plasteel,/area/maintenance/starboard/aft) "aCy" = (/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47"},/turf/open/floor/plasteel,/area/maintenance/starboard/aft) "aCz" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/obj/machinery/portable_atmospherics/scrubber,/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel/cafeteria,/area/engine/atmos) "aCA" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 1},/obj/machinery/portable_atmospherics/pump,/obj/machinery/light,/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white/corner,/area/engine/atmos) @@ -2728,7 +2728,7 @@ "bgb" = (/obj/structure/bookcase,/obj/structure/sign/plaques/kiddie/badger{pixel_y = 32},/obj/machinery/light/small{dir = 4},/obj/machinery/status_display/ai{pixel_x = 32},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/chapel/main) "bge" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/item/radio/intercom{name = "Station Intercom"; pixel_x = -26},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=8.4-AftNW"; location = "8.3-AftSW"},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel{heat_capacity = 1e+006},/area/hallway/primary/aft) "bgf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/white{icon_state = "1-2"},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel{heat_capacity = 1e+006},/area/hallway/primary/aft) -"bgl" = (/obj/machinery/newscaster{pixel_x = 32},/obj/effect/turf_decal/bot,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/vending/gato,/turf/open/floor/plasteel/dark,/area/hallway/primary/aft) +"bgl" = (/obj/machinery/newscaster{pixel_x = 32},/obj/effect/turf_decal/bot,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/structure/closet/firecloset,/turf/open/floor/plasteel/dark,/area/hallway/primary/aft) "bgm" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/science/xenobiology) "bgo" = (/obj/effect/spawner/structure/window/reinforced,/obj/structure/cable/white{icon_state = "0-2"},/turf/open/floor/plating,/area/science/xenobiology) "bgp" = (/obj/structure/table/reinforced,/obj/machinery/button/door{id = "xeno1"; name = "Containment Control"; req_access_txt = "55"},/obj/machinery/firealarm{pixel_y = 24},/obj/structure/extinguisher_cabinet{pixel_x = -24; pixel_y = 32},/obj/effect/turf_decal/bot,/turf/open/floor/plasteel,/area/science/xenobiology) @@ -3049,7 +3049,7 @@ "cfz" = (/obj/machinery/hydroponics/constructable,/obj/effect/turf_decal/stripes/line{dir = 10},/obj/machinery/light{dir = 1},/turf/open/floor/plasteel,/area/hydroponics) "cgb" = (/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel,/area/science/mixing) "chJ" = (/obj/machinery/atmospherics/pipe/simple/orange/visible,/obj/effect/turf_decal/bot,/obj/machinery/space_heater,/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel/dark/corner{dir = 1},/area/engine/atmos) -"ciV" = (/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,/obj/structure/cable/white{icon_state = "4-8"},/obj/structure/cable/white{icon_state = "1-2"},/obj/structure/cable/white{icon_state = "1-8"},/obj/structure/cable/white{icon_state = "2-4"},/obj/effect/turf_decal/delivery,/obj/effect/turf_decal/stripes/line{dir = 2},/turf/open/floor/plasteel,/area/maintenance/starboard/aft) +"ciV" = (/obj/structure/cable/white{icon_state = "1-2"},/obj/effect/turf_decal/delivery,/obj/effect/turf_decal/stripes/line{dir = 2},/turf/open/floor/plasteel,/area/maintenance/starboard/aft) "ckm" = (/obj/structure/trash_pile,/turf/open/floor/plating/asteroid,/area/asteroid/nearstation) "cmp" = (/obj/machinery/door/airlock/external{name = "External Docking Port"},/obj/effect/turf_decal/stripes/line{dir = 8},/obj/effect/turf_decal/stripes/line{dir = 4},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 8},/turf/open/floor/plasteel,/area/hallway/secondary/entry) "cnE" = (/obj/item/trash/syndi_cakes{pixel_x = -13; pixel_y = -15},/turf/open/floor/plating/asteroid/airless,/area/asteroid/nearstation) @@ -3195,7 +3195,7 @@ "ggq" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/bridge) "ggD" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/floor/plasteel/white,/area/medical/virology) "gii" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/white{icon_state = "4-8"},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/aft) -"glC" = (/turf/closed/wall/r_wall,/area/maintenance/starboard/aft) +"glC" = (/obj/structure/cable/white{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/maintenance/starboard/aft) "grO" = (/obj/structure/disposalpipe/segment,/obj/structure/lattice,/obj/effect/spawner/structure/window/plasma/reinforced,/turf/open/space/basic,/area/space/nearstation) "grU" = (/obj/structure/lattice/catwalk,/obj/structure/cable/white{icon_state = "2-8"},/obj/structure/cable/white{icon_state = "1-8"},/obj/structure/cable/white{icon_state = "4-8"},/turf/open/space/basic,/area/maintenance/solars/starboard) "gst" = (/obj/effect/landmark/start/cargo_technician,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/structure/disposalpipe/segment{dir = 9},/turf/open/floor/plasteel,/area/quartermaster/storage) @@ -3209,7 +3209,6 @@ "gBF" = (/obj/structure/table/glass,/obj/structure/reagent_dispensers/virusfood{pixel_x = -30},/obj/item/storage/box/syringes,/obj/item/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple{dir = 1},/turf/open/floor/plasteel/white,/area/medical/virology) "gGp" = (/obj/effect/spawner/structure/window/reinforced,/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/crew_quarters/bar/atrium) "gGq" = (/obj/machinery/mass_driver{dir = 4; id = "toxinsdriver"},/turf/open/floor/plating,/area/science/mixing) -"gID" = (/obj/machinery/light{dir = 8},/turf/open/floor/plasteel,/area/hallway/secondary/entry) "gLD" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/obj/item/radio/intercom{pixel_y = 25},/obj/machinery/light/small{dir = 8},/turf/open/floor/plasteel,/area/science/mixing) "gLW" = (/obj/structure/railing{dir = 8},/turf/open/space/basic,/area/space/nearstation) "gMe" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/white{icon_state = "1-2"},/obj/structure/cable/white{icon_state = "2-8"},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel,/area/hallway/primary/starboard/fore) @@ -3377,7 +3376,7 @@ "lTY" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/flora/ausbushes/ywflowers,/turf/open/floor/grass,/area/hallway/secondary/entry) "lUu" = (/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/light/small,/turf/open/floor/engine/air,/area/engine/atmos) "lWZ" = (/obj/structure/double_bed,/obj/item/bedsheet/double_red,/turf/open/floor/carpet/red,/area/crew_quarters/dorms) -"lXk" = (/obj/structure/closet/firecloset,/obj/effect/turf_decal/delivery,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/hallway/primary/aft) +"lXk" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/hallway/primary/aft) "lZR" = (/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel{heat_capacity = 1e+006},/area/hallway/primary/fore) "mae" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/open/floor/plasteel,/area/engine/atmos) "mdr" = (/turf/closed/wall,/area/space/nearstation) @@ -3387,9 +3386,11 @@ "mgs" = (/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{dir = 1},/turf/open/floor/engine/air,/area/engine/atmos) "mgV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/closed/wall/r_wall,/area/medical/virology) "mhI" = (/obj/structure/railing{dir = 1},/obj/structure/railing{dir = 8},/turf/open/space/basic,/area/space/nearstation) +"mjv" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/white{icon_state = "4-8"},/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/maintenance/starboard/aft) "mkF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/structure/table/reinforced,/obj/item/clothing/head/welding,/obj/item/clothing/head/welding{pixel_y = 5},/turf/open/floor/plasteel,/area/engine/atmos) "mma" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 4},/turf/closed/wall,/area/maintenance/port) "mnD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/machinery/pipedispenser/disposal,/obj/effect/turf_decal/bot,/turf/open/floor/plasteel,/area/engine/atmos) +"mov" = (/obj/machinery/quantumpad{map_pad_id = "station"; map_pad_link_id = "xenoarch"; mapped_quantum_pads = list("station","xenoarch")},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/white{icon_state = "4-8"},/obj/machinery/light{dir = 1; light_color = "#d1dfff"},/obj/effect/turf_decal/bot,/turf/open/floor/plasteel,/area/maintenance/starboard/aft) "mqF" = (/obj/machinery/door/poddoor{id = "turbinevent"; name = "Turbine Vent"},/turf/open/floor/engine/vacuum,/area/maintenance/disposal/incinerator) "mrd" = (/obj/structure/disposalpipe/segment,/turf/closed/wall,/area/maintenance/port) "mrz" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/preopen{id = "chemistbot"; name = "Chemistry Privacy Shutters"},/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/medical/chemistry) @@ -3465,7 +3466,7 @@ "ovE" = (/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple,/turf/open/floor/plasteel/white,/area/medical/virology) "oxn" = (/obj/machinery/power/compressor{comp_id = "incineratorturbine"; dir = 4; luminosity = 2},/obj/structure/cable{icon_state = "0-4"},/obj/structure/cable{icon_state = "0-8"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/engine/vacuum,/area/maintenance/disposal/incinerator) "oyD" = (/turf/closed/wall,/area/crew_quarters/toilet/restrooms) -"ozk" = (/obj/structure/cable/white{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/open/floor/plasteel,/area/science/research) +"ozk" = (/obj/structure/cable/white{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/science/research) "oCy" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/obj/structure/cable{icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/engine/atmos) "oGc" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 6},/turf/open/floor/plasteel,/area/engine/atmos) "oGK" = (/obj/structure/disposalpipe/segment,/turf/closed/wall/r_wall,/area/security/brig) @@ -3525,7 +3526,7 @@ "qgC" = (/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/open/floor/engine/vacuum,/area/maintenance/disposal/incinerator) "qiW" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 8},/obj/effect/turf_decal/stripes/corner{dir = 2},/turf/open/floor/plasteel,/area/science/mixing) "qlt" = (/turf/closed/wall,/area/maintenance/disposal) -"qmQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/open/floor/plasteel,/area/science/research) +"qmQ" = (/turf/open/floor/plasteel,/area/science/research) "qnA" = (/turf/open/floor/plating,/area/science/storage) "qoT" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Nitrogen to Pure"},/turf/open/floor/plasteel,/area/engine/atmos) "qpG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/closed/wall/r_wall,/area/engine/gravity_generator) @@ -3545,7 +3546,6 @@ "qDc" = (/obj/structure/closet/l3closet/virology,/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/floor/plasteel/white,/area/medical/virology) "qEl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/machinery/pipedispenser/disposal/transit_tube,/obj/effect/turf_decal/bot,/turf/open/floor/plasteel,/area/engine/atmos) "qFw" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Pure to Mix"},/obj/machinery/light{dir = 1},/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/engine/atmos) -"qGc" = (/obj/machinery/quantumpad{map_pad_id = "station"; map_pad_link_id = "xenoarch"; mapped_quantum_pads = list("station","xenoarch")},/turf/open/floor/plasteel,/area/hallway/secondary/entry) "qHe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/closed/wall,/area/maintenance/disposal) "qIp" = (/obj/effect/turf_decal/stripes/line{dir = 1},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 4},/turf/open/floor/plasteel,/area/engine/atmos) "qMr" = (/obj/effect/turf_decal/stripes/line{dir = 8},/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 1},/obj/machinery/meter,/turf/open/floor/plasteel,/area/engine/atmos) @@ -3556,7 +3556,7 @@ "qUW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/closed/wall/r_wall,/area/engine/atmos) "qZN" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/closed/wall,/area/library) "rae" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1; name = "Air to Pure"},/turf/open/floor/plasteel,/area/engine/atmos) -"ree" = (/turf/open/floor/plating{icon_state = "platingdmg2"},/area/maintenance/starboard/aft) +"ree" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/white{icon_state = "4-8"},/obj/item/twohanded/required/kirbyplants,/turf/open/floor/plasteel,/area/maintenance/starboard/aft) "rjQ" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/open/floor/plasteel,/area/engine/atmos) "rjV" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4},/obj/machinery/light/small{dir = 1},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/airlock_sensor{id_tag = "incinerator_airlock_sensor"; master_tag = "incinerator_airlock_control"; pixel_y = 24},/obj/machinery/camera/autoname{dir = 2},/turf/open/floor/engine,/area/maintenance/disposal/incinerator) "rnq" = (/obj/structure/lattice/catwalk,/obj/structure/disposalpipe/segment,/turf/open/space/basic,/area/space/nearstation) @@ -3686,6 +3686,7 @@ "sKj" = (/obj/effect/turf_decal/stripes/line{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark/telecomms,/area/tcommsat/server) "sKn" = (/obj/effect/turf_decal/stripes/line{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark/telecomms,/area/tcommsat/server) "sKW" = (/obj/structure/trash_pile,/turf/open/floor/plating{icon_state = "panelscorched"},/area/maintenance/port) +"sLf" = (/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/white{icon_state = "4-8"},/turf/open/floor/plasteel,/area/maintenance/starboard/aft) "sLg" = (/obj/effect/landmark/blobstart,/obj/effect/turf_decal/stripes/line,/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel/white,/area/medical/virology) "sLx" = (/obj/structure/table,/obj/effect/turf_decal/delivery,/obj/effect/turf_decal/stripes/line,/obj/machinery/camera{c_tag = "AI Chamber - Core"; dir = 2; name = "core camera"; network = list("rd")},/obj/machinery/cell_charger,/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ai_monitored/turret_protected/ai) "sLy" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/cable{icon_state = "0-4"},/obj/effect/turf_decal/delivery,/obj/machinery/light{dir = 1},/turf/open/floor/circuit/green,/area/ai_monitored/turret_protected/ai) @@ -3871,7 +3872,7 @@ "uTF" = (/obj/machinery/door/window/southleft{name = "Mass Driver Door"; req_access_txt = "7"},/obj/effect/turf_decal/loading_area,/turf/open/floor/plasteel,/area/science/mixing) "uVJ" = (/obj/effect/decal/cleanable/oil,/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/turf/open/floor/plasteel,/area/engine/atmos) "uZv" = (/obj/effect/spawner/structure/window/reinforced,/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/hydroponics) -"vbj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/white{icon_state = "4-8"},/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47"},/turf/open/floor/plasteel,/area/maintenance/starboard/aft) +"vbj" = (/obj/machinery/door/airlock/research/glass{name = "Research Division Access"},/turf/open/floor/plasteel,/area/maintenance/starboard/aft) "vbP" = (/obj/structure/flora/junglebush/large,/turf/open/floor/grass,/area/crew_quarters/dorms) "ver" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 10},/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel,/area/engine/atmos) "vhF" = (/obj/structure/trash_pile,/obj/machinery/light/small{dir = 4},/turf/open/floor/plating,/area/maintenance/disposal) @@ -3907,7 +3908,7 @@ "vVS" = (/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{dir = 2},/turf/open/floor/engine/plasma,/area/engine/atmos) "vYV" = (/obj/structure/disposalpipe/segment{dir = 5},/turf/closed/wall,/area/medical/medbay/zone3) "wbV" = (/obj/machinery/shower{dir = 4},/obj/structure/sign/warning/securearea{pixel_x = -32},/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel/white,/area/medical/virology) -"wdt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/white{icon_state = "4-8"},/obj/effect/turf_decal/bot,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/hallway/primary/aft) +"wdt" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/structure/cable/white{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/bot,/obj/machinery/vending/gato,/turf/open/floor/plasteel/dark,/area/hallway/primary/aft) "wdI" = (/obj/structure/disposalpipe/segment,/obj/effect/spawner/structure/window/plasma/reinforced,/turf/open/floor/plating,/area/crew_quarters/dorms) "wfQ" = (/obj/machinery/iv_drip/feeding_tube,/turf/open/floor/plating/asteroid,/area/asteroid/nearstation) "whc" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/cable/white{icon_state = "1-2"},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/structure/chair/plaswood{dir = 4},/turf/open/floor/mineral/basaltstone_floor,/area/crew_quarters/bar/atrium) @@ -3926,7 +3927,7 @@ "wBi" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 1},/turf/open/floor/plasteel,/area/crew_quarters/dorms) "wBz" = (/obj/structure/railing,/obj/structure/lattice,/turf/open/space/basic,/area/space/nearstation) "wIL" = (/obj/structure/cable/white{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating,/area/maintenance/port) -"wIQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/white{icon_state = "4-8"},/obj/effect/turf_decal/delivery,/obj/effect/turf_decal/stripes/line{dir = 2},/turf/open/floor/plasteel,/area/maintenance/starboard/aft) +"wIQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/delivery,/obj/effect/turf_decal/stripes/line{dir = 2},/turf/open/floor/plasteel,/area/maintenance/starboard/aft) "wKV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/white{icon_state = "4-8"},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/structure/disposalpipe/junction/flip{dir = 4},/turf/open/floor/mineral/basaltstone_floor,/area/crew_quarters/bar/atrium) "wOn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/white{icon_state = "4-8"},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/mineral/basaltstone_floor,/area/crew_quarters/bar/atrium) "wPr" = (/obj/item/assembly/prox_sensor{pixel_x = -4; pixel_y = 1},/obj/item/assembly/prox_sensor{pixel_x = 8; pixel_y = 9},/obj/structure/table/reinforced,/turf/open/floor/plasteel,/area/science/mixing) @@ -3948,7 +3949,7 @@ "xws" = (/obj/structure/cable/white{icon_state = "0-8"},/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/preopen{id = "brigfront"; name = "Brig Blast door"},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating,/area/security/brig) "xwu" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/engine/break_room) "xyo" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/engine/atmos) -"xza" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/white{icon_state = "4-8"},/turf/open/floor/plating{icon_state = "platingdmg2"},/area/maintenance/starboard/aft) +"xza" = (/obj/structure/cable/white{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/twohanded/required/kirbyplants,/turf/open/floor/plasteel,/area/maintenance/starboard/aft) "xAj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/engine/atmos) "xAZ" = (/obj/structure/disposalpipe/segment{dir = 6},/turf/closed/wall/r_wall,/area/maintenance/disposal) "xDB" = (/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/structure/chair/stool/bar/brass,/turf/open/floor/mineral/basaltstone_floor,/area/crew_quarters/bar/atrium) @@ -4120,8 +4121,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxKDnCPkMOkMOkMOkMOrRQoRtjTMrKlgdVoeqkWgfeUhmYkMOkMOkMOkMOliRgLWaaaaaaaaaaaaaaaaaaaaasdXaaaaaaaaaaaaaaaaacaacaacaadaadaadaadqltwwrdoAbevbevbevwZjdEadEabcKqltbcLbcMbcNbcOocubbmbcRbapbcSaBnaShbcUbcVbcWbcXaWbbcYtyDbcZkacbdabdbbdckacjuQaBoaBqbdebdfbdgbdhniAbdjbdkbdlbdmbdnbdobdpbdqbdrbdsamEbdubdvbdwbdxbdybahbdzbdAiiosVtsVtsVtsVtgcwsVtlzGmvBeZssVtiioiioiioiiogGqogLdiQohMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoOIoOIoOIoOIoOIoOIoOIoOIoOIoOIoOIoOIhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapZUpZUpZUcaijdvpZUcaiaaaaaaaaaaaaxKDnCPkMOecEtKJkMOpbxlHUawQawQnwlawQawQiJjjUykMOecEtKJkMOliRgLWaaaaaaaaaaaaaaaaaaaaasdXaaaaaaaaaaaaaaaaacaadaadaadaadaadaadqltwwrdoAbevbevbevgfKdEadEabdHgAEbdIbdJbdKbdLbdMbbmbdNbaplyxaBsaShbdQbdRbltbdSaiPbdUbdVbdWaWKbdXbdYbdZbeabaGaBubebbecbedbeebyoaTDbefaZaaBvbehbeiaBwaZeaBxaBzbaabembenbeobepbeqberbahsOZaCubesbetvCufDZlowfcsloweBJkqHvPZsVtaadaadaadiioiioiioiioiioedAedAedAedAedAedAedAedAedAedAedAedAedAedAedAedAedAedAedAedAedAedAedAedAedAedAedAedAhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasdXaaaaaaaaasdXaaaaaaaaaaaaqAafcMnCPkMOtUTvURkMOkMOkMOkMOlLsgxMgsMkMOkMOkMOkMOvUebGokMOliRfOSqAasdXsdXpZUpZUpZUcaiqAasdXsdXsdXsdXcaigeraadaadaadaadaadaadqltmLMqltmBfbevbevrpNdEadEadEaqltbeybezbeAbeBocubbmbeCbapyiPaZoaShaShaShaShaShaShbeEaBLaShaShaShaShaShbeGbaGaTxbyobeHbeIbeJbyoiMLbeKbeLbeLbeLbeLbeLbeLaBMaBNaZlbeObePaZlaZlaZlaZlbeQuepaCubesbettinhNTaiQiUOajGcgbvlJjdesVtaadaadaadaadaadaadaadaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapZUaaaaaafgSfgSaaaaaaaaafgSfgSaaaaaaaaaemXxKDnCPpmJvUevUeiARrWwkMOewHuvPwBihYFqCgkMOfcviARvUevUeosuliRgLWgRCaaaaaaaaaaaaaaaaaasdXaaaaaaaaaaaaaaapZUaaaaadaacaadaadaadqltryIdoAdhMdEabdHquqdDldEavhFqltbajbajrOqbajmrdbajbajbapfYfaCgwILwILaConxPaOLwILbeZaCpwILbfbaYFsKWaCqbajbfeaTxbysbyoaCrbyobysaTDbfgwdtglCtjhreereeaCyaCvaCxaCyozkbfnsPIsPIsPIaIzemAbfraCubesbettinbkflowsvXlowugupHHpmKsVtaadaadaadaadaadaadaadaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawyVsdXsdXkYJnOrfVcmLtfVcgrUiNVaaaaaaaaaemXxKDnCPpmJbQJesomDHmfqeDZoZcgeErnTlPwoZcnOBmfqcLHesobQJosuliRgLWgRCaaaaaaaaaaaaaaaaaapZUaaaaaaaaaaaaaaapZUaaaaaaaacaadaadaadqltxVnqltqltvCnqltqltqltqltqltqltaadbajbajbfubfvbfubfwbfxbfybfzbfAbfAaCBbfAbfybfAbfCbfAbfAaCMbfEbfFaDfaDgbfIbfJbfKbfKbfLbfKbfKgiibfOlXkaCtxzaaTSsPKvbjwIQciVvbjqmQmXqmXqmXqdCGmLWxdrhsomgVlMulMukNjlMulMueWojRekPiucuiiosVtaadaadaadaadaadaadaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapZUaaaaaafgSfgSaaaaaaaaafgSfgSaaaaaaaaaemXxKDnCPpmJvUevUeiARrWwkMOewHuvPwBihYFqCgkMOfcviARvUevUeosuliRgLWgRCaaaaaaaaaaaaaaaaaasdXaaaaaaaaaaaaaaapZUaaaaadaacaadaadaadqltryIdoAdhMdEabdHquqdDldEavhFqltbajbajrOqbajmrdbajbajbapfYfaCgwILwILaConxPaOLwILbeZaCpwILbfbaYFsKWaCqbajbfeaTxbysbyoaCrbyobysaTDbfgwdtglCxzamovreemjvaCvaCxsLfozkbfnsPIsPIsPIaIzemAbfraCubesbettinbkflowsvXlowugupHHpmKsVtaadaadaadaadaadaadaadaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawyVsdXsdXkYJnOrfVcmLtfVcgrUiNVaaaaaaaaaemXxKDnCPpmJbQJesomDHmfqeDZoZcgeErnTlPwoZcnOBmfqcLHesobQJosuliRgLWgRCaaaaaaaaaaaaaaaaaapZUaaaaaaaaaaaaaaapZUaaaaaaaacaadaadaadqltxVnqltqltvCnqltqltqltqltqltqltaadbajbajbfubfvbfubfwbfxbfybfzbfAbfAaCBbfAbfybfAbfCbfAbfAaCMbfEbfFaDfaDgbfIbfJbfKbfKbfLbfKbfKgiibfOlXkaCttjhtjhtjhvbjwIQciVaCyqmQmXqmXqmXqdCGmLWxdrhsomgVlMulMukNjlMulMueWojRekPiucuiiosVtaadaadaadaadaadaadaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasdXaaaaaaeGAeGAsdXlMBsdXeGAeGAaaaaaaaaaemXxKDnCPpmJslemfGpmChdJkMOjLbgBqtLvpDjjLbkMOhdJpmCiqImCdosuliRgLWgRCaaaaaaaaaaaaaaaaaasdXaaaaaaaaaaaaaaacaiaaaaaaaaaaacaadaadaadaacaadqltdEaomWabTaadaadaadaadaadaadaadbfubfSbfubfubfubfTbfUbfubfVbfWbfXbfYbfZbgabgbbfuaDnlyxaZoaDobajbgebgfuuXuuXaYcugKugKlErheQbglbfPbfPbfPbfPbfPaDkaDmbfPbfPbfPbfPbfPsdLsdLbgubgvbgwbgxbgAbgzbgAbgAsdLaadaadaadaadaadaadaadaadaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapZUcTjfVcfVcfVcfVccSefVcfVcfVcfVcfVcfVcfVcbDhmQRkMOkMOkMOkMOkMOkMOkGYxVddMMqdTnTBkMOkMOkMOkMOkMOkMOliRfOSqAasdXcaisdXsdXsdXsdXqAapZUpZUpZUpZUcaiqAasdXsdXsdXsdXabTaadaadaacaadqltvCnqltabTaadaadaadaadaadaadaadbfubgBbfubgCbfubgDbgEbgFbgGbgHbgIbgJbgKbgLbgMbfubgNbgObgPbgPbgQbgRbgSbgTbgUbgUbgUbgVbgRbgWbgXbfPbgmbgmbgobgpaDpaDqbgobgmvsfbgmbgmsdLbhjsPYkRVhiRbgAbgxfzHbgAbgxsdLaadaadaadaadaadaadaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapZUaaaaaafgSfgSsdXlMBsdXfgSfgSaaaaaaaaaemXxKDliRayzsleemIlLqnDxkMOjLbsOanfPhlxjLbkMOqvGlLqeGymCdaxIliRgLWgRCaaaaaaaaaaaaaaaaaasdXaaaaaaaaaaaaaaasdXaaaaaaaaaaaaaaaaadaacaacaadaadaacaadaadaadaadaadaadaadaadbfubfubhobfubhpbfubhqbhrbfubhsbhtbhubhvbhwbhwbhxbhybhzbhAbhBbhCbhDbhEbhFbhGbhHbhIbhHbhGbhJbhKbhLbfPbgYbgZbhabhbaDFaDHrCwbgmbhgbhgbhisdLwbVbhTbhUhiRbhWbhYsLgbhYbhWsdLaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMaaaaaaaaaaaaaaa @@ -4145,11 +4146,11 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasdXaaebjYaEgaFpbjXaaesdXaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabgUbgPaFIaFMbgPbgUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaccnEaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabgUpGxblcblcubkbgUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadenQeAeaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabgUbgUbgUblcbgUbgUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaebgUblcblcblcbgUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabgUgIDqGcblcbgUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabgUblcblcblcbgUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabgUbgUbgUbgUbgUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadenQeAeaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabgUbgUbgUbgUbgUbgUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaaaaaaaaaaaaaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaaaaaaaaaaaaaaaaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index ac0c27fb..b5a34385 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -17343,6 +17343,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/hallway/primary/aft) "aIB" = ( @@ -18232,12 +18233,6 @@ }, /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/restrooms) -"aKi" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "aKj" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ @@ -18261,11 +18256,18 @@ /turf/open/floor/plating, /area/maintenance/department/cargo) "aKl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/machinery/door/poddoor/shutters/preopen{ + id = "research_shutters_2"; + name = "research shutters" }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) +/obj/machinery/autolathe, +/obj/machinery/door/window/eastright{ + dir = 2; + name = "Research and Development Desk"; + req_one_access_txt = "7;29" + }, +/turf/open/floor/plating, +/area/science/lab) "aKm" = ( /obj/structure/cable{ icon_state = "1-2" @@ -18310,23 +18312,10 @@ /turf/open/floor/plating, /area/maintenance/department/cargo) "aKs" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) -"aKt" = ( -/obj/machinery/door/airlock/public/glass{ - dir = 4; - name = "Central Access"; - step_x = 0; - step_y = 0 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/security/checkpoint/science) "aKu" = ( /obj/structure/cable{ icon_state = "1-4" @@ -18345,12 +18334,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"aKw" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "aKx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/loading_area{ @@ -18907,28 +18890,32 @@ /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) "aLM" = ( -/obj/machinery/computer/security, /obj/machinery/light{ dir = 8 }, -/obj/effect/turf_decal/tile/red{ +/obj/machinery/vending/gato, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/security/checkpoint/science) "aLN" = ( -/obj/machinery/computer/security/mining, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/structure/chair/sofa/right, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/security/checkpoint/science) "aLO" = ( -/obj/machinery/computer/secure_data, /obj/machinery/airalarm{ dir = 8; pixel_x = 23 @@ -18940,34 +18927,32 @@ pixel_x = 28; pixel_y = 24 }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/structure/chair/sofa/left, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/white, /area/security/checkpoint/science) "aLP" = ( -/obj/structure/table, /obj/machinery/camera{ c_tag = "Science Security Post"; dir = 4; network = list("ss13","rd") }, -/obj/item/book/manual/wiki/security_space_law, /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/white, /area/security/checkpoint/science) "aLQ" = ( /obj/structure/reagent_dispensers/fueltank, @@ -19085,21 +19070,17 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "aMd" = ( -/obj/effect/landmark/start/depsec/science, -/obj/structure/chair/office/dark{ - dir = 1 - }, /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/white, /area/security/checkpoint/science) "aMe" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/white, /area/security/checkpoint/science) "aMf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -19390,39 +19371,34 @@ /turf/open/floor/plating, /area/maintenance/disposal) "aMI" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/red{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/white, /area/security/checkpoint/science) "aMJ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/white, /area/security/checkpoint/science) "aMK" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/structure/closet/wardrobe/red, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/white, /area/security/checkpoint/science) "aML" = ( /obj/effect/turf_decal/tile/red{ @@ -19440,52 +19416,54 @@ /turf/open/floor/plasteel/white, /area/hallway/secondary/entry) "aMN" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = -32 - }, -/obj/structure/filingcabinet/security, -/obj/effect/turf_decal/tile/red{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/item/twohanded/required/kirbyplants, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/white, /area/security/checkpoint/science) "aMO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/quantumpad{ + map_pad_id = "station"; + map_pad_link_id = "xenoarch"; + mapped_quantum_pads = list("station","xenoarch") }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/white, /area/security/checkpoint/science) "aMP" = ( /obj/machinery/power/apc{ dir = 4; - name = "Science Security APC"; + name = "Xenoarch Teleporter"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ icon_state = "0-8" }, -/obj/structure/closet/secure_closet/security/science, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ +/obj/item/twohanded/required/kirbyplants, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/security/checkpoint/science) "aMQ" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ @@ -25412,6 +25390,9 @@ name = "Station Intercom (General)"; pixel_y = 26 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "aYV" = ( @@ -41294,25 +41275,11 @@ /turf/closed/wall, /area/hallway/primary/aft) "bGb" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Research Security Post"; - req_access_txt = "63" - }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/security/checkpoint/science) "bGc" = ( /obj/effect/spawner/structure/window/reinforced, @@ -41933,7 +41900,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-2" }, @@ -42534,13 +42500,13 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bIA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "4-8" }, /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel, /area/hallway/primary/aft) "bIC" = ( @@ -53994,7 +53960,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/hallway/primary/aft) "cqx" = ( @@ -64931,13 +64897,14 @@ }, /area/maintenance/department/cargo) "xaA" = ( -/obj/machinery/quantumpad{ - map_pad_id = "station"; - map_pad_link_id = "xenoarch"; - mapped_quantum_pads = list("station","xenoarch") +/obj/machinery/door/airlock/public/glass{ + dir = 4; + name = "Central Access"; + step_x = 0; + step_y = 0 }, /turf/open/floor/plasteel, -/area/hallway/secondary/entry) +/area/security/checkpoint/science) "xaO" = ( /obj/structure/disposaloutlet, /obj/structure/disposalpipe/trunk{ @@ -85106,9 +85073,9 @@ baL baK bon aZx -aZx -aZx -aZx +aaa +aaa +bGI aZx aKA aLp @@ -85363,9 +85330,9 @@ aIJ baK boo aZx -aKi -aKs -aKv +aaa +aaa +bGI aZx aKA bzz @@ -85620,9 +85587,9 @@ aIK baK bon aZx -aIG -xaA -aFK +aaa +aaa +bGI aZx aKA bzz @@ -85877,9 +85844,9 @@ aJg baK bon aZx -aKl -baK -aKw +aaa +aaa +bGI aZx aKA bzz @@ -86135,7 +86102,7 @@ baK bon aZx aZx -aKt +aZx aZx tOe aKA @@ -86392,7 +86359,7 @@ baK aFT bbR bbR -aJB +bbR aKv aZx aKB @@ -100010,7 +99977,7 @@ blz bmI byK boT -bqb +aKl bru bsT bus @@ -100536,7 +100503,7 @@ aLM aLP aMI aMN -bAt +aKs aIA cqw cqD @@ -101304,8 +101271,8 @@ bxl cqt bAu bAu -bAt -bAt +xaA +xaA bAu bAu bHg diff --git a/code/game/turfs/simulated/floor/mineral_floor.dm b/code/game/turfs/simulated/floor/mineral_floor.dm index 37716212..789d8dc4 100644 --- a/code/game/turfs/simulated/floor/mineral_floor.dm +++ b/code/game/turfs/simulated/floor/mineral_floor.dm @@ -215,7 +215,7 @@ var/last_event = 0 var/active = null ///How much fatness is added to the user upon crossing? - var/fat_to_add = 50 + var/fat_to_add = 30 /turf/open/floor/mineral/calorite/Entered(mob/living/carbon/M) if(!istype(M, /mob/living/carbon)) @@ -238,11 +238,12 @@ icon_state = "calorite_strong" floor_tile = /obj/item/stack/tile/mineral/calorite/strong icons = list("calorite_strong","calorite_dam") + fat_to_add = 100 // calorite dance floor, groovy! - GS13 /turf/open/floor/mineral/calorite/dance - name = "Infused calorite floor" + name = "Calorite dancefloor" icon_state = "calorite_dance" floor_tile = /obj/item/stack/tile/mineral/calorite/dance icons = list("calorite_dance","calorite_dam") diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index cf5b8199..f0beb447 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -11,7 +11,7 @@ desc = "It's watching you suspiciously." /obj/structure/closet/crate/necropolis/tendril/PopulateContents() - var/loot = rand(1,28) + var/loot = rand(1,33) switch(loot) if(1) new /obj/item/shared_storage/red(src) @@ -77,6 +77,18 @@ new /obj/item/bedsheet/cult(src) if(28) new /obj/item/clothing/neck/necklace/memento_mori(src) + if(29) + new /obj/item/book/granter/spell/fattening(src) + new /obj/item/reagent_containers/glass/bottle/weightgain(src) + if(30) + new /obj/item/book/granter/spell/fattening/transfer(src) + new /obj/item/book/granter/spell/fattening/steal (src) + if(31) + new /obj/item/gun/energy/fatoray(src) + if(32) + new /obj/item/gun/energy/fatoray/cannon(src) + if(33) + new /obj/item/gun/magic/wand/food(src) // if(29) // new /obj/item/clothing/gloves/gauntlets(src) @@ -1464,4 +1476,4 @@ if(!istype(A, /turf/closed/mineral)) return A.attackby(src, H) - return COMPONENT_CANCEL_ATTACK_CHAIN \ No newline at end of file + return COMPONENT_CANCEL_ATTACK_CHAIN diff --git a/code/modules/mining/lavaland/ruins/gym.dm b/code/modules/mining/lavaland/ruins/gym.dm index adba40c6..1d7e0f28 100644 --- a/code/modules/mining/lavaland/ruins/gym.dm +++ b/code/modules/mining/lavaland/ruins/gym.dm @@ -35,7 +35,7 @@ var/icon_state_inuse //GS13 EDIT ///How much fatness is lost when using the machine? - var/loss_per_use = 15 + var/loss_per_use = 30 /obj/structure/weightmachine/proc/AnimateMachine(mob/living/user) return diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index 9ef962ff..353d8dcf 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -247,6 +247,11 @@ desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium." spawned_disease = /datum/disease/advance/cold +/obj/item/reagent_containers/glass/bottle/weightgain //GS13 + name = "Weight gain culture bottle" + desc = "A small bottle. Contains a disease that multiplies victim's adipose." + spawned_disease = /datum/symptom/weight_gain + /obj/item/reagent_containers/glass/bottle/flu_virion name = "Flu virion culture bottle" desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."