From 9e4276f1dac9f65269d6dc6a60e87afd3f3dce32 Mon Sep 17 00:00:00 2001 From: Noname995 Date: Thu, 15 Aug 2024 02:43:45 +0300 Subject: [PATCH] Corsar features, minimap icons --- maps/map_files/Corsair/Corsair.dmm | 336 ++++++++++++++---- maps/shuttles/dropship_lancer.dmm | 16 +- .../code/playable_factions/fl_presets.dm | 6 + 3 files changed, 287 insertions(+), 71 deletions(-) diff --git a/maps/map_files/Corsair/Corsair.dmm b/maps/map_files/Corsair/Corsair.dmm index 8563ac6d9b..bca26a3447 100644 --- a/maps/map_files/Corsair/Corsair.dmm +++ b/maps/map_files/Corsair/Corsair.dmm @@ -113,6 +113,12 @@ icon_state = "test_floor5" }, /area/golden_arrow/synthcloset) +"bB" = ( +/obj/structure/prop/hybrisa/lattice_prop/lattice_2{ + dir = 4 + }, +/turf/closed/wall/almayer, +/area/golden_arrow/medical) "bE" = ( /obj/structure/cargo_container/wy/right{ opacity = 0; @@ -212,13 +218,12 @@ icon_state = "E"; pixel_x = 1 }, -/obj/item/tool/screwdriver{ - icon_state = "screwdriver4"; - pixel_x = 1 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/liquid_fuel, +/obj/structure/machinery/light/built{ + dir = 1 + }, /turf/open/floor/almayer, /area/golden_arrow/canteen) "ci" = ( @@ -239,6 +244,11 @@ pixel_x = 15; pixel_y = 18 }, +/obj/structure/machinery/light/small/built{ + dir = 1; + pixel_x = -9; + pixel_y = 20 + }, /turf/open/floor/almayer, /area/golden_arrow/hangar) "cr" = ( @@ -314,9 +324,7 @@ /turf/open/floor/almayer, /area/golden_arrow/canteen) "df" = ( -/obj/structure/machinery/body_scanconsole{ - pixel_y = 6 - }, +/obj/structure/cargo_container/hybrisa/containersextended/medicalright, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -340,6 +348,12 @@ }, /turf/open/floor/almayer, /area/golden_arrow/synthcloset) +"dx" = ( +/obj/structure/prop/hybrisa/lattice_prop{ + dir = 4 + }, +/turf/closed/wall/almayer, +/area/golden_arrow/squad_one) "dK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -469,6 +483,12 @@ icon_state = "sterile_green" }, /area/golden_arrow/medical) +"fs" = ( +/obj/structure/prop/hybrisa/misc/floorprops/grate3{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/golden_arrow/hangar) "fw" = ( /obj/structure/machinery/door/airlock/almayer/command/reinforced{ name = "\improper Radio Jokey Office"; @@ -543,7 +563,9 @@ "gk" = ( /obj/effect/decal/mecha_wreckage/seraph{ name = "broken CLF makeshift exosuit"; - desc = "After a contract on LV-139, where freelancers were tasked to clear out some CLF guerillas, Master at Arms managed to take out this beast with just a knife. Sadly, it is no longer operational, but works as a good reminder of that brave action, which was overpaid greatly." + desc = "After a contract on LV-139, where freelancers were tasked to clear out some CLF guerillas, Master at Arms managed to take out this beast with just a knife. Sadly, it is no longer operational, but works as a good reminder of that brave action, which was overpaid greatly."; + layer = 10; + pixel_x = -10 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil/streak, @@ -557,6 +579,14 @@ }, /turf/open/floor/almayer, /area/golden_arrow/squad_one) +"gq" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1; + dir = 4 + }, +/turf/open/floor/almayer, +/area/golden_arrow/hangar) "gv" = ( /obj/structure/sink{ dir = 8; @@ -572,7 +602,7 @@ /area/golden_arrow/squad_one) "gC" = ( /obj/structure/blocker/invisible_wall, -/turf/open/floor/almayer/empty, +/turf/open/gm/empty, /area/golden_arrow/dorms) "gI" = ( /obj/structure/reagent_dispensers/beerkeg/alt_dark, @@ -602,6 +632,10 @@ opacity = 0; pixel_y = -17 }, +/obj/item/holder/cat/kitten{ + pixel_y = 27; + anchored = 1 + }, /turf/open/floor/almayer, /area/golden_arrow/hangar) "hw" = ( @@ -610,7 +644,7 @@ dir = 4 }, /obj/structure/blocker/invisible_wall, -/turf/open/floor/almayer/empty, +/turf/open/gm/empty, /area/golden_arrow/dorms) "hx" = ( /obj/structure/machinery/power/fusion_engine{ @@ -799,14 +833,22 @@ dir = 1 }, /obj/structure/blocker/invisible_wall, -/turf/open/floor/almayer/empty, +/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy2{ + alpha = 50 + }, +/turf/open/gm/empty, /area/golden_arrow/dorms) "jF" = ( -/obj/structure/bed/chair/office/light, +/obj/effect/hybrisa/decal/gold/line2, +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1; + dir = 1 + }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "cargo" }, -/area/golden_arrow/medical) +/area/golden_arrow/hangar) "jS" = ( /obj/structure/machinery/power/smes/buildable, /obj/effect/decal/cleanable/dirt, @@ -821,12 +863,28 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"kc" = ( +/obj/structure/prop/hybrisa/misc/floorprops/grate3{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/golden_arrow/hangar) "kh" = ( /obj/structure/ladder{ id = "enginorth" }, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"km" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "cargo_arrow" + }, +/area/golden_arrow/hangar) "kn" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/kutjevo/fake_wood, @@ -840,6 +898,12 @@ }, /turf/open/floor/plating, /area/golden_arrow/engineering) +"kB" = ( +/obj/item/reagent_container/food/drinks/bottle/beer/craft/bluemalt{ + pixel_y = 22 + }, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/hangar) "kC" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -866,6 +930,12 @@ icon_state = "floor3" }, /area/golden_arrow/canteen) +"kH" = ( +/obj/structure/prop/hybrisa/airport/refuelinghose2{ + layer = 2 + }, +/turf/open/floor/plating/airless, +/area/golden_arrow/hangar) "kM" = ( /obj/effect/landmark/start/marine/medic/lancer, /turf/open/floor/kutjevo/fake_wood, @@ -1004,7 +1074,10 @@ unslashable = 1 }, /obj/structure/blocker/invisible_wall, -/turf/open/floor/almayer/empty, +/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy3{ + alpha = 50 + }, +/turf/open/gm/empty, /area/golden_arrow/dorms) "mJ" = ( /obj/effect/decal/warning_stripes{ @@ -1048,7 +1121,6 @@ /obj/effect/decal/strata_decals/grime/grime1{ dir = 4 }, -/obj/structure/surface/table/reinforced/prison, /turf/open/floor/almayer{ icon_state = "sterile_green" }, @@ -1124,6 +1196,9 @@ /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/open/floor/plating, /area/golden_arrow/canteen) "pe" = ( @@ -1240,6 +1315,13 @@ /obj/item/clothing/glasses/night, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/squad_one) +"pV" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/prop/hybrisa/misc/fake/pipes/pipe1{ + alpha = 50 + }, +/turf/open/gm/empty, +/area/golden_arrow/dorms) "pW" = ( /obj/structure/machinery/computer/overwatch/almayer{ density = 1; @@ -1316,6 +1398,16 @@ icon_state = "plate" }, /area/golden_arrow/squad_one) +"qy" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/prop/hybrisa/airport/deadpilot2{ + name = "decapitated person" + }, +/turf/open/floor/plating, +/area/golden_arrow/canteen) "qH" = ( /obj/structure/machinery/power/terminal, /obj/effect/decal/cleanable/dirt, @@ -1364,7 +1456,10 @@ unslashable = 1 }, /obj/structure/blocker/invisible_wall, -/turf/open/floor/almayer/empty, +/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy4{ + alpha = 50 + }, +/turf/open/gm/empty, /area/golden_arrow/dorms) "rf" = ( /obj/structure/reagent_dispensers/fueltank{ @@ -1571,7 +1666,8 @@ /area/golden_arrow/synthcloset) "sy" = ( /obj/item/storage/toolbox/mechanical/green{ - pixel_y = 10 + pixel_y = 17; + pixel_x = 5 }, /turf/open/floor/almayer, /area/golden_arrow/hangar) @@ -1686,7 +1782,6 @@ /turf/open/shuttle/elevator, /area/golden_arrow/hangar) "tC" = ( -/obj/structure/surface/rack, /obj/item/ammo_magazine/smg/mp5, /obj/item/ammo_magazine/smg/mp5, /obj/item/ammo_magazine/smg/mp5, @@ -1716,7 +1811,9 @@ /obj/item/ammo_magazine/smg/mp5, /obj/item/ammo_magazine/smg/mp5, /obj/item/ammo_magazine/smg/mp5, -/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/green{ + name = "mp5 ammunitions crate" + }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/squad_one) "tE" = ( @@ -1725,7 +1822,6 @@ /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/engineering) "tF" = ( -/obj/structure/surface/rack, /obj/item/ammo_magazine/smg/fp9000, /obj/item/ammo_magazine/smg/fp9000, /obj/item/ammo_magazine/smg/fp9000, @@ -1733,6 +1829,9 @@ /obj/item/ammo_magazine/smg/fp9000, /obj/item/ammo_magazine/smg/fp9000, /obj/item/ammo_magazine/smg/fp9000, +/obj/structure/closet/crate/ammo/alt{ + name = "fp9000 ammunitions crate" + }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/squad_one) "tI" = ( @@ -1778,7 +1877,10 @@ /obj/structure/machinery/light/small{ dir = 8 }, -/turf/open/floor/almayer/empty, +/obj/structure/prop/hybrisa/misc/fake/pipes/pipe3{ + alpha = 50 + }, +/turf/open/gm/empty, /area/golden_arrow/dorms) "um" = ( /obj/structure/machinery/cm_vending/clothing/synth/snowflake, @@ -1818,6 +1920,10 @@ pixel_y = 10 }, /obj/effect/decal/cleanable/dirt, +/obj/item/fuelCell{ + layer = 0.3; + pixel_x = -18 + }, /turf/open/floor/almayer, /area/golden_arrow/canteen) "uP" = ( @@ -1862,13 +1968,16 @@ /area/golden_arrow/canteen) "vb" = ( /obj/structure/machinery/light/small, +/obj/structure/bedsheetbin, /turf/open/floor/almayer{ icon_state = "plate" }, /area/golden_arrow/squad_one) "vd" = ( -/obj/item/hardpoint/locomotion/van_wheels, -/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, /turf/open/floor/almayer, /area/golden_arrow/hangar) "vf" = ( @@ -2125,6 +2234,13 @@ }, /turf/open/shuttle/elevator, /area/golden_arrow/hangar) +"yF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/prop/hybrisa/lattice_prop/lattice_3{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/golden_arrow/canteen) "yG" = ( /obj/structure/prop/invuln/lifeboat_hatch_placeholder/terminal{ layer = 2.1; @@ -2280,11 +2396,17 @@ /area/golden_arrow/medical) "Ah" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/prop/hybrisa/misc/floorprops/grate3{ + dir = 1 + }, /turf/open/floor/plating/airless, /area/golden_arrow/hangar) "Aj" = ( -/obj/structure/machinery/medical_pod/bodyscanner{ - pixel_y = 6 +/obj/structure/cargo_container/hybrisa/containersextended/medicalleft, +/obj/item/device/flashlight/lamp/on{ + layer = 5; + pixel_x = 6; + pixel_y = 20 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -2310,6 +2432,17 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/golden_arrow/engineering) +"Bc" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1; + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "cargo_arrow" + }, +/area/golden_arrow/hangar) "Bo" = ( /obj/structure/machinery/cm_vending/clothing/synth, /obj/effect/decal/cleanable/dirt, @@ -2359,6 +2492,17 @@ /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/kutjevo/fake_wood, /area/golden_arrow/canteen) +"BH" = ( +/obj/structure/machinery/light/small{ + dir = 1; + pixel_y = 20; + layer = 4 + }, +/obj/structure/prop/hybrisa/lattice_prop/lattice_3{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/golden_arrow/canteen) "BK" = ( /turf/open/floor/plating, /area/golden_arrow/engineering) @@ -2400,7 +2544,7 @@ dir = 4 }, /obj/structure/blocker/invisible_wall, -/turf/open/floor/almayer/empty, +/turf/open/gm/empty, /area/golden_arrow/dorms) "Cl" = ( /obj/vehicle/powerloader{ @@ -2470,7 +2614,7 @@ dir = 1 }, /obj/structure/blocker/invisible_wall, -/turf/open/floor/almayer/empty, +/turf/open/gm/empty, /area/golden_arrow/dorms) "CH" = ( /obj/structure/surface/rack, @@ -2482,6 +2626,10 @@ "CK" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/gun/flamer, +/obj/item/trash/cheesie{ + pixel_y = 13; + layer = 2 + }, /turf/open/floor/kutjevo/fake_wood, /area/golden_arrow/dorms) "CN" = ( @@ -2799,6 +2947,14 @@ }, /turf/open/floor/almayer, /area/golden_arrow/engineering) +"FJ" = ( +/obj/effect/vehicle_spawner/box_van/fixed{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/hangar) "FK" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/toy/deck, @@ -2898,7 +3054,6 @@ }, /area/golden_arrow/hangar) "GM" = ( -/obj/structure/surface/rack, /obj/item/ammo_magazine/smg/mac15, /obj/item/ammo_magazine/smg/mac15, /obj/item/ammo_magazine/smg/mac15, @@ -2926,6 +3081,9 @@ /obj/item/ammo_magazine/smg/mac15, /obj/item/ammo_magazine/smg/mac15, /obj/item/ammo_magazine/smg/mac15, +/obj/structure/closet/crate/supply{ + name = "mac15 ammunitions crate" + }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/squad_one) "GY" = ( @@ -2971,6 +3129,13 @@ }, /turf/open/floor/almayer, /area/golden_arrow/engineering) +"Hh" = ( +/obj/structure/prop/hybrisa/misc/coffeestuff/coffeemachine2{ + pixel_y = 5; + pixel_x = -5 + }, +/turf/open/floor/kutjevo/fake_wood, +/area/golden_arrow/canteen) "Hj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light/small{ @@ -2994,6 +3159,13 @@ }, /turf/open/floor/almayer, /area/golden_arrow/engineering) +"Hn" = ( +/obj/structure/largecrate/supply/supplies/mre{ + layer = 3.1 + }, +/obj/structure/machinery/light/built, +/turf/open/shuttle/elevator, +/area/golden_arrow/hangar) "Hp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -3039,10 +3211,8 @@ }, /area/golden_arrow/hangar) "Ib" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/recharger{ - pixel_x = -8; - pixel_y = 3 +/obj/structure/machinery/body_scanconsole{ + pixel_y = 6 }, /turf/open/floor/almayer{ icon_state = "sterile_green" @@ -3099,13 +3269,17 @@ }, /area/golden_arrow/medical) "IU" = ( -/obj/effect/vehicle_spawner/van/fixed, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/prop/hybrisa/furniture/tables/tablepool, +/obj/item/reagent_container/food/drinks/coffee{ + pixel_y = 13 }, -/area/golden_arrow/hangar) +/obj/item/reagent_container/food/drinks/coffee/cuppa_joes{ + pixel_y = 2; + pixel_x = 10 + }, +/turf/open/floor/kutjevo/fake_wood, +/area/golden_arrow/canteen) "IY" = ( -/obj/structure/surface/rack, /obj/item/ammo_magazine/smg/bizon, /obj/item/ammo_magazine/smg/bizon, /obj/item/ammo_magazine/smg/bizon, @@ -3117,6 +3291,9 @@ /obj/item/ammo_magazine/smg/bizon, /obj/item/ammo_magazine/smg/bizon, /obj/item/ammo_magazine/smg/bizon, +/obj/structure/closet/crate{ + name = "bizon ammunitions crate" + }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/squad_one) "IZ" = ( @@ -3151,7 +3328,10 @@ dir = 8 }, /obj/structure/blocker/invisible_wall, -/turf/open/floor/almayer/empty, +/obj/structure/prop/hybrisa/misc/fake/pipes/pipe2{ + alpha = 50 + }, +/turf/open/gm/empty, /area/golden_arrow/dorms) "Jp" = ( /obj/structure/cargo_container/wy/left{ @@ -3164,6 +3344,12 @@ /obj/structure/machinery/power/terminal, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/engineering) +"Jw" = ( +/obj/structure/prop/hybrisa/lattice_prop/lattice_3{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/golden_arrow/canteen) "JA" = ( /turf/open/floor/kutjevo/fake_wood, /area/golden_arrow/canteen) @@ -3233,6 +3419,11 @@ }, /turf/open/floor/almayer, /area/golden_arrow/engineering) +"JT" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/magazine_box, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/squad_one) "JU" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -3888,10 +4079,8 @@ /turf/closed/wall/almayer/outer, /area/golden_arrow/medical) "QK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/med_data/laptop{ - dir = 1; - pixel_y = -4 +/obj/structure/machinery/medical_pod/bodyscanner{ + pixel_y = 6 }, /turf/open/floor/almayer{ icon_state = "sterile_green" @@ -4088,7 +4277,6 @@ }, /area/golden_arrow/hangar) "Tf" = ( -/obj/structure/surface/rack, /obj/item/ammo_magazine/rifle/m16/extended, /obj/item/ammo_magazine/rifle/m16/extended, /obj/item/ammo_magazine/rifle/m16/extended, @@ -4104,6 +4292,9 @@ /obj/item/ammo_magazine/rifle/m16/extended, /obj/item/ammo_magazine/rifle/m16/extended, /obj/item/ammo_magazine/rifle/m16/extended, +/obj/structure/closet/crate/ammo{ + name = "m16 ammunitions crate" + }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/squad_one) "Ti" = ( @@ -4364,6 +4555,7 @@ serial_number = 11 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/bedsheetbin, /turf/open/floor/almayer, /area/golden_arrow/squad_one) "Wi" = ( @@ -4613,6 +4805,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/golden_arrow/squad_one) +"YE" = ( +/obj/structure/prop/hybrisa/misc/floorprops/grate3, +/turf/open/floor/plating/airless, +/area/golden_arrow/hangar) "YI" = ( /obj/structure/machinery/light{ dir = 4 @@ -9208,7 +9404,7 @@ bS bS bS bS -Xq +qy bS bS bS @@ -9310,7 +9506,7 @@ xU nz UF bS -Ol +ET ju kF bS @@ -10012,7 +10208,7 @@ bS oV JA bS -cW +IU Ep lF Ep @@ -10031,7 +10227,7 @@ lX MU Uw jl -jl +JT jl rI rI @@ -10114,7 +10310,7 @@ bS NM ZA bS -cW +Hh Lu JA JA @@ -11241,11 +11437,11 @@ Kl Kl Ft Kl -Kl -fB -ZW -Jk -fM +bB +BH +yF +Jw +dx Qv YB Kh @@ -11443,7 +11639,7 @@ TC Gd IB dK -jF +tm QK pn Jk @@ -11459,11 +11655,11 @@ Kh Kh iw Gz -gC +pV nk Lx Cf -gC +pV bv Oz YS @@ -11759,7 +11955,7 @@ Sp Jp sz mv -yr +Hn nH YB Kh @@ -12267,7 +12463,7 @@ Jk ZW Sp Lr -xZ +kB xZ Ri nH @@ -12987,15 +13183,15 @@ cn cn cn cn -cn +kc JU LJ nH +Bc aA aA aA -aA -aA +km nH Xf Xf @@ -13195,7 +13391,7 @@ cn Ij Du nH -Eq +jF Eq Eq Eq @@ -13404,7 +13600,7 @@ xZ xZ xZ xZ -jv +vd nH Xf Xf @@ -13503,7 +13699,7 @@ GG nH jv jv -jv +gq jv jv jv @@ -13789,6 +13985,7 @@ Xf Ar GG JU +YE cn cn cn @@ -13799,11 +13996,10 @@ cn cn cn cn +kH cn cn -cn -cn -cn +fs JU JU yX @@ -13911,8 +14107,8 @@ LJ yX MB JU +FJ JU -IU JU jv nH @@ -14318,7 +14514,7 @@ yG Zh nH HK -vd +jU Wb gZ gZ diff --git a/maps/shuttles/dropship_lancer.dmm b/maps/shuttles/dropship_lancer.dmm index 14d02084e5..ec7f4e15a0 100644 --- a/maps/shuttles/dropship_lancer.dmm +++ b/maps/shuttles/dropship_lancer.dmm @@ -271,6 +271,20 @@ icon_state = "stan5" }, /area/shuttle/lancers) +"X" = ( +/obj/structure/bed/chair/dropship/passenger{ + dir = 4; + pixel_x = 12 + }, +/obj/structure/bed/chair/dropship/passenger{ + dir = 8; + pixel_x = -12 + }, +/obj/docking_port/mobile/marine_dropship/lancers, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/lancers) "Z" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_2" @@ -365,7 +379,7 @@ I o u h -h +X h P F diff --git a/void-marines/code/playable_factions/fl_presets.dm b/void-marines/code/playable_factions/fl_presets.dm index cbc40423cf..a2b9dc102e 100644 --- a/void-marines/code/playable_factions/fl_presets.dm +++ b/void-marines/code/playable_factions/fl_presets.dm @@ -9,6 +9,7 @@ assignment = "Marauder" rank = JOB_SQUAD_MARINE skills = /datum/skills/pfc + minimap_icon = "private" /datum/equipment_preset/uscm/lancer/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/lightpack @@ -27,6 +28,7 @@ assignment = "Machinegunner" rank = JOB_SQUAD_SMARTGUN skills = /datum/skills/smartgunner + minimap_icon = "smartgunner" /datum/equipment_preset/uscm/lancer/smartgunner/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/lightpack @@ -45,6 +47,7 @@ assignment = "Radio Jokey" rank = JOB_SQUAD_RTO skills = /datum/skills/SL + minimap_icon = "rto" /datum/equipment_preset/uscm/lancer/rto/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/lightpack @@ -63,6 +66,7 @@ assignment = "Surgeon" rank = JOB_SQUAD_MEDIC skills = /datum/skills/combat_medic + minimap_icon = "medic" /datum/equipment_preset/uscm/lancer/med/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/lightpack @@ -81,6 +85,7 @@ assignment = "Bruiser" rank = JOB_SQUAD_TEAM_LEADER skills = /datum/skills/pmc/SL + minimap_icon = "tl" /datum/equipment_preset/uscm/lancer/tl/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/lightpack @@ -99,6 +104,7 @@ assignment = "Warlord" rank = JOB_SQUAD_LEADER skills = /datum/skills/pmc/SL + minimap_icon = "leader" /datum/equipment_preset/uscm/lancer/sl/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/lightpack