diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm index ea3a2af391bc..9a7530ece878 100644 --- a/code/game/objects/structures/props.dm +++ b/code/game/objects/structures/props.dm @@ -187,6 +187,20 @@ lit = TRUE Update() +/obj/structure/prop/evac + name = "EVAC-3F Multirole Fighter" + desc = "A state of the art EVAC-3F aerospace fighter used by the USCM. These fighters, in use by the USCM are designed to be modular and fulfil a variety of purposes. However, these aircraft have long seen better day on the Almayer, with extensive internal wiring damage and unfinished repairs to the bomb-bays." + icon = 'icons/obj/structures/props/256x256.dmi' + icon_state = "evac_uscm" + bound_height = 256 + bound_width = 256 + +/obj/structure/prop/evac/usaf + name = "EVAC-3O Reconnaissance Fighter" + desc = "High tech, silver coated EVAC-3O used by the USAF in deep recon mission. The thermal-absorbent paint alone probably costs more than your whole paycheck. Unfortunately, however, this jet was in the middle of repairs during the outbreak." + icon = 'icons/obj/structures/props/256x256.dmi' + icon_state = "evac_usaf" + /obj/structure/prop/dam/gravestone name = "grave marker" desc = "A grave marker, in the traditional Japanese style." diff --git a/icons/obj/structures/props/256x256.dmi b/icons/obj/structures/props/256x256.dmi new file mode 100644 index 000000000000..9009a6128880 Binary files /dev/null and b/icons/obj/structures/props/256x256.dmi differ diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index 4488d13b9bc7..1ddda5c7a5a2 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -1778,6 +1778,10 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"beD" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "beE" = ( /obj/item/device/taperecorder, /obj/structure/surface/table/reinforced/prison, @@ -2407,7 +2411,6 @@ name = "exotic bedsheet"; pixel_x = -1 }, -/obj/item/ammo_magazine/rifle/m4ra, /turf/open/floor/wood, /area/varadero/interior/bunks) "bBo" = ( @@ -2533,6 +2536,10 @@ /obj/effect/landmark/crap_item, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"bFC" = ( +/obj/item/ammo_magazine/rifle/m4ra, +/turf/open/floor/carpet, +/area/varadero/interior/bunks) "bFD" = ( /obj/structure/bed/chair{ icon_state = "chair_alt"; @@ -2958,7 +2965,6 @@ /area/varadero/interior/caves/north_research) "bTm" = ( /obj/structure/pipes/standard/simple/hidden/green, -/obj/item/weapon/gun/rifle/m4ra, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -3912,6 +3918,11 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) +"czo" = ( +/obj/structure/surface/table, +/obj/item/ammo_box/magazine/misc/power_cell/empty, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "czA" = ( /obj/item/stack/sheet/wood, /turf/open/floor/plating/icefloor{ @@ -4833,6 +4844,11 @@ icon_state = "yellow" }, /area/varadero/interior/hall_NW) +"dfa" = ( +/obj/item/device/flashlight/lamp/tripod, +/obj/structure/prop/evac/usaf, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "dfs" = ( /obj/item/storage/belt/utility, /obj/structure/surface/rack, @@ -5624,7 +5640,6 @@ /area/varadero/interior/hall_N) "dKm" = ( /obj/structure/closet/secure_closet/personal/patient, -/obj/item/clothing/gloves/marine/veteran/pmc, /turf/open/floor/shiva{ icon_state = "multi_tiles" }, @@ -7301,6 +7316,12 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) +"eNW" = ( +/obj/item/limb/hand/r_hand{ + desc = "A severed hand, with a blood trail following off towards the south.. Within the fingers, a revolver is still grasped." + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "eOa" = ( /obj/structure/platform/kutjevo/smooth{ climb_delay = 1; @@ -8597,6 +8618,13 @@ icon_state = "floor3" }, /area/varadero/interior/hall_SE) +"fEt" = ( +/obj/structure/surface/table, +/obj/structure/machinery/computer3/laptop/secure_data{ + desc = "A computer terminal displaying flight records of the 29th Reconnaissance Squadron." + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "fEu" = ( /turf/open/floor{ icon_state = "bcircuit" @@ -8766,6 +8794,10 @@ icon_state = "snow_mat" }, /area/varadero/interior/security) +"fHY" = ( +/obj/structure/largecrate/random, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "fIk" = ( /obj/item/prop/colony/used_flare, /turf/open/floor{ @@ -8995,6 +9027,9 @@ icon_state = "yellow" }, /area/varadero/interior/hall_NW) +"fPV" = ( +/turf/open/space/basic, +/area/varadero/exterior/lz2_near) "fQh" = ( /obj/item/shard{ icon_state = "large"; @@ -9055,6 +9090,10 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/monsoon) +"fUk" = ( +/obj/structure/surface/table, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "fUn" = ( /turf/open/floor/shiva{ icon_state = "multi_tiles" @@ -10178,6 +10217,14 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"gAP" = ( +/obj/effect/decal/cleanable/blood/writing, +/obj/item/limb/hand/r_hand{ + desc = "A severed hand, with a blood trail following off towards the south.. Within the fingers, a revolver is still grasped." + }, +/obj/item/weapon/gun/revolver/m44/custom, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "gAV" = ( /obj/structure/barricade/wooden{ dir = 1 @@ -11660,7 +11707,6 @@ pixel_x = -2; pixel_y = 8 }, -/obj/item/ammo_magazine/rifle/m4ra, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -13260,14 +13306,8 @@ /turf/closed/wall/r_wall, /area/varadero/interior_protected/caves/central) "iFc" = ( -/obj/structure/largecrate/random/mini/chest{ - pixel_x = -7; - pixel_y = -11; - desc = "A chest... filled with the wildest riches!" - }, -/turf/open/gm/dirt{ - icon_state = "desert_dug" - }, +/obj/structure/prop/evac/usaf, +/turf/closed/wall/rock/brown, /area/varadero/exterior/lz2_near) "iFm" = ( /obj/structure/surface/table/reinforced/prison, @@ -14964,6 +15004,12 @@ icon_state = "blue" }, /area/varadero/interior/technical_storage) +"jIC" = ( +/obj/structure/reagent_dispensers/ammoniatank, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/hall_NW) "jJf" = ( /obj/effect/landmark/corpsespawner/colonist/burst, /turf/open/gm/coast/beachcorner/north_west, @@ -15268,6 +15314,12 @@ icon_state = "asteroidplating" }, /area/varadero/interior/comms1) +"jRA" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/blood/writing, +/obj/item/weapon/gun/rifle/m4ra, +/turf/open/floor/wood, +/area/varadero/interior/hall_SE) "jSN" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/surface/table/woodentable{ @@ -15939,6 +15991,10 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) +"kqY" = ( +/obj/effect/decal/cleanable/blood/writing, +/turf/open/floor/carpet, +/area/varadero/interior/hall_SE) "krl" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/shiva{ @@ -17211,8 +17267,6 @@ }, /area/varadero/interior/hall_NW) "lgb" = ( -/obj/structure/bedsheetbin, -/obj/item/ammo_magazine/rifle/m4ra, /obj/structure/machinery/storm_siren{ dir = 4; pixel_x = -3 @@ -17544,6 +17598,7 @@ /area/varadero/exterior/pontoon_beach) "lsR" = ( /obj/item/ammo_magazine/rifle/m4ra, +/obj/item/ammo_magazine/rifle/m4ra, /turf/open/floor/shiva{ icon_state = "multi_tiles" }, @@ -17560,6 +17615,10 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/varadero/interior/hall_N) +"ltw" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "ltA" = ( /turf/open/floor/shiva{ dir = 1; @@ -20883,6 +20942,10 @@ default_name = "deep ocean" }, /area/varadero/exterior/farocean) +"nvV" = ( +/obj/item/weapon/gun/rifle/m4ra, +/turf/open/floor/carpet, +/area/varadero/interior/bunks) "nwi" = ( /obj/structure/machinery/power/port_gen/pacman/mrs, /turf/open/floor/plating/icefloor{ @@ -23457,6 +23520,14 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"pfv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/green, +/obj/effect/decal/cleanable/blood/writing, +/turf/open/floor/carpet, +/area/varadero/interior/hall_SE) "pfL" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -24821,6 +24892,11 @@ icon_state = "purple" }, /area/varadero/interior/research) +"pVH" = ( +/obj/structure/surface/table, +/obj/item/clothing/head/helmet/marine/pilot, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "pVN" = ( /obj/structure/window/framed/colony, /turf/open/floor/plating, @@ -28299,6 +28375,12 @@ }, /turf/open/floor/wood, /area/varadero/interior/beach_bar) +"saZ" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/gm/dirt{ + icon_state = "desert0" + }, +/area/varadero/exterior/lz2_near) "sbX" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -29580,6 +29662,11 @@ icon_state = "yellowfull" }, /area/varadero/interior/electrical) +"sPr" = ( +/obj/structure/surface/table, +/obj/item/book/manual/ripley_build_and_repair, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "sPs" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/wood, @@ -36259,6 +36346,10 @@ icon_state = "multi_tiles" }, /area/varadero/interior/electrical) +"xey" = ( +/obj/vehicle/powerloader, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "xeO" = ( /obj/structure/platform_decoration/kutjevo{ dir = 1 @@ -37101,6 +37192,10 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/carpet, /area/varadero/interior/records) +"xGQ" = ( +/obj/structure/ship_ammo/laser_battery, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "xGV" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/grass/grass1/weedable, @@ -37973,6 +38068,11 @@ icon_state = "wredfull" }, /area/varadero/interior/medical) +"yiR" = ( +/obj/structure/surface/table, +/obj/item/prop/almayer/flight_recorder, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "yji" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/regular{ @@ -45820,7 +45920,7 @@ cVG cVG dbV kuX -kuX +jIC kuX ddY kuX @@ -54575,9 +54675,9 @@ thY mPI bTm snP -qhF -ffx -umT +jRA +pfv +kqY eDF gFx fvw @@ -55477,8 +55577,8 @@ qvQ uXX xNR gZI -vNu -vNu +bFC +nvV iAc qFZ hPd @@ -55841,12 +55941,12 @@ aAj cGd xNR gLZ -vNu +bFC pRs ssZ vzH bNt -syL +lsR syL ydx hwP @@ -61772,7 +61872,7 @@ aQN slw kgp eia -lTg +fHY hVL wlB qAy @@ -61954,7 +62054,7 @@ bYO lTg wlB nKf -wlB +jwX wlB wlB wlB @@ -62127,13 +62227,13 @@ ghW wlB beK mtT +iFc kgp -kgp -wlB +xey wlB hmh wlB -jwX +wlB aQN aQN sKz @@ -62305,7 +62405,7 @@ cUN pCa tMZ wlB -eia +wlB wlB ghW lTg @@ -62316,7 +62416,7 @@ wlB wlB wlB wlB -jwX +wlB wlB wlB qNX @@ -62487,14 +62587,14 @@ mPk wfR dYd wlB -kAH +wlB lTg wlB +ltw wlB wlB wlB wlB -gjC wlB lTg wlB @@ -62860,14 +62960,14 @@ wlB wlB wlB wlB -wlB +ltw lTg wlB -wlB +ltw lTg lTg wlB -lTg +beD wlB lTg wlB @@ -63031,16 +63131,16 @@ mPk pRa cJL iWj -hPq -wlB wlB wlB wlB wlB -lTg wlB wlB lTg +fUk +pVH +gAP lTg lTg tuT @@ -63214,10 +63314,10 @@ pRa mPk rJv rXk -lTg -wlB +beD wlB wlB +fEt wlB lTg lTg @@ -63579,7 +63679,7 @@ cJL rYC nsN wlB -wlB +eia vNy wlB wlB @@ -63768,7 +63868,7 @@ wlB pXT lTg lTg -lTg +eNW wlB wlB wlB @@ -65216,7 +65316,7 @@ pRa pRa wLB nsN -hPq +wlB wlB wlB lTg @@ -65767,7 +65867,7 @@ wlB wlB wlB wlB -lTg +dfa wlB ghW wlB @@ -65967,7 +66067,7 @@ phk wlB wlB bnH -mdg +saZ wlB wlB lTg @@ -66126,10 +66226,10 @@ mPk cJL wBp nsN -tLS +wlB wlB lTg -eia +wlB wlB wlB wlB @@ -66142,11 +66242,11 @@ lTg mdg wlB xCZ +ltw wlB wlB -wlB -wlB -lTg +xGQ +czo wlB nFX nFX @@ -66315,8 +66415,8 @@ wlB lTg wlB lTg -lTg -wlB +yiR +sPr qNu wlB wlB @@ -66672,8 +66772,8 @@ mPk mPk rYC nsN -iFc -qAy +hmh +fPV lTg lTg wlB @@ -67059,7 +67159,7 @@ wlB wlB uIW nsN -wlB +ltw wlB lTg wlB diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 828e406cc28b..b80d69c1cb76 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -7626,6 +7626,15 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) +"axt" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/hangar) "axu" = ( /obj/structure/machinery/computer/telecomms/server, /turf/open/floor/almayer{ @@ -12460,7 +12469,10 @@ }, /area/almayer/command/cic) "aRu" = ( -/obj/structure/foamed_metal, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/emails{ + dir = 8 + }, /turf/open/floor/plating, /area/almayer/hallways/hangar) "aRv" = ( @@ -16915,6 +16927,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) +"boj" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/closed/wall/almayer, +/area/almayer/hull/lower_hull/l_f_s) "bop" = ( /obj/structure/machinery/cm_vending/clothing/military_police{ density = 0; @@ -17169,6 +17187,10 @@ icon_state = "dark_sterile" }, /area/almayer/medical/chemistry) +"bpA" = ( +/obj/structure/machinery/vending/walkman, +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) "bpC" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/bravo) @@ -20737,12 +20759,11 @@ }, /area/almayer/hallways/hangar) "bGR" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" }, +/turf/open/floor/almayer, /area/almayer/hallways/hangar) "bGT" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -25494,6 +25515,21 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"cbB" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/hangar) "cbD" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -28892,20 +28928,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"cIi" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_f_s) "cIr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30313,10 +30335,11 @@ }, /area/almayer/command/securestorage) "dnX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/plating/plating_catwalk, +/obj/structure/machinery/fuelcell_recycler, +/turf/open/floor/almayer, /area/almayer/hull/lower_hull/l_f_s) "dod" = ( /obj/structure/closet/crate/trashcart, @@ -32425,6 +32448,11 @@ /obj/effect/landmark/late_join/alpha, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) +"ehI" = ( +/obj/structure/surface/table/almayer, +/obj/structure/prop/server_equipment/laptop/closed, +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) "ehR" = ( /obj/structure/window/reinforced{ dir = 4; @@ -33823,13 +33851,13 @@ }, /area/almayer/hull/upper_hull/u_f_s) "eKO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 1 +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + req_access = null; + req_one_access = null; + req_one_access_txt = "3;22;19" }, -/turf/open/floor/plating/plating_catwalk, +/turf/closed/wall/almayer, /area/almayer/hull/lower_hull/l_f_s) "eKT" = ( /obj/structure/surface/table/almayer, @@ -34913,6 +34941,16 @@ icon_state = "plate" }, /area/almayer/squads/req) +"fmh" = ( +/obj/structure/machinery/landinglight/ds2, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/hangar) "fmv" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -36387,6 +36425,14 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"fSr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/cleanable/liquid_fuel, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/open/shuttle/elevator/grating, +/area/almayer/hallways/hangar) "fSF" = ( /obj/structure/sink{ dir = 1; @@ -36488,6 +36534,9 @@ "fUA" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) +"fVx" = ( +/turf/open/shuttle/elevator/grating, +/area/almayer/hallways/hangar) "fVz" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -39571,6 +39620,13 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha_bravo_shared) +"hmI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) "hmS" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ @@ -40630,6 +40686,19 @@ icon_state = "test_floor4" }, /area/almayer/medical/medical_science) +"hPf" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/hangar) "hPg" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_2" @@ -41431,6 +41500,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"ihu" = ( +/obj/structure/machinery/landinglight/ds1, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/hangar) "ihw" = ( /obj/structure/machinery/cm_vending/sorted/medical, /turf/open/floor/almayer{ @@ -42882,6 +42961,21 @@ icon_state = "cargo" }, /area/almayer/squads/alpha) +"iPV" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/hangar) "iQg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -45889,6 +45983,13 @@ icon_state = "plate" }, /area/almayer/squads/charlie_delta_shared) +"khm" = ( +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101 + }, +/turf/closed/wall/almayer, +/area/almayer/living/offices/flight) "khD" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -47243,6 +47344,10 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) +"kNa" = ( +/obj/structure/prop/static_tank/fuel, +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) "kNi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -47775,6 +47880,15 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_s) +"kYy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orangecorner" + }, +/area/almayer/hallways/hangar) "kYP" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -48564,10 +48678,6 @@ icon_state = "greencorner" }, /area/almayer/hallways/starboard_hallway) -"lpS" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_f_s) "lpX" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -50005,6 +50115,16 @@ icon_state = "redcorner" }, /area/almayer/living/briefing) +"lSa" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/hangar) "lSD" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -50763,6 +50883,22 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"moq" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/hangar) "mor" = ( /obj/structure/machinery/light{ dir = 8 @@ -52011,6 +52147,11 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"mRf" = ( +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, +/area/almayer/hallways/hangar) "mRl" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -52163,6 +52304,20 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) +"mUl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/hangar) "mUn" = ( /obj/structure/machinery/conveyor_switch{ id = "lower_garbage" @@ -53191,6 +53346,9 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) +"nsd" = ( +/turf/open/floor/almayer, +/area/almayer/hull/lower_hull/l_f_s) "nsu" = ( /obj/structure/machinery/door/airlock/almayer/security{ dir = 2; @@ -54540,17 +54698,6 @@ icon_state = "cargo_arrow" }, /area/almayer/living/offices) -"nVS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_f_s) "nVU" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = -30 @@ -58642,6 +58789,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_s) +"pQJ" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/hangar) "pQN" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/franks, @@ -59088,6 +59247,12 @@ icon_state = "silvercorner" }, /area/almayer/shipboard/brig/cic_hallway) +"pZk" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orangecorner" + }, +/area/almayer/hallways/hangar) "pZo" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -60920,16 +61085,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) -"qNG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/autoopenclose{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/lower_hull/l_f_s) "qNR" = ( /obj/structure/disposalpipe/junction, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -61692,6 +61847,11 @@ /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 2 + }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) "rgA" = ( @@ -65225,6 +65385,14 @@ icon_state = "orange" }, /area/almayer/squads/bravo) +"sNv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) "sNz" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -65446,6 +65614,14 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"sSL" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/emails{ + dir = 1 + }, +/obj/item/folder/black, +/turf/open/floor/almayer, +/area/almayer/living/offices/flight) "sSR" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -65557,6 +65733,12 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"sUT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/shuttle/elevator/grating, +/area/almayer/hallways/hangar) "sVc" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/orangeseed, @@ -68477,6 +68659,10 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) +"uix" = ( +/obj/structure/sign/prop1, +/turf/closed/wall/almayer, +/area/almayer/hull/lower_hull/l_f_s) "uiG" = ( /turf/open/floor/almayer{ dir = 9; @@ -70110,6 +70296,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) +"uRu" = ( +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101; + unacidable = 1; + unslashable = 1 + }, +/turf/closed/wall/almayer, +/area/almayer/living/gym) "uRI" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice1"; @@ -71211,6 +71406,14 @@ icon_state = "red" }, /area/almayer/squads/alpha) +"vmg" = ( +/obj/vehicle/multitile{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, +/area/almayer/hallways/hangar) "vml" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /obj/structure/sign/safety/storage{ @@ -71575,6 +71778,10 @@ "vuR" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) +"vuW" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) "vuZ" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -72145,6 +72352,13 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"vIM" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop/almayer/flight_recorder{ + desc = "A military grade flight recorder that's been stored with the defunct EVAC-3s. It logs the data of their last deployment, participating in Tackle." + }, +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) "vIN" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 15; @@ -73519,6 +73733,17 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) +"wjn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/cleanable/liquid_fuel, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/open/shuttle/elevator/grating, +/area/almayer/hallways/hangar) "wjq" = ( /obj/structure/bed/chair/comfy/beige{ dir = 8 @@ -73833,6 +74058,10 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"woS" = ( +/obj/structure/machinery/vending/cigarette, +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) "wpg" = ( /obj/structure/machinery/blackbox_recorder, /turf/open/shuttle/dropship{ @@ -74282,6 +74511,17 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) +"wzj" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/hangar) "wzx" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -75114,6 +75354,13 @@ icon_state = "plate" }, /area/almayer/living/auxiliary_officer_office) +"wTT" = ( +/obj/structure/prop/evac{ + pixel_x = -14; + pixel_y = -7 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) "wUd" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/gloves{ @@ -75205,6 +75452,16 @@ "wVb" = ( /turf/closed/wall/almayer/outer, /area/almayer/hull/lower_hull/l_a_s) +"wVj" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/hangar) "wVw" = ( /obj/structure/closet/secure_closet/guncabinet/red, /obj/structure/machinery/light/small{ @@ -75692,6 +75949,15 @@ icon_state = "tcomms" }, /area/almayer/engineering/engine_core) +"xfl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, +/area/almayer/hallways/hangar) "xfm" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/window/framed/almayer, @@ -76338,6 +76604,11 @@ icon_state = "cargo" }, /area/almayer/hallways/vehiclehangar) +"xtf" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) "xtC" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -76981,6 +77252,10 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) +"xFY" = ( +/obj/structure/prop/static_tank/fuel, +/turf/open/floor/almayer, +/area/almayer/hull/lower_hull/l_f_s) "xFZ" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -96329,8 +96604,8 @@ mGL mGL rII xyw -bHB -aZQ +cbB +fmh baI baI baI @@ -96532,7 +96807,7 @@ gYB pXQ kYa xyw -bHB +wzj aZR baI baI @@ -96735,7 +97010,7 @@ uNL uNL uNL xyw -bHB +wzj aZO baI baI @@ -96938,7 +97213,7 @@ hqs jFh uNL wlb -bHB +wzj aZP baI baI @@ -97141,7 +97416,7 @@ hJp mGL mBb wqh -bHB +wzj aZQ baI baI @@ -97344,7 +97619,7 @@ jFh cQF uNL pyC -bHB +wzj aZR baI baI @@ -97547,8 +97822,8 @@ uNL uNL uNL cCE -bHB -aZO +iPV +lSa baI baI baI @@ -97750,7 +98025,7 @@ ajp vdJ bJo amo -bHB +wzj aZP baI baI @@ -97953,7 +98228,7 @@ cdF sgw bJo gRP -bHB +wzj aZQ baI baI @@ -98359,7 +98634,7 @@ ccJ ajL bJo bwl -bHB +wzj xyw puI aol @@ -98562,7 +98837,7 @@ ajz aBC cfM wqh -bHB +wzj vpW eXq rri @@ -98765,7 +99040,7 @@ ajz aBC cfM wqh -bHB +wzj xyw aho vWc @@ -98968,7 +99243,7 @@ ajz aBC cfM wqh -bHB +wzj ezQ eXq fAa @@ -99171,7 +99446,7 @@ ajx tqg bJo mVE -bHB +moq xyw anU aeJ @@ -99374,7 +99649,7 @@ eLz uFL ssa sqa -hBF +axt hCt eXq qYN @@ -99577,7 +99852,7 @@ aoF aBC cfM wqh -bHB +wzj xyw aho dkj @@ -99780,7 +100055,7 @@ aoF aBC cfM wqh -bHB +wzj vpW eXq rri @@ -99983,7 +100258,7 @@ gds aky bJo vPM -bHB +wzj xyw anW aol @@ -100389,7 +100664,7 @@ aho aho eXq hmy -bHB +moq aZV baI baI @@ -100592,7 +100867,7 @@ aAL aBt ajM aXh -bHB +wzj aZW baI baI @@ -100795,8 +101070,8 @@ aoL akz ajM caM -bHB -aZX +cbB +ihu baI baI baI @@ -100998,7 +101273,7 @@ khD rYJ ajM xyw -bHB +wzj aZY baI baI @@ -101201,7 +101476,7 @@ azJ bLP eXq eVm -bHB +wzj aZV baI baI @@ -101404,7 +101679,7 @@ xWp aBw ajM xyw -bHB +wzj aZW baI baI @@ -101604,11 +101879,11 @@ aeN azl ahS ajA -akz +sSL ajM xyw -bHB -aZX +wzj +aZW baI baI baI @@ -101810,7 +102085,7 @@ aAK aBz ajM aXj -bHB +wzj aZY baI baI @@ -102002,19 +102277,19 @@ aag aag aag nXP -fpd -nVS +dnX +uNL uNL eXq +khm eXq eXq -eXq -eXq +khm eXq eXq mrD -bHB -aZV +iPV +wVj baI baI baI @@ -102206,17 +102481,17 @@ aag aag nXP hJp -dnX uNL -aRu -aRu -aRu -aRu -aRu -aRu +xFY +kNa +aYt +xAY +vIM +xtf +woS bcm aXj -bHB +wzj aZW baI baI @@ -102409,17 +102684,17 @@ aag aag nXP mGL -dnX -uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm -xyw -bHB +eKO +nsd +vuW +fVx +sUT +vuW +aYt +wTT +bGR +wqh +wzj aZX baI baI @@ -102612,17 +102887,17 @@ aag aag nXP mGL -fJX uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm -hmy -bHB +nsd +aYt +fVx +fSr +xfl +hmI +xfl +bGR +pQJ +wzj aZL baX bcw @@ -102815,17 +103090,17 @@ aag aag nXP tRV -dnX -uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm -xyw -bHB +boj +nsd +aYt +pZk +kYy +mRf +aYt +mRf +bGR +wqh +wzj wqh xyw bcc @@ -103018,17 +103293,17 @@ aag aag nXP nun -vJM -uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm -bGQ -bHB +uix +nsd +aYt +aYt +kYy +aYt +aYt +mRf +bGR +wqh +wzj tdc rOc bcx @@ -103221,17 +103496,17 @@ aag aag nXP hJp -qNG uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm +nsd +icp +aYt +xAY +mRf +aYt +mRf bGR -bHB +hPf +wzj xyw bkA bkA @@ -103424,17 +103699,17 @@ nXP nXP nXP mGL -kKG uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm -xyw -bHB +nsd +aYt +fVx +sUT +vmg +aYt +mRf +bGR +wqh +wzj xyw bkA bnj @@ -103628,15 +103903,15 @@ hJp mGL mGL eKO -uNL -aRu -aRu -aRu -aRu -aRu -aRu -bcm -aYu +nsd +vuW +fVx +wjn +sNv +hmI +hmI +bGR +mUl wTg bGq bkA @@ -103830,14 +104105,14 @@ mGL pwK cmk xJi -cIi uNL +xFY +kNa +puI +xAY aRu -aRu -aRu -aRu -aRu -aRu +ehI +bpA bcm aZZ aYC @@ -104033,13 +104308,13 @@ bdi kKG hJp pda -lpS -wfE +uNL wfE wfE wfE wfE wfE +uRu wfE wfE bsk