From df64c0b522caa752dedeca613a19966cb89f39ff Mon Sep 17 00:00:00 2001 From: Molnia <161384279+molnizz@users.noreply.github.com> Date: Tue, 30 Jul 2024 03:49:01 +0500 Subject: [PATCH] Fix + Update: QoL --- .../SpaceRuins/corporate_mining.dmm | 2 +- .../shuttles/independent/independent_byo.dmm | 2 +- .../independent/independent_junker.dmm | 2 +- .../syndicate/syndicate_gec_lugol.dmm | 408 +++++++++--------- .../syndicate/syndicate_gorlex_komodo.dmm | 3 + 5 files changed, 213 insertions(+), 204 deletions(-) diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/corporate_mining.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/corporate_mining.dmm index 3fd01db3cbc6..7a67b3aebf8c 100644 --- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/corporate_mining.dmm +++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/corporate_mining.dmm @@ -606,7 +606,7 @@ /obj/item/clothing/suit/hazardvest/donk/qm, /obj/item/reagent_containers/food/snacks/donkpocket, /obj/item/gun/ballistic/automatic/pistol/syndicate, -/obj/item/suppressor, +/obj/item/attachment/silencer, /turf/open/floor/wood, /area/ruin/space/has_grav/corporatemine/crewquarters) "nW" = ( diff --git a/_maps/_mod_celadon/shuttles/independent/independent_byo.dmm b/_maps/_mod_celadon/shuttles/independent/independent_byo.dmm index 36a8dffe3d97..d361605f909e 100644 --- a/_maps/_mod_celadon/shuttles/independent/independent_byo.dmm +++ b/_maps/_mod_celadon/shuttles/independent/independent_byo.dmm @@ -115,6 +115,7 @@ /area/ship/construction) "jj" = ( /obj/structure/closet/crate/solarpanel_small, +/obj/item/circuitboard/computer/cargo, /turf/open/floor/plating/airless, /area/ship/construction) "ke" = ( @@ -330,7 +331,6 @@ }, /obj/item/wallframe/intercom/wideband, /obj/item/circuitboard/machine/holopad, -/obj/item/circuitboard/computer/cargo/express, /obj/item/spacecash/bundle/loadsamoney, /obj/item/spacecash/bundle/loadsamoney, /obj/item/spacecash/bundle/loadsamoney, diff --git a/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm b/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm index 437424f81d9e..abd3c5b45c47 100644 --- a/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm +++ b/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm @@ -94,7 +94,6 @@ }, /obj/effect/decal/cleanable/glass, /obj/structure/safe/floor, -/obj/item/circuitboard/computer/cargo/express, /turf/open/floor/pod/dark, /area/ship/crew/office) "bJ" = ( @@ -667,6 +666,7 @@ /obj/machinery/atmospherics/pipe/simple/purple/hidden{ dir = 9 }, +/obj/item/circuitboard/computer/cargo, /turf/open/floor/pod/dark, /area/ship/crew/office) "lU" = ( diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gec_lugol.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gec_lugol.dmm index 8b17f55dd0a9..4c359bf30a7d 100644 --- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gec_lugol.dmm +++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gec_lugol.dmm @@ -578,7 +578,7 @@ /obj/effect/turf_decal/industrial/caution{ pixel_y = -15 }, -/turf/open/floor/plasteel/tech/airless, +/turf/open/floor/plating/airless, /area/ship/construction) "gv" = ( /obj/structure/table, @@ -2886,7 +2886,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/floor/plasteel/tech/airless, +/turf/open/floor/plating/airless, /area/ship/construction) "zC" = ( /turf/open/floor/engine/co2, @@ -3600,6 +3600,12 @@ /obj/structure/railing/corner, /turf/open/floor/plasteel/tech, /area/ship/bridge) +"Fb" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating/airless, +/area/ship/construction) "Fe" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /obj/structure/curtain/cloth/grey, @@ -3807,7 +3813,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/tech/airless, +/turf/open/floor/plating/airless, /area/ship/construction) "GO" = ( /obj/structure/bed, @@ -4636,7 +4642,7 @@ name = "Secure Storage"; pixel_x = -27 }, -/turf/open/floor/plasteel/tech/airless, +/turf/open/floor/plating/airless, /area/ship/construction) "LE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -5434,7 +5440,7 @@ dir = 1; pixel_y = 15 }, -/turf/open/floor/plasteel/tech/airless, +/turf/open/floor/plating/airless, /area/ship/construction) "Tb" = ( /obj/effect/turf_decal/corner/transparent/bar/diagonal, @@ -5708,7 +5714,7 @@ dir = 4; pixel_x = 15 }, -/turf/open/floor/plasteel/tech/airless, +/turf/open/floor/plating/airless, /area/ship/construction) "Uy" = ( /turf/closed/wall/mineral/plastitanium, @@ -7243,13 +7249,13 @@ vQ Qs rg up -ia -ia -ia +wl +wl +wl Lx -ia -ia -ia +wl +wl +wl lc rg NE @@ -7270,25 +7276,25 @@ kD Mb rg Ej -ia +wl GF vU pp BA Et -We -We -We +Fb +Fb +Fb zA -ia -ia -ia +wl +wl +wl LS BT hw YK Ws -ia +wl Ls rg kD @@ -7303,25 +7309,25 @@ kD kD rg Ls -ia -ia -ia -ia -ia -ia -ia -ia -ia +wl +wl +wl +wl +wl +wl +wl +wl +wl GN -ia -ia -ia -ia -ia -ia -ia -ia -ia +wl +wl +wl +wl +wl +wl +wl +wl +wl Ls rg kD @@ -7344,9 +7350,9 @@ Aq Aq Aq pU -ia +wl lc -ia +wl ak Aq Aq @@ -7369,7 +7375,7 @@ kD kD xI Ls -ia +wl Jj wl wl @@ -7377,9 +7383,9 @@ wl wl wl Sp -ia +wl GN -ia +wl Jj wl wl @@ -7387,7 +7393,7 @@ wl wl wl Sp -ia +wl Ls xI kD @@ -7402,7 +7408,7 @@ kD kD xI Ls -ia +wl Jj wl wl @@ -7410,9 +7416,9 @@ wl wl wl Sp -ia +wl GN -ia +wl Jj wl wl @@ -7420,7 +7426,7 @@ wl wl wl Sp -ia +wl Ls xI kD @@ -7435,7 +7441,7 @@ kD kD xI Ls -ia +wl Jj wl wl @@ -7443,9 +7449,9 @@ wl wl wl Sp -ia +wl GN -ia +wl Jj wl wl @@ -7453,7 +7459,7 @@ wl wl wl Sp -ia +wl Ls xI kD @@ -7468,7 +7474,7 @@ kD kD rg Ls -ia +wl Jj wl wl @@ -7476,9 +7482,9 @@ wl wl wl Sp -ia +wl lc -ia +wl Jj wl wl @@ -7486,7 +7492,7 @@ wl wl wl Sp -ia +wl Ls rg kD @@ -7501,7 +7507,7 @@ kD kD rg Ls -ia +wl Jj wl wl @@ -7509,9 +7515,9 @@ wl wl wl Sp -ia +wl GN -ia +wl Jj wl wl @@ -7519,7 +7525,7 @@ wl wl wl Sp -ia +wl Ls rg kD @@ -7534,7 +7540,7 @@ kD kD rg Ls -ia +wl Oh bR bR @@ -7542,9 +7548,9 @@ bR bR bR oC -ia +wl GN -ia +wl Oh bR bR @@ -7552,7 +7558,7 @@ bR bR bR oC -ia +wl Ls rg kD @@ -7567,25 +7573,25 @@ kD kD xI Ls -ia -ia -ia -ia -ia -ia -ia -ia -ia +wl +wl +wl +wl +wl +wl +wl +wl +wl GN -ia -ia -ia -ia -ia -ia -ia -ia -ia +wl +wl +wl +wl +wl +wl +wl +wl +wl Ls xI kD @@ -7600,25 +7606,25 @@ kD kD xI Ls -ia -ia -ia -ia -ia -ia -ia -ia -ia +wl +wl +wl +wl +wl +wl +wl +wl +wl aP -ia -ia -ia -ia -ia -ia -ia -ia -ia +wl +wl +wl +wl +wl +wl +wl +wl +wl Ls xI kD @@ -7633,25 +7639,25 @@ kD kD xI Ls -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl Ls xI kD @@ -7666,7 +7672,7 @@ kD kD xI Ls -ia +wl ak Aq Aq @@ -7674,9 +7680,9 @@ Aq Aq Aq pU -ia -ia -ia +wl +wl +wl ak Aq Aq @@ -7684,7 +7690,7 @@ Aq Aq Aq pU -ia +wl Ls xI kD @@ -7699,7 +7705,7 @@ kD kD rg Ls -ia +wl Jj wl wl @@ -7707,9 +7713,9 @@ wl wl wl Sp -ia -ia -ia +wl +wl +wl Jj wl wl @@ -7717,7 +7723,7 @@ wl wl wl Sp -ia +wl Ls rg kD @@ -7732,7 +7738,7 @@ kD kD rg Ls -ia +wl Jj wl wl @@ -7740,9 +7746,9 @@ wl wl wl Sp -ia -ia -ia +wl +wl +wl Jj wl wl @@ -7750,7 +7756,7 @@ wl wl wl Sp -ia +wl Ls rg kD @@ -7765,7 +7771,7 @@ kD kD rg Ls -ia +wl Jj wl wl @@ -7773,9 +7779,9 @@ wl wl wl Sp -ia -ia -ia +wl +wl +wl Jj ON wl @@ -7783,7 +7789,7 @@ wl wl wl Sp -ia +wl Ls rg kD @@ -7798,7 +7804,7 @@ kD kD xI Ls -ia +wl Jj wl wl @@ -7806,9 +7812,9 @@ wl wl wl Sp -ia -ia -ia +wl +wl +wl Jj IK wl @@ -7816,7 +7822,7 @@ wl wl wl Sp -ia +wl Ls xI kD @@ -7839,9 +7845,9 @@ wl wl wl Sp -ia -ia -ia +wl +wl +wl Jj lH wl @@ -7864,7 +7870,7 @@ kD kD xI Ls -ia +wl Oh bR bR @@ -7872,9 +7878,9 @@ bR bR bR oC -ia -ia -ia +wl +wl +wl Oh bR bR @@ -7882,7 +7888,7 @@ bR bR bR oC -ia +wl Ls xI kD @@ -7898,23 +7904,23 @@ kD xI Ls Ls -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl Ls Ls xI @@ -7932,21 +7938,21 @@ Md rg Ls Ls -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl Ls Ls rg @@ -7967,17 +7973,17 @@ rg Ls Ls Ls -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl +wl Ls Ls Ls @@ -8002,13 +8008,13 @@ rg Ls Ls Ls -ia -ia -ia +wl +wl +wl Ut -ia -ia -ia +wl +wl +wl Ls Ls Ls diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm index 301499970ab8..8392b1f0bde5 100644 --- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -4021,6 +4021,9 @@ /obj/item/clothing/head/helmet/swat, /obj/item/clothing/head/helmet/swat, /obj/item/clothing/head/helmet/swat, +/obj/item/attachment/silencer, +/obj/item/attachment/silencer, +/obj/item/attachment/silencer, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Nj" = (