From c99fc4b7274a75fd71ed305361488581c39b6c8e Mon Sep 17 00:00:00 2001 From: RalseiDreemuurr Date: Sun, 28 Apr 2024 16:37:31 +0300 Subject: [PATCH 01/17] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=82=D1=8E?= =?UTF-8?q?=D1=80=D0=B1=D0=B0=D0=BD=D0=BE=D0=B2=20=D1=81=D0=B5=D0=BF=D0=B0?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B8=D1=81=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mod_celadon/elysium_stuff/code/hats.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod_celadon/elysium_stuff/code/hats.dm b/mod_celadon/elysium_stuff/code/hats.dm index 17a8df95fcf7..a29ee43064cd 100644 --- a/mod_celadon/elysium_stuff/code/hats.dm +++ b/mod_celadon/elysium_stuff/code/hats.dm @@ -28,12 +28,12 @@ /obj/item/clothing/head/turban/black name = "Чёрный тюрбан" icon_state = "turban_black" - mob_overlay_icon = "turban_black" + mob_overlay_state = "turban_black" /obj/item/clothing/head/turban/white name = "Белый тюрбан" icon_state = "turban_white" - mob_overlay_icon = "turban_white" + mob_overlay_state = "turban_white" /obj/item/clothing/head/helmet/m10_elysium name = "Шлем М10" From b5e4f78a92ed15b90dd6f8d7a8cfc8e88127a1d6 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 26 Apr 2024 07:01:52 +0200 Subject: [PATCH 02/17] Adds NGR outfits to the Hyena. (#2896) ## About The Pull Request - Added NGR outfits to the dorms locker - replaced syndicate clothing in captain's locker with NGR clothing. - gave the foreman an NGR officer outfit - assistants now have NGR outfits ## Why It's Good For The Game It's hard to enforce uniform policy without uniforms present! ## Changelog :cl: tweak: Replaced standard syndicate outfits with NGR outfits on the Hyena. add: Added NGR-specific CE and Assistant outfits. /:cl: --- _maps/configs/syndicate_gorlex_hyena.json | 4 ++-- .../syndicate/syndicate_gorlex_hyena.dmm | 20 ++++++++----------- .../clothing/outfits/factions/syndicate.dm | 12 +++++++++++ 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/_maps/configs/syndicate_gorlex_hyena.json b/_maps/configs/syndicate_gorlex_hyena.json index 51b046d114b7..7b72cf208e0d 100644 --- a/_maps/configs/syndicate_gorlex_hyena.json +++ b/_maps/configs/syndicate_gorlex_hyena.json @@ -23,7 +23,7 @@ "slots": 1 }, "Foreman": { - "outfit": "/datum/outfit/job/syndicate/ce/gorlex", + "outfit": "/datum/outfit/job/syndicate/ce/gorlex/ngr", "officer": true, "slots": 1 }, @@ -36,7 +36,7 @@ "slots": 2 }, "Junior Agent": { - "outfit": "/datum/outfit/job/syndicate/assistant/gorlex", + "outfit": "/datum/outfit/job/syndicate/assistant/gorlex/ngr", "slots": 2 } }, diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm index f573148a8fe4..93600539c4b4 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm @@ -55,12 +55,12 @@ req_access = list(20) }, /obj/item/storage/backpack/security, -/obj/item/clothing/under/syndicate/combat, -/obj/item/clothing/suit/armor/vest/capcarapace/syndicate, +/obj/item/clothing/under/syndicate/ngr/officer, +/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/gloves/combat, /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch, -/obj/item/clothing/head/HoS/syndicate, +/obj/item/clothing/head/ngrcap, /obj/effect/decal/cleanable/dirt/dust, /obj/item/gun/ballistic/revolver, /obj/item/ammo_box/a357/match, @@ -1497,14 +1497,10 @@ /obj/item/clothing/shoes/jackboots, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/shoes/jackboots, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate, +/obj/item/clothing/under/syndicate/ngr, +/obj/item/clothing/under/syndicate/ngr, +/obj/item/clothing/under/syndicate/ngr, +/obj/item/clothing/under/syndicate/ngr, /obj/item/clothing/head/soft/black, /obj/item/clothing/head/soft/black, /obj/item/clothing/head/soft/black, @@ -1647,7 +1643,7 @@ req_access = list(56) }, /obj/item/clothing/shoes/jackboots, -/obj/item/clothing/under/syndicate/gorlex, +/obj/item/clothing/under/syndicate/ngr/officer, /obj/item/clothing/suit/toggle/industrial, /obj/item/clothing/gloves/combat, /obj/item/storage/belt/utility/chief{ diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index 44199ac361a3..8f98f29a6b1f 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -59,6 +59,12 @@ uniform = /obj/item/clothing/under/syndicate/gorlex alt_uniform = /obj/item/clothing/under/syndicate +/datum/outfit/job/syndicate/assistant/gorlex/ngr + name = "Syndicate - Junior Agent (New Gorlex Republic)" + + uniform = /obj/item/clothing/under/syndicate/ngr + alt_uniform = null + /datum/outfit/job/syndicate/assistant/gec name = "Syndicate - Deckhand (GEC)" id_assignment = "Deckhand" @@ -421,6 +427,11 @@ shoes = /obj/item/clothing/shoes/jackboots gloves = /obj/item/clothing/gloves/combat +/datum/outfit/job/syndicate/ce/gorlex/ngr + name = "Syndicate - Foreman (New Gorlex Republic)" + + uniform = /obj/item/clothing/under/syndicate/ngr/officer + //Chief Medical Officer /datum/outfit/job/syndicate/cmo @@ -918,6 +929,7 @@ id_assignment = "Wrecker" uniform = /obj/item/clothing/under/syndicate/gorlex + accessory = /obj/item/clothing/accessory/armband/cargo shoes = /obj/item/clothing/shoes/workboots ears = /obj/item/radio/headset/alt From b63a8c21ca585f526632d1e9b7282ac3d7c450ec Mon Sep 17 00:00:00 2001 From: SuhEugene <32931701+SuhEugene@users.noreply.github.com> Date: Sat, 27 Apr 2024 03:09:54 +0300 Subject: [PATCH 03/17] Fix half of verbs not showing up (#2941) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## About The Pull Request Hello comrades. This PR fixes a mistake, because of which none of `/mob` verbs was sent to the TGUI panel on client connection for clients having "Broadcast Log in/out" disabled. ## Why It's Good For The Game Half of verbs wasn't showing up because of strange check condition completely unrelated to what's really needed to be checked. ## Changelog 🆑SuhEugene fix: fixed incomplete TGUI Panel verb list /🆑 --- code/modules/client/client_procs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 1e0e2965402c..dcd480a1663c 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -1087,7 +1087,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( return var/list/verblist = list() var/list/verbstoprocess = verbs.Copy() - if(mob?.client?.prefs.broadcast_login_logout) + if(mob) verbstoprocess += mob.verbs for(var/atom/movable/thing as anything in mob.contents) verbstoprocess += thing.verbs From 0863470a45893dc709b22363fe3a2bf0bf7c989b Mon Sep 17 00:00:00 2001 From: RalseiDreemuurr Date: Sun, 28 Apr 2024 19:38:21 +0300 Subject: [PATCH 04/17] =?UTF-8?q?=D0=9C=D0=B8=D0=BD=D0=B8-=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D1=81=20=D0=93=D0=B5=D0=BA=D0=BA=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm | 2 -- 1 file changed, 2 deletions(-) diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm index 7c69d7d92b63..cad16813e7ed 100644 --- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm +++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm @@ -2259,7 +2259,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/item/storage/bag/ore, /obj/item/clothing/under/rank/cargo/miner, -/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plasteel, /area/ship/cargo/starboard) "BP" = ( @@ -2947,7 +2946,6 @@ /obj/item/mining_scanner, /obj/item/clothing/under/rank/cargo/miner, /obj/item/storage/bag/ore, -/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plasteel, /area/ship/cargo/starboard) "Jn" = ( From 149cc07930c5a777aab1e4421969d2b0aa7eb6f6 Mon Sep 17 00:00:00 2001 From: MrCat15352 Date: Mon, 29 Apr 2024 13:46:35 +0500 Subject: [PATCH 05/17] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BB=D0=BE=D0=B3=D0=BE=D1=82=D0=B8=D0=BF?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mod_celadon/structures/README.md | 3 +- mod_celadon/structures/_structures.dm | 4 +- mod_celadon/structures/_structures.dme | 1 + mod_celadon/structures/code/logo.dm | 64 ++++++++++++++++++ mod_celadon/structures/code/structures.dm | 2 +- mod_celadon/structures/icons/celadon_logo.dmi | Bin 0 -> 4792 bytes mod_celadon/structures/icons/elysium_logo.dmi | Bin 0 -> 1095 bytes .../structures/{icon => icons}/statue.dmi | Bin 8 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 mod_celadon/structures/code/logo.dm create mode 100644 mod_celadon/structures/icons/celadon_logo.dmi create mode 100644 mod_celadon/structures/icons/elysium_logo.dmi rename mod_celadon/structures/{icon => icons}/statue.dmi (100%) diff --git a/mod_celadon/structures/README.md b/mod_celadon/structures/README.md index 5fc63c97122b..3cfea22380f7 100644 --- a/mod_celadon/structures/README.md +++ b/mod_celadon/structures/README.md @@ -22,6 +22,7 @@ ID мода: CELADON_STRUCTURES Этот мод добавляет новые объекты для карт, а именно: Сам объект статуи Копо -> `code\game\objects\structures\statues.dm` и его иконка "masson_kills" в файле `statue.dmi` +Логотипы Целадон и Элизиум как turf -> `mod_celadon\structures\code\logo.dm` + + +## Роботический Хонк + +ID мода: ROBOTIC_HONK + + +### Описание мода + +Добавляет ИПС возможность хонкать с помощью *honk + + +### Изменения *кор кода* + +- Отсутствуют + + +### Оверрайды + +- Отсутствуют + + +### Дефайны + +- Отсутствуют + + +### Используемые файлы, не содержащиеся в модпаке + +- `sound/items/bikehorn.ogg` + + +### Авторы: + +SuhEugene + diff --git a/mod_celadon/robotic_honk/_robotic_honk.dm b/mod_celadon/robotic_honk/_robotic_honk.dm new file mode 100644 index 000000000000..1f155c4d919f --- /dev/null +++ b/mod_celadon/robotic_honk/_robotic_honk.dm @@ -0,0 +1,4 @@ +/datum/modpack/robotic_honk + name = "Роботический Хонк" + desc = "Добавляет ИПС возможность хонкать с помощью *honk" + author = "SuhEugene" diff --git a/mod_celadon/robotic_honk/_robotic_honk.dme b/mod_celadon/robotic_honk/_robotic_honk.dme new file mode 100644 index 000000000000..ae5b1aebc331 --- /dev/null +++ b/mod_celadon/robotic_honk/_robotic_honk.dme @@ -0,0 +1,8 @@ +#ifndef MODPACK_CELADON_ROBOTIC_HONK +#define MODPACK_CELADON_ROBOTIC_HONK + +#include "_robotic_honk.dm" + +#include "code/robotic_honk.dm" + +#endif diff --git a/mod_celadon/robotic_honk/code/robotic_honk.dm b/mod_celadon/robotic_honk/code/robotic_honk.dm new file mode 100644 index 000000000000..7cd4f234994d --- /dev/null +++ b/mod_celadon/robotic_honk/code/robotic_honk.dm @@ -0,0 +1,11 @@ +// Префикс mod_celadon_ чтобы внезапно не конфликтовать с оффами, +// на случай если они какой honk добавят в будущем + +/datum/emote/living/carbon/human/robot_tongue/mod_celadon_honk + key = "honk" + key_third_person = "honks" + message = "lets out a honk!" + +/datum/emote/living/carbon/human/robot_tongue/mod_celadon_honk/run_emote(mob/user, params) + if(..()) + playsound(user.loc, 'sound/items/bikehorn.ogg', 50, TRUE) From 4c4ed81b632a74e721a7c345ef8bd169dee87be4 Mon Sep 17 00:00:00 2001 From: VastKilleroOm <74047915+VastKilleroOm@users.noreply.github.com> Date: Thu, 2 May 2024 23:03:01 +0300 Subject: [PATCH 13/17] Update blank.dmm --- .../_mod_celadon/map_files/generic/blank.dmm | 175 ++++++++---------- 1 file changed, 73 insertions(+), 102 deletions(-) diff --git a/_maps/_mod_celadon/map_files/generic/blank.dmm b/_maps/_mod_celadon/map_files/generic/blank.dmm index f9cdb54fceb8..68387ebb43f4 100644 --- a/_maps/_mod_celadon/map_files/generic/blank.dmm +++ b/_maps/_mod_celadon/map_files/generic/blank.dmm @@ -155,7 +155,7 @@ /obj/effect/turf_decal/corner/opaque/green{ dir = 4 }, -/obj/machinery/newscaster/directional/south, +/obj/machinery/newscaster/directional/north, /turf/open/floor/plasteel, /area/centcom/control) "aB" = ( @@ -308,17 +308,16 @@ /turf/open/floor/plasteel, /area/centcom/control) "aW" = ( -/obj/structure/chair{ - dir = 1 +/obj/structure/bed/roller, +/obj/machinery/iv_drip, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 4 }, -/obj/effect/turf_decal/corner/opaque/green, -/obj/effect/turf_decal/corner/opaque/green{ +/obj/effect/turf_decal/corner/opaque/blue{ dir = 8 }, -/obj/machinery/newscaster/directional/north{ - pixel_y = -30 - }, -/turf/open/floor/plasteel, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/plasteel/white, /area/centcom/control) "aX" = ( /obj/machinery/computer/security{ @@ -586,9 +585,6 @@ /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter, -/obj/machinery/newscaster/directional/north{ - pixel_y = -30 - }, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -599,6 +595,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/dark, /area/tdome/tdomeadmin) "ce" = ( @@ -904,7 +901,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plasteel/dark, /area/centcom/control) "dg" = ( @@ -947,7 +944,7 @@ /obj/item/clothing/gloves/fingerless, /obj/item/clothing/gloves/color/black, /obj/item/clothing/glasses/eyepatch, -/obj/machinery/firealarm/directional/east, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "dm" = ( @@ -966,17 +963,6 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/ferry) -"do" = ( -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/brown, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 8 - }, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/plasteel, -/area/centcom/supply) "dp" = ( /obj/structure/table/reinforced, /obj/structure/sign/poster/contraband/gec{ @@ -1093,7 +1079,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/newscaster/directional/east, +/obj/machinery/newscaster/directional/west, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "dJ" = ( @@ -1509,7 +1495,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/newscaster/directional/east, +/obj/machinery/newscaster/directional/west, /turf/open/floor/plasteel/dark, /area/tdome/tdomeobserve) "fg" = ( @@ -1561,7 +1547,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "fr" = ( @@ -1661,7 +1647,7 @@ "fL" = ( /obj/machinery/light/directional/east, /obj/machinery/light_switch{ - dir = 4; + dir = 8; pixel_x = 23 }, /turf/open/floor/plasteel/grimy, @@ -1904,7 +1890,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/supply) "gH" = ( @@ -2564,7 +2550,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/newscaster/directional/south, +/obj/machinery/newscaster/directional/north, /turf/open/floor/plasteel/dark, /area/centcom/control) "iE" = ( @@ -2685,7 +2671,6 @@ /area/tdome/tdomeobserve) "je" = ( /obj/machinery/light_switch{ - dir = 1; pixel_y = 23 }, /turf/open/floor/wood, @@ -2771,7 +2756,7 @@ /obj/effect/turf_decal/corner/transparent/bar{ dir = 1 }, -/obj/machinery/firealarm/directional/east, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel, /area/tdome/tdomeobserve) "jA" = ( @@ -2949,7 +2934,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "kk" = ( @@ -4396,7 +4381,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/east, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel/dark, /area/centcom/control) "pH" = ( @@ -5095,7 +5080,7 @@ /obj/effect/turf_decal/corner/opaque/blue{ dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel/white, /area/centcom/control) "sp" = ( @@ -6262,8 +6247,8 @@ /obj/effect/turf_decal/industrial/warning{ dir = 5 }, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/firealarm/directional/south, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/firealarm/directional/north, /turf/open/floor/plasteel, /area/centcom/ferry) "wg" = ( @@ -6459,9 +6444,6 @@ /obj/machinery/computer/security{ dir = 1 }, -/obj/machinery/newscaster/directional/north{ - pixel_y = -30 - }, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -6472,6 +6454,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/control) "wV" = ( @@ -6781,7 +6764,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/newscaster/directional/south, +/obj/machinery/newscaster/directional/north, /turf/open/floor/plasteel/dark, /area/tdome/tdomeobserve) "yh" = ( @@ -6833,9 +6816,6 @@ /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter, -/obj/machinery/newscaster/directional/north{ - pixel_y = -30 - }, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -6846,6 +6826,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "yw" = ( @@ -6945,7 +6926,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/control) "yO" = ( @@ -7035,7 +7016,7 @@ dir = 4 }, /obj/machinery/light/directional/east, -/obj/machinery/firealarm/directional/west, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel, /area/centcom/control) "zb" = ( @@ -7248,7 +7229,7 @@ /turf/open/floor/plasteel/dark, /area/centcom/ferry) "zE" = ( -/obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/wood, /area/centcom/holding) "zF" = ( @@ -7583,7 +7564,8 @@ "AW" = ( /obj/structure/closet/crate/bin, /obj/machinery/light_switch{ - pixel_y = -23 + pixel_y = -23; + dir = 1 }, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 @@ -7628,7 +7610,8 @@ icon_state = "plant-22" }, /obj/machinery/light_switch{ - pixel_y = -23 + pixel_y = -23; + dir = 1 }, /turf/open/floor/wood, /area/centcom/ferry) @@ -7761,9 +7744,6 @@ /area/centcom/control) "Bw" = ( /obj/machinery/vending/coffee, -/obj/machinery/newscaster/directional/north{ - pixel_y = -30 - }, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -7774,6 +7754,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/control) "By" = ( @@ -7821,7 +7802,7 @@ pixel_x = -4 }, /obj/effect/turf_decal/industrial/warning, -/obj/machinery/firealarm/directional/south, +/obj/machinery/firealarm/directional/north, /turf/open/floor/plasteel, /area/centcom/ferry) "BG" = ( @@ -7926,9 +7907,6 @@ /turf/open/floor/plasteel, /area/centcom/holding) "BX" = ( -/obj/machinery/newscaster/directional/north{ - pixel_y = -30 - }, /obj/machinery/computer/med_data{ dir = 1 }, @@ -7942,13 +7920,11 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/control) "BZ" = ( /obj/machinery/vending/cigarette, -/obj/machinery/newscaster/directional/north{ - pixel_y = -30 - }, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -7959,6 +7935,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/control) "Cb" = ( @@ -8197,7 +8174,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/newscaster/directional/west, +/obj/machinery/newscaster/directional/east, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "Da" = ( @@ -8420,7 +8397,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/newscaster/directional/west, +/obj/machinery/newscaster/directional/east, /turf/open/floor/plasteel/dark, /area/centcom/evac) "DQ" = ( @@ -8540,7 +8517,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/west, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/dark, /area/centcom/control) "Eh" = ( @@ -9070,7 +9047,7 @@ /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel, /area/centcom/ferry) "FV" = ( @@ -10107,7 +10084,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/newscaster/directional/west, +/obj/machinery/newscaster/directional/east, /turf/open/floor/plasteel/grimy, /area/centcom/control) "JB" = ( @@ -10148,7 +10125,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/east, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel/dark, /area/tdome/tdomeadmin) "JG" = ( @@ -10177,7 +10154,7 @@ /turf/open/floor/plasteel/dark, /area/centcom/ferry) "JL" = ( -/obj/machinery/firealarm/directional/west, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/white, /area/tdome/tdomeobserve) "JN" = ( @@ -10594,7 +10571,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/newscaster/directional/south, +/obj/machinery/newscaster/directional/north, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "KP" = ( @@ -10686,7 +10663,6 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -10697,6 +10673,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/control) "Lj" = ( @@ -11032,7 +11009,6 @@ /area/centcom) "My" = ( /obj/structure/closet/crate/bin, -/obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -11043,7 +11019,8 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/west, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "Mz" = ( @@ -11380,16 +11357,11 @@ /turf/open/floor/plasteel, /area/centcom/supplypod/loading/ert) "NH" = ( -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 4 - }, +/obj/effect/turf_decal/corner/opaque/brown, /obj/effect/turf_decal/corner/opaque/brown{ dir = 8 }, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel, /area/centcom/supply) "NL" = ( @@ -11401,7 +11373,7 @@ dir = 8 }, /obj/machinery/light/directional/east, -/obj/machinery/newscaster/directional/west, +/obj/machinery/newscaster/directional/east, /turf/open/floor/plasteel/grimy, /area/centcom/control) "NN" = ( @@ -11540,7 +11512,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plasteel/dark, /area/centcom/control) "Oh" = ( @@ -11838,7 +11810,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/west, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "Pw" = ( @@ -12038,7 +12010,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/control) "Qi" = ( @@ -12162,7 +12134,7 @@ /turf/open/floor/plasteel, /area/centcom/control) "QF" = ( -/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/wood, /area/centcom/holding) "QG" = ( @@ -12594,6 +12566,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/dark, /area/centcom/supply) "RU" = ( @@ -12665,7 +12638,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/firealarm/directional/west, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "Sj" = ( @@ -12873,7 +12846,6 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -12884,6 +12856,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "Th" = ( @@ -12897,9 +12870,6 @@ /obj/item/book/manual/wiki/drinks, /obj/item/reagent_containers/food/drinks/shaker, /obj/item/reagent_containers/glass/rag, -/obj/machinery/newscaster/directional/north{ - pixel_y = -30 - }, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -12910,6 +12880,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/dark, /area/tdome/tdomeobserve) "Tj" = ( @@ -13369,7 +13340,7 @@ /area/centcom/holding) "UI" = ( /obj/machinery/light_switch{ - dir = 8; + dir = 4; pixel_x = -23 }, /turf/open/floor/plasteel/grimy, @@ -13729,7 +13700,7 @@ /obj/item/crowbar/power, /obj/item/storage/belt/security/full, /obj/effect/turf_decal/industrial/warning, -/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel, /area/centcom/ferry) "Wi" = ( @@ -14226,7 +14197,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/east, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel/dark, /area/centcom/control) "XK" = ( @@ -14247,7 +14218,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plasteel/dark, /area/centcom/evac) "XM" = ( @@ -14422,7 +14393,7 @@ /obj/machinery/atmospherics/components/unary/tank/air{ dir = 1 }, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel, /area/centcom/ferry) "Yr" = ( @@ -14470,7 +14441,7 @@ /obj/effect/turf_decal/corner/opaque/blue{ dir = 8 }, -/obj/machinery/firealarm/directional/west, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/white, /area/centcom/control) "Yy" = ( @@ -14672,11 +14643,11 @@ /turf/open/floor/plasteel, /area/tdome/arena) "Zf" = ( -/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/industrial/warning{ dir = 4 }, /obj/machinery/light/directional/east, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel, /area/centcom/control) "Zh" = ( @@ -22061,12 +22032,12 @@ mq KR oS mq -gS -tB NH +tB +RM CI CI -do +nG tB qT Ks @@ -24405,9 +24376,9 @@ az lK lK lK -aW +Pw me -tt +aW lK RJ GF @@ -25936,7 +25907,7 @@ MY Kl LT aH -OC +Nu yh yh yh @@ -27484,7 +27455,7 @@ xt NM JA xt -Nu +OC yh Ke ez From c8cd93cce39139e8e6058c85a46f2c3ab39c67b0 Mon Sep 17 00:00:00 2001 From: Molnia <161384279+molnizz@users.noreply.github.com> Date: Fri, 3 May 2024 21:01:09 +0500 Subject: [PATCH 14/17] Mini-fix komodo and buble --- .../independent/independent_bubble.dmm | 2555 +++++++++-------- .../syndicate/syndicate_gorlex_komodo.dmm | 4 +- 2 files changed, 1296 insertions(+), 1263 deletions(-) diff --git a/_maps/_mod_celadon/shuttles/independent/independent_bubble.dmm b/_maps/_mod_celadon/shuttles/independent/independent_bubble.dmm index c34ad8349987..731811045922 100644 --- a/_maps/_mod_celadon/shuttles/independent/independent_bubble.dmm +++ b/_maps/_mod_celadon/shuttles/independent/independent_bubble.dmm @@ -1,407 +1,280 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"bb" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 6 - }, -/obj/effect/landmark/start/assistant, +"au" = ( +/obj/structure/catwalk/over, /turf/open/floor/plating, -/area/ship/maintenance/starboard) -"bv" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/ntspaceworks_big/seven{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, +/area/ship/cargo) +"aV" = ( /turf/open/floor/plating, -/area/ship/maintenance/aft) -"bZ" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance_hatch{ +/area/ship/external) +"bc" = ( +/obj/machinery/power/shuttle/engine/electric{ dir = 4 }, /obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/ship/maintenance/aft) -"ck" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 4 + icon_state = "0-4" }, -/obj/effect/landmark/observer_start, -/turf/open/floor/plasteel/mono, -/area/ship/hallway/central) -"cF" = ( -/obj/effect/turf_decal/corner/opaque/yellow/border, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"cG" = ( -/obj/machinery/advanced_airlock_controller{ +/obj/machinery/door/poddoor/shutters{ dir = 4; - pixel_x = -25 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ - dir = 8 + id = "thr" }, /turf/open/floor/plating, -/area/ship/engineering) -"cH" = ( -/obj/item/wrench/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 4 +/area/ship/maintenance/aft) +"bf" = ( +/obj/structure/frame/machine, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel, +/area/ship/science) +"bn" = ( +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 23 }, -/obj/effect/turf_decal/corner/opaque/yellow{ +/obj/machinery/power/smes/engineering, +/obj/effect/turf_decal/industrial/warning{ dir = 4 }, -/obj/effect/landmark/start/station_engineer, -/turf/open/floor/plasteel, -/area/ship/engineering) -"da" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/effect/turf_decal/ntspaceworks_big/three{ +/obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/turf/open/floor/plating, -/area/ship/maintenance/aft) -"ec" = ( -/obj/structure/fans/tiny, -/obj/effect/turf_decal/siding/thinplating, -/obj/machinery/door/poddoor{ - id = "bubbledoors"; - name = "Cargo Bay Blast Door" +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-4" }, /turf/open/floor/plating, -/area/ship/cargo) -"ep" = ( -/obj/machinery/atmospherics/components/unary/tank/toxins, -/turf/open/floor/plating, -/area/ship/maintenance/aft) -"eT" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, +/area/ship/engineering) +"bG" = ( +/obj/structure/window/reinforced/spawner/east, /obj/effect/turf_decal/corner/opaque/purple{ dir = 10 }, -/turf/open/floor/plasteel, -/area/ship/science) -"eU" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4, -/obj/effect/turf_decal/corner/opaque/blue/border{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/mono, -/area/ship/hallway/central) -"fs" = ( -/obj/item/stack/sheet/metal/five, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/obj/machinery/autolathe, /obj/item/stack/sheet/glass, -/obj/effect/turf_decal/corner/opaque/purple{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt/dust, +/obj/item/stack/sheet/metal/five, /turf/open/floor/plasteel, /area/ship/science) -"fI" = ( +"cg" = ( +/obj/structure/crate_shelf, +/obj/structure/closet/crate, +/obj/item/stack/sheet/plasteel/fifty, +/obj/item/pipe_dispenser, +/obj/item/construction/plumbing, +/obj/item/construction/rcd/arcd, +/obj/item/construction/rcd/combat, +/turf/open/floor/plating, +/area/ship/maintenance/aft) +"cM" = ( /obj/machinery/power/terminal{ dir = 8 }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/effect/turf_decal/ntspaceworks_big/five{ - dir = 8 - }, -/obj/machinery/light_switch{ - pixel_x = 8; - pixel_y = 23 +/obj/machinery/button/door{ + dir = 2; + pixel_y = 23; + id = "thr" }, /turf/open/floor/plating, /area/ship/maintenance/aft) -"fS" = ( -/obj/structure/rack, -/obj/item/storage/bag/ore, -/obj/item/pickaxe, -/obj/item/mining_scanner, -/obj/item/pickaxe, -/obj/item/storage/bag/ore, -/obj/item/mining_scanner, -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/corner/opaque/brown{ +"cO" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/catwalk/over, +/turf/open/floor/plating, +/area/ship/engineering) +"dv" = ( +/obj/effect/turf_decal/corner/opaque/purple{ dir = 9 }, -/turf/open/floor/plasteel, -/area/ship/cargo) -"gl" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ship/external) -"gz" = ( -/obj/effect/turf_decal/corner/opaque/brown{ +/obj/structure/frame/computer{ dir = 4 }, +/turf/open/floor/plasteel, +/area/ship/science) +"dy" = ( +/obj/effect/turf_decal/corner/opaque/purple/border, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 10 + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ +/turf/open/floor/plasteel, +/area/ship/hallway/central) +"dI" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/plasteel, -/area/ship/cargo) -"gM" = ( -/obj/machinery/vending/clothing, +/obj/machinery/door/airlock/maintenance_hatch, +/turf/open/floor/plasteel/mono, +/area/ship/bridge) +"ew" = ( +/obj/structure/bed, +/obj/item/bedsheet/dorms, +/obj/structure/curtain/bounty, /turf/open/floor/carpet, /area/ship/crew/dorm) -"hc" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/machinery/light/broken/directional/east, -/obj/effect/turf_decal/ntspaceworks_big/two{ - dir = 8 - }, -/turf/open/floor/plating/rust, -/area/ship/maintenance/aft) -"hh" = ( -/obj/effect/spawner/structure/window/reinforced/shutters, -/turf/open/floor/plating, -/area/ship/bridge) -"hl" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/corner/opaque/purple/border, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"hq" = ( +"eI" = ( /obj/structure/frame/computer{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/corner/opaque/blue/three_quarters{ dir = 8 }, -/obj/machinery/airalarm/directional/north, /turf/open/floor/plasteel, /area/ship/bridge) -"hs" = ( -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 4 +"eM" = ( +/obj/effect/turf_decal/corner/opaque/brown/border{ + dir = 1 }, -/obj/structure/window/reinforced/spawner/west, -/obj/machinery/door/window/eastright, -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced/spawner, -/turf/open/floor/plating, -/area/ship/maintenance/aft) -"hE" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_x = 32 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/corner/opaque/yellow/border, -/obj/effect/turf_decal/corner/opaque/blue/border{ +/turf/open/floor/plasteel, +/area/ship/hallway/central) +"gf" = ( +/turf/closed/wall, +/area/ship/maintenance/starboard) +"gA" = ( +/obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 11; - pixel_y = -20 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, /turf/open/floor/plasteel, -/area/ship/hallway/central) -"im" = ( -/obj/structure/cable{ - icon_state = "4-8" +/area/ship/bridge) +"gK" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/corner/opaque/green/border{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/plasteel, +/area/ship/hallway/central) +"gZ" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/corner/opaque/brown/mono, +/obj/machinery/mineral/ore_redemption, +/turf/open/floor/plasteel/mono, +/area/ship/cargo) +"hk" = ( +/obj/effect/turf_decal/corner/opaque/yellow{ dir = 4 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/mono, -/area/ship/hallway/central) -"jr" = ( -/obj/item/bedsheet/dorms, -/obj/structure/bed, -/obj/structure/curtain/bounty, -/obj/effect/turf_decal/siding/wood{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/item/wrench, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/turf/open/floor/wood, -/area/ship/crew/dorm) -"jz" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 9 +/turf/open/floor/plasteel, +/area/ship/engineering) +"ic" = ( +/obj/machinery/door/poddoor{ + id = "bubbledoors"; + name = "Cargo Bay Blast Door" }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) -"jI" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-8" }, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "2-4" }, -/turf/open/floor/plating/rust, -/area/ship/maintenance/aft) -"jM" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "engine fuel pump" +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo) +"ii" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/ship/maintenance/aft) -"jW" = ( +/turf/open/floor/plasteel, +/area/ship/science) +"ix" = ( +/obj/effect/turf_decal/corner/opaque/purple/border, +/obj/machinery/airalarm/directional/west, +/obj/item/kirbyplants/random, +/turf/open/floor/plasteel, +/area/ship/hallway/central) +"iP" = ( +/turf/closed/wall, +/area/ship/engineering) +"jk" = ( /obj/machinery/computer/helm{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/corner/opaque/blue/half{ dir = 4 }, /turf/open/floor/plasteel, /area/ship/bridge) -"kn" = ( -/obj/machinery/ore_silo, -/obj/item/multitool, -/obj/effect/turf_decal/corner/opaque/brown/half{ - dir = 8 +"jE" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/catwalk/over, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/ship/cargo) -"kW" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/machinery/autolathe, -/obj/effect/turf_decal/corner/opaque/purple{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/ship/science) -"ln" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 4 +"ka" = ( +/obj/structure/bed, +/obj/item/bedsheet/dorms, +/obj/structure/curtain/bounty, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -11; + pixel_y = -20 }, -/turf/open/floor/plasteel, -/area/ship/engineering) -"lt" = ( +/turf/open/floor/carpet, +/area/ship/crew/dorm) +"kf" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, /turf/open/floor/carpet, /area/ship/crew/dorm) -"lN" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel, -/area/ship/engineering) -"mg" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/corner/opaque/green/border{ - dir = 1 +"ki" = ( +/obj/machinery/ore_silo, +/obj/item/multitool, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 11 }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"mV" = ( -/turf/closed/wall, +/obj/machinery/firealarm/directional/west, +/obj/structure/catwalk/over, +/turf/open/floor/plating, /area/ship/cargo) -"mY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, +"kq" = ( /turf/closed/wall, -/area/ship/engineering) -"ny" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/structure/frame/machine, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/light_switch{ - pixel_x = 8; - pixel_y = 23 +/area/ship/maintenance/port) +"kK" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, /turf/open/floor/plasteel, /area/ship/science) -"nH" = ( +"kU" = ( +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/plating, +/area/ship/external) +"lC" = ( /turf/closed/wall, -/area/ship/science) -"nS" = ( -/turf/open/floor/plasteel, -/area/ship/cargo) -"nV" = ( -/obj/machinery/door/airlock{ - name = "Dormitories" - }, -/obj/structure/cable{ - icon_state = "1-2" +/area/ship/maintenance/aft) +"lG" = ( +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = -11 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/effect/turf_decal/corner/opaque/green/mono, -/turf/open/floor/plasteel/mono, -/area/ship/crew/dorm) -"op" = ( -/turf/closed/wall, -/area/ship/maintenance/port) -"pt" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 8 +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/closet/wall/blue{ + pixel_y = 32 }, -/obj/machinery/airalarm/directional/east, -/obj/machinery/firealarm/directional/south, /obj/item/areaeditor/shuttle, /obj/item/spacecash/bundle/c1000, /obj/item/spacecash/bundle/c1000, @@ -410,1260 +283,1420 @@ /obj/item/spacecash/bundle/c1000, /obj/item/spacecash/bundle/c1000, /obj/item/spacecash/bundle/c1000, -/turf/open/floor/wood, -/area/ship/crew/dorm) -"qi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/machinery/light/directional/south, -/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel, -/area/ship/cargo) -"qq" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/purple/border, +/area/ship/bridge) +"lV" = ( +/obj/effect/turf_decal/corner/opaque/yellow/border, +/obj/structure/frame/machine, /turf/open/floor/plasteel, /area/ship/hallway/central) -"qY" = ( -/obj/item/kirbyplants/random, -/obj/item/storage/box/rndboards{ - desc = "Smells feighntly of plastic."; - name = "research equipment" +"mo" = ( +/obj/machinery/power/terminal{ + dir = 8 }, -/obj/machinery/light/directional/north, -/obj/item/radio/intercom/wideband/directional/west, -/turf/open/floor/plasteel, -/area/ship/bridge) -"rf" = ( -/obj/machinery/door/airlock/maintenance_hatch{ +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/ship/maintenance/aft) +"mt" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = 14 + }, +/obj/machinery/shower{ + dir = 8; + pixel_y = 11 + }, +/obj/structure/mirror{ + pixel_x = 28 + }, +/obj/structure/toilet{ + pixel_y = 7 + }, +/turf/open/floor/plating/rust, +/area/ship/maintenance/port) +"nd" = ( +/obj/effect/turf_decal/industrial/warning{ dir = 4 }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 8 +/turf/open/floor/plating, +/area/ship/external) +"ni" = ( +/obj/effect/landmark/observer_start, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating, -/area/ship/engineering) -"sk" = ( +/turf/open/floor/plasteel, +/area/ship/hallway/central) +"nm" = ( +/obj/effect/turf_decal/corner/opaque/brown/mono, +/obj/machinery/door/airlock/glass_large, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "2-4" +/turf/open/floor/plasteel/mono, +/area/ship/cargo) +"nK" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/effect/turf_decal/corner/opaque/green/border{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ dir = 1 }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"ss" = ( -/obj/structure/frame/computer{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +/turf/open/floor/plating, +/area/ship/external) +"nM" = ( +/obj/structure/rack, +/obj/machinery/airalarm/directional/west, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/item/storage/toolbox/mechanical, +/obj/item/mining_scanner, +/obj/item/mining_scanner, +/obj/structure/catwalk/over, +/turf/open/floor/plating, +/area/ship/cargo) +"nR" = ( +/obj/effect/turf_decal/corner/opaque/brown/mono, +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/effect/turf_decal/corner/opaque/blue/three_quarters, -/obj/machinery/firealarm/directional/south, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 11; - pixel_y = -20 +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/mono, +/area/ship/cargo) +"od" = ( +/obj/structure/cable{ + icon_state = "2-8" }, -/turf/open/floor/plasteel, -/area/ship/bridge) -"uw" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable, -/obj/machinery/power/ship_gravity, -/turf/open/floor/plating/rust, +/obj/structure/crate_shelf, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 6 + }, +/turf/open/floor/plating, /area/ship/maintenance/aft) -"uE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ +"oO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/ship/science) +"oU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/item/toy/plush/lizardplushie{ + color = "cyan" + }, +/obj/item/clothing/head/wig/random{ + pixel_x = -1; + pixel_y = -4 + }, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) +"py" = ( +/obj/effect/turf_decal/corner/opaque/blue/border{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/holopad/emergency/command, -/turf/open/floor/plasteel, -/area/ship/bridge) -"uL" = ( -/obj/effect/turf_decal/corner/opaque/yellow/border, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/ship/hallway/central) -"vB" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ +"pF" = ( +/obj/effect/turf_decal/corner/opaque/yellow/mono, +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 4 +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/engineering/glass, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, -/area/ship/science) -"vO" = ( +/turf/open/floor/plasteel/mono, +/area/ship/engineering) +"pL" = ( +/obj/machinery/atmospherics/components/unary/portables_connector, +/obj/machinery/portable_atmospherics/canister/toxins, +/turf/open/floor/plating, +/area/ship/maintenance/aft) +"pR" = ( +/obj/effect/turf_decal/corner/opaque/purple/mono, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/research/glass, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/number/zero{ - dir = 8 +/turf/open/floor/plasteel/mono, +/area/ship/science) +"qs" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/turf/open/floor/plasteel/mono, +/area/ship/cargo) +"qu" = ( +/obj/structure/safe/floor, +/turf/open/floor/plasteel, +/area/ship/bridge) +"qN" = ( +/obj/structure/crate_shelf, +/obj/structure/closet/crate/engineering, +/obj/item/circuitboard/computer/selling_pad_control, +/obj/item/circuitboard/machine/selling_pad, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 9 + }, +/turf/open/floor/plating, +/area/ship/maintenance/aft) +"rb" = ( +/obj/effect/turf_decal/corner/opaque/green/border{ + dir = 1 + }, +/obj/structure/table, +/obj/item/storage/box/donkpockets{ + pixel_x = -8 + }, +/obj/item/storage/box/donkpockets{ + pixel_y = 5; + pixel_x = -8 }, -/turf/open/floor/plating, -/area/ship/maintenance/aft) -"vR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/turf/closed/wall, -/area/ship/science) -"vS" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/mineral/plasma/fifty, -/obj/item/stack/sheet/mineral/uranium/five, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ - dir = 4 +/obj/item/storage/box/donkpockets{ + pixel_x = 8 }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/turf/open/floor/plasteel, -/area/ship/engineering) -"wz" = ( -/obj/effect/turf_decal/corner/opaque/brown/half{ - dir = 4 +/obj/item/storage/box/donkpockets{ + pixel_y = 5; + pixel_x = 8 }, -/obj/machinery/button/door{ - id = "bubbledoors"; - name = "Blast Door Control"; - pixel_x = 25 +/obj/item/storage/box/donkpockets{ + pixel_y = 10; + pixel_x = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/suit_storage_unit/independent/mining, -/turf/open/floor/plasteel, -/area/ship/cargo) -"wH" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = -11 }, /obj/structure/cable{ icon_state = "0-4" }, -/turf/open/floor/plating, -/area/ship/external) -"wO" = ( -/obj/structure/fans/tiny, -/obj/effect/turf_decal/siding/thinplating, -/obj/machinery/door/poddoor{ - id = "bubbledoors"; - name = "Cargo Bay Blast Door" +/turf/open/floor/plasteel, +/area/ship/hallway/central) +"rc" = ( +/obj/structure/window/reinforced/spawner/east, +/obj/structure/rack, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 5 }, -/obj/effect/turf_decal/industrial/warning/corner{ +/obj/item/storage/toolbox/electrical, +/obj/item/multitool, +/turf/open/floor/plasteel, +/area/ship/science) +"rd" = ( +/obj/item/soap, +/turf/open/floor/plating/rust, +/area/ship/maintenance/port) +"rv" = ( +/obj/effect/turf_decal/industrial/warning{ dir = 1 }, /turf/open/floor/plating, -/area/ship/cargo) -"xm" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4; - name = "Helm" +/area/ship/external) +"rx" = ( +/obj/machinery/vending/clothing, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/carpet, +/area/ship/crew/dorm) +"rV" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel/mono, +/area/ship/bridge) +"sg" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "6-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-6" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ +/turf/open/floor/plating, +/area/ship/maintenance/aft) +"sk" = ( +/obj/effect/turf_decal/corner/opaque/brown/border{ dir = 1 }, -/obj/effect/landmark/start/captain, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel, -/area/ship/bridge) -"xC" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 5 +/area/ship/hallway/central) +"tv" = ( +/obj/docking_port/stationary{ + width = 30; + height = 15; + dwidth = 15; + dir = 2 + }, +/turf/template_noop, +/area/template_noop) +"tQ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) +"uE" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/mono/dark, +/area/ship/engineering) +"vf" = ( +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 1 }, /turf/open/floor/plating, /area/ship/external) -"xX" = ( +"vQ" = ( /obj/effect/turf_decal/industrial/warning{ - dir = 10 - }, -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/power/port_gen/pacman, +/obj/machinery/light/directional/east, /turf/open/floor/plating, -/area/ship/external) -"yb" = ( -/obj/machinery/door/airlock/research/glass, -/obj/structure/cable{ - icon_state = "1-2" +/area/ship/engineering) +"wf" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/effect/turf_decal/corner/opaque/purple/mono, -/turf/open/floor/plasteel/mono, -/area/ship/science) -"yw" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 }, -/turf/open/floor/plasteel/mono, -/area/ship/hallway/central) -"zu" = ( -/obj/machinery/door/airlock/engineering/glass, -/obj/effect/turf_decal/corner/opaque/yellow/mono, /turf/open/floor/plasteel/mono, /area/ship/engineering) -"zy" = ( -/turf/closed/wall, -/area/ship/maintenance/starboard) -"Ak" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/effect/turf_decal/number/two{ +"ws" = ( +/obj/machinery/computer/cargo/express{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/corner/opaque/blue/three_quarters, +/obj/machinery/button/door{ + dir = 1; + pixel_y = -23; + id = "bridge" }, -/turf/open/floor/plating/rust, -/area/ship/maintenance/aft) -"Ay" = ( +/turf/open/floor/plasteel, +/area/ship/bridge) +"wY" = ( +/turf/closed/wall, +/area/ship/crew/dorm) +"xe" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4, -/obj/effect/landmark/start/assistant, -/turf/open/floor/plasteel/mono, -/area/ship/hallway/central) -"AR" = ( -/obj/docking_port/stationary{ - width = 30; - height = 15; - dwidth = 15; - dir = 2 +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/template_noop, -/area/space) -"AU" = ( -/obj/machinery/cryopod{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/plasteel, +/area/ship/hallway/central) +"yl" = ( +/obj/effect/turf_decal/corner/opaque/purple{ + dir = 10 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -29 }, -/obj/machinery/light/directional/west, -/turf/open/floor/carpet, -/area/ship/crew/dorm) -"BJ" = ( -/obj/structure/sign/departments/cargo{ - pixel_y = 32 +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -11; + pixel_y = -20 }, -/obj/effect/turf_decal/corner/opaque/brown/border{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Cc" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-1" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, /turf/open/floor/plasteel, /area/ship/science) -"Cg" = ( -/obj/machinery/door/airlock/maintenance_hatch{ +"yK" = ( +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + id = "shield"; dir = 4 }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 4 +/obj/machinery/door/poddoor{ + id = "bubbledoors"; + name = "Cargo Bay Blast Door" }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-4" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/mono/dark, /area/ship/cargo) -"Cu" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/landmark/start/assistant, -/turf/open/floor/carpet, -/area/ship/crew/dorm) -"CP" = ( -/turf/closed/wall, -/area/ship/bridge) -"DP" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ +"zo" = ( +/obj/effect/turf_decal/corner/opaque/green/border{ dir = 1 }, -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/corner/opaque/brown/border{ - dir = 1 +/obj/machinery/light_switch{ + pixel_x = -13; + pixel_y = 23 }, -/obj/effect/turf_decal/corner/opaque/blue/border{ +/obj/structure/table, +/obj/machinery/microwave{ + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ship/hallway/central) +"zu" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/ship/hallway/central) -"Gf" = ( -/obj/machinery/power/shuttle/engine/fueled/plasma{ +"zX" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/closed/wall, +/area/ship/bridge) +"Ae" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow, +/obj/effect/turf_decal/industrial/warning/corner{ dir = 4 }, +/obj/effect/turf_decal/industrial/warning{ + dir = 10 + }, +/obj/machinery/power/port_gen/pacman/super, +/obj/machinery/airalarm/directional/south, /turf/open/floor/plating, -/area/ship/external) -"Gk" = ( -/obj/machinery/cryopod{ +/area/ship/engineering) +"AR" = ( +/obj/structure/window/reinforced/spawner/west, +/obj/structure/window/reinforced/spawner/north, +/obj/structure/window/reinforced/spawner, +/obj/machinery/atmospherics/components/unary/shuttle/heater{ dir = 4 }, -/obj/machinery/computer/cryopod/directional/north, -/turf/open/floor/carpet, -/area/ship/crew/dorm) -"Gl" = ( /turf/open/floor/plating, -/area/ship/external) -"Gp" = ( +/area/ship/maintenance/aft) +"Bk" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /obj/effect/turf_decal/industrial/warning{ dir = 4 }, /turf/open/floor/plating, -/area/ship/external) -"GD" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 +/area/ship/engineering) +"Cr" = ( +/obj/machinery/light/directional/east, +/obj/structure/catwalk/over, +/obj/machinery/suit_storage_unit/mining/eva, +/turf/open/floor/plating, +/area/ship/cargo) +"CT" = ( +/obj/structure/crate_shelf, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/structure/window/reinforced/spawner/west, +/turf/open/floor/plating, +/area/ship/maintenance/aft) +"Dk" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/carpet, +/area/ship/crew/dorm) +"Dt" = ( /obj/machinery/door/window/eastright, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/ship/science) +"DN" = ( +/obj/structure/catwalk/over, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ship/cargo) +"DQ" = ( +/turf/closed/wall, +/area/ship/cargo) +"Ej" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating/rust, +/area/ship/maintenance/port) +"Ew" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel, +/area/ship/bridge) +"ED" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "engine fuel pump" }, /turf/open/floor/plating, /area/ship/maintenance/aft) -"GF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/corner/opaque/brown/border{ - dir = 1 +"Fr" = ( +/obj/effect/turf_decal/corner/opaque/purple{ + dir = 10 }, +/obj/item/kirbyplants/random, +/obj/machinery/airalarm/directional/south, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, -/area/ship/hallway/central) -"GH" = ( +/area/ship/science) +"Fs" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "5-8" }, -/obj/effect/turf_decal/ntspaceworks_big/six{ - dir = 8 +/obj/structure/cable{ + icon_state = "2-5" }, /turf/open/floor/plating, /area/ship/maintenance/aft) -"If" = ( -/obj/structure/cable{ - icon_state = "4-8" +"FK" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 9 }, -/obj/effect/landmark/start/assistant, /turf/open/floor/plating, -/area/ship/maintenance/port) -"Iw" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/turf_decal/siding/thinplating{ - dir = 1 +/area/ship/external) +"GD" = ( +/obj/machinery/holopad/emergency/command, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/ship/bridge) -"IL" = ( -/obj/effect/turf_decal/industrial/warning{ +"GQ" = ( +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/power/port_gen/pacman/super, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/structure/cable/yellow, -/turf/open/floor/plating, -/area/ship/engineering) -"Je" = ( -/obj/effect/landmark/start/shaft_miner, -/turf/open/floor/plasteel, -/area/ship/cargo) -"Js" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/turf_decal/siding/thinplating, /obj/structure/cable{ icon_state = "1-2" }, /turf/open/floor/plating, -/area/ship/bridge) -"JG" = ( -/obj/structure/fans/tiny, -/obj/effect/turf_decal/siding/thinplating, -/obj/machinery/door/poddoor{ - id = "bubbledoors"; - name = "Cargo Bay Blast Door" +/area/ship/maintenance/aft) +"He" = ( +/obj/docking_port/mobile{ + launch_status = 0; + port_direction = 8; + preferred_direction = 4; + dir = 2 }, -/obj/effect/turf_decal/industrial/warning/corner{ +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel/mono/dark, +/area/ship/engineering) +"HC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/plating, -/area/ship/cargo) -"JU" = ( -/obj/machinery/power/terminal{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/ship/hallway/central) +"Iq" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "engine fuel pump" }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/maintenance/aft) -"JZ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 6 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/carpet, -/area/ship/crew/dorm) -"Ke" = ( -/obj/structure/cable{ - icon_state = "1-2" +"Iy" = ( +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "shield" }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/door/poddoor{ + id = "bubbledoors"; + name = "Cargo Bay Blast Door" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/turf/open/floor/plasteel, -/area/ship/bridge) -"KD" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo) +"IM" = ( +/obj/machinery/power/shuttle/engine/fueled/plasma{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/effect/turf_decal/corner/opaque/purple/border, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"KG" = ( -/obj/structure/frame/machine, -/obj/effect/turf_decal/corner/opaque/purple/three_quarters{ - dir = 1 +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "thr" }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, +/area/ship/maintenance/aft) +"Jo" = ( +/turf/closed/wall, /area/ship/science) -"KQ" = ( -/obj/machinery/door/window/eastright, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ +"Jq" = ( +/obj/machinery/computer/cryopod/directional/west, +/obj/machinery/cryopod{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4, -/turf/open/floor/plasteel, -/area/ship/science) -"Lk" = ( -/obj/structure/frame/machine, -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/corner/opaque/purple{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/ship/science) -"Ls" = ( +/obj/machinery/light/directional/north, +/turf/open/floor/carpet, +/area/ship/crew/dorm) +"JG" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ship/engineering) -"LK" = ( -/obj/item/bedsheet/dorms, -/obj/structure/bed, -/obj/structure/curtain/bounty, -/obj/effect/turf_decal/siding/wood{ - dir = 8 +"Ka" = ( +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ +/obj/structure/closet/crate, +/obj/item/stack/sheet/mineral/plasma/fifty, +/obj/item/stack/sheet/mineral/uranium/five, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/turf/open/floor/wood, -/area/ship/crew/dorm) -"Mu" = ( -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/corner/opaque/purple/border, /turf/open/floor/plasteel, -/area/ship/hallway/central) -"MJ" = ( -/turf/closed/wall, /area/ship/engineering) -"MW" = ( -/obj/effect/landmark/start/assistant, -/turf/open/floor/plating, -/area/ship/maintenance/aft) -"MY" = ( -/obj/machinery/mineral/ore_redemption, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel, -/area/ship/cargo) -"MZ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 +"Kg" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/light_switch{ + pixel_x = -13; + pixel_y = 23 }, /obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/ntspaceworks_big/eight{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/rust, -/area/ship/maintenance/aft) -"Na" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "engine fuel pump" - }, -/obj/effect/turf_decal/ntspaceworks_big/one{ - dir = 8 - }, -/turf/open/floor/plating/rust, -/area/ship/maintenance/aft) -"Nf" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 + icon_state = "0-2" }, -/obj/docking_port/mobile{ - launch_status = 0; - port_direction = 8; - preferred_direction = 4; - dir = 2 +/turf/open/floor/carpet, +/area/ship/crew/dorm) +"Kk" = ( +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "thr" }, -/turf/open/floor/plating, -/area/ship/external) -"NN" = ( -/obj/structure/frame/computer{ - dir = 4 +/obj/structure/cable{ + icon_state = "0-4" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +/obj/machinery/power/shuttle/engine/electric{ dir = 4 }, -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/corner/opaque/purple{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/ship/science) -"NX" = ( -/obj/effect/turf_decal/industrial/warning, /turf/open/floor/plating, -/area/ship/external) -"Ob" = ( -/turf/closed/wall, /area/ship/maintenance/aft) -"OR" = ( -/obj/machinery/power/terminal{ - dir = 8 +"KM" = ( +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "2-8" }, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "1-8" }, -/obj/structure/closet/crate, -/obj/item/stack/sheet/plasteel/fifty, -/obj/item/pipe_dispenser, -/obj/item/construction/rcd/arcd, -/obj/item/construction/rcd/combat, -/obj/item/construction/plumbing, -/turf/open/floor/plating, -/area/ship/maintenance/aft) -"OY" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/ship/bridge) -"Rk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 +/area/ship/hallway/central) +"Nd" = ( +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 }, -/turf/closed/wall, -/area/ship/engineering) -"Ry" = ( /obj/structure/cable{ - icon_state = "0-4" + icon_state = "1-8" }, -/obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/plasteel, -/area/ship/bridge) -"RY" = ( -/obj/machinery/door/airlock/command/glass{ - dir = 4 +/area/ship/engineering) +"Nn" = ( +/obj/structure/cable{ + icon_state = "4-9" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-10" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/effect/turf_decal/corner/opaque/blue/mono, -/turf/open/floor/plasteel/mono, -/area/ship/bridge) -"Sj" = ( /obj/structure/cable{ - icon_state = "0-2" + icon_state = "2-4" }, +/turf/open/floor/plating, +/area/ship/maintenance/aft) +"No" = ( /obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 6 - }, -/obj/machinery/suit_storage_unit/independent/mining, /obj/machinery/light_switch{ dir = 8; pixel_x = 20; - pixel_y = 11 + pixel_y = -12 }, +/obj/structure/cable{ + icon_state = "0-1" + }, +/turf/open/floor/plating, +/area/ship/maintenance/aft) +"Nw" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/corner/opaque/purple/border, +/obj/structure/tank_dispenser/oxygen, /turf/open/floor/plasteel, -/area/ship/cargo) -"Ss" = ( +/area/ship/hallway/central) +"NA" = ( +/obj/effect/turf_decal/corner/opaque/purple/border, +/obj/item/kirbyplants/random, +/turf/open/floor/plasteel, +/area/ship/hallway/central) +"NC" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = -11 + }, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "0-4" }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/catwalk/over, +/turf/open/floor/plating, +/area/ship/cargo) +"NR" = ( /obj/effect/turf_decal/corner/opaque/green/border{ dir = 1 }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Th" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/cable{ - icon_state = "1-8" + icon_state = "2-8" }, -/obj/effect/turf_decal/number/five{ - dir = 8 +/turf/open/floor/plasteel, +/area/ship/hallway/central) +"Pv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/closed/wall, +/area/ship/science) +"PC" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/layer2{ + dir = 1 }, +/obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, -/area/ship/maintenance/aft) -"TP" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, +/area/ship/maintenance/starboard) +"QP" = ( /obj/effect/turf_decal/corner/opaque/yellow{ dir = 8 }, +/obj/machinery/firealarm/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/plasteel, /area/ship/engineering) -"Ua" = ( -/obj/structure/sign/poster/official/build{ - pixel_y = 32 - }, -/obj/structure/tank_dispenser/oxygen, -/obj/effect/turf_decal/corner/opaque/green/border{ - dir = 1 +"Rb" = ( +/obj/effect/turf_decal/corner/opaque/yellow/border, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" }, /turf/open/floor/plasteel, /area/ship/hallway/central) -"Ul" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 1; - piping_layer = 4 +"RM" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 1 }, +/obj/machinery/light/directional/south, /turf/open/floor/plating, -/area/ship/maintenance/starboard) -"Uq" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 9 +/area/ship/external) +"SR" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 4 }, +/obj/structure/window/reinforced/spawner/west, /obj/structure/cable{ - icon_state = "2-4" - }, -/obj/effect/turf_decal/ntspaceworks_big/four{ - dir = 8 + icon_state = "0-8" }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/maintenance/aft) -"UC" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 +"Tr" = ( +/turf/template_noop, +/area/template_noop) +"Ul" = ( +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 23 }, -/obj/structure/cable/yellow{ - icon_state = "0-8" +/obj/effect/turf_decal/corner/opaque/purple{ + dir = 9 + }, +/obj/machinery/firealarm/directional/north, +/obj/structure/frame/machine, +/turf/open/floor/plasteel, +/area/ship/science) +"UP" = ( +/obj/effect/spawner/structure/window/reinforced/shutters, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "bridge" }, -/obj/machinery/power/port_gen/pacman, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/airalarm/directional/east, /turf/open/floor/plating, -/area/ship/engineering) -"Vt" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/closed/wall, -/area/ship/engineering) -"Vw" = ( +/area/ship/bridge) +"UR" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/landmark/start/assistant, /turf/open/floor/plasteel/mono, -/area/ship/hallway/central) -"VA" = ( +/area/ship/maintenance/aft) +"Vu" = ( /obj/machinery/power/terminal{ dir = 8 }, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "0-1" }, +/obj/machinery/power/ship_gravity, /turf/open/floor/plating, /area/ship/maintenance/aft) -"VB" = ( -/turf/template_noop, -/area/space) -"VI" = ( -/obj/effect/turf_decal/corner/opaque/brown{ +"VC" = ( +/turf/closed/wall, +/area/ship/bridge) +"VO" = ( +/obj/effect/turf_decal/corner/opaque/purple/three_quarters{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/item/circuitboard/computer/selling_pad_control, -/obj/item/circuitboard/machine/selling_pad, -/obj/item/circuitboard/computer/cargo/express, -/obj/structure/closet/crate/engineering, +/obj/structure/frame/machine, /turf/open/floor/plasteel, -/area/ship/cargo) +/area/ship/science) "VQ" = ( -/turf/closed/wall, -/area/ship/crew/dorm) -"Wx" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/item/toy/plush/lizardplushie{ - color = "cyan" - }, -/obj/item/clothing/head/wig/random{ - pixel_x = -1; - pixel_y = -4 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/plating, -/area/ship/maintenance/port) -"WN" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 +/area/ship/maintenance/aft) +"Wc" = ( +/obj/machinery/firealarm/directional/east, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = -12 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, -/area/ship/external) -"Xn" = ( +/area/ship/maintenance/aft) +"Wg" = ( /obj/effect/turf_decal/industrial/warning{ - dir = 9 + dir = 5 }, /turf/open/floor/plating, /area/ship/external) -"Xy" = ( -/obj/machinery/door/airlock/mining/glass, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ +"Wu" = ( +/obj/item/kirbyplants/random, +/obj/machinery/firealarm/directional/west, +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/effect/turf_decal/corner/opaque/brown/mono, -/turf/open/floor/plasteel/mono, -/area/ship/cargo) -"Ya" = ( +/turf/open/floor/plasteel, +/area/ship/bridge) +"Wx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/catwalk/over, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "1-2" }, -/obj/machinery/firealarm/directional/north, -/obj/machinery/light_switch{ - pixel_x = 10; - pixel_y = 23 +/turf/open/floor/plating, +/area/ship/cargo) +"WF" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 9 }, -/turf/open/floor/plasteel, -/area/ship/engineering) -"Yi" = ( -/obj/effect/spawner/lootdrop/maintenance, -/obj/structure/closet/firecloset/full, /turf/open/floor/plating, -/area/ship/maintenance/port) -"Ys" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 5 +/area/ship/maintenance/aft) +"Xr" = ( +/obj/effect/turf_decal/corner/opaque/blue/mono, +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, -/obj/item/storage/toolbox/electrical, -/obj/item/multitool, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel, -/area/ship/science) -"Zg" = ( -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/airlock/command/glass{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "4-8" }, +/turf/open/floor/plasteel/mono, +/area/ship/bridge) +"XK" = ( +/obj/structure/table/wood, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/carpet, +/area/ship/crew/dorm) +"Yc" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/plasteel/mono, +/turf/open/floor/plasteel, /area/ship/hallway/central) -"ZB" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 +"Yh" = ( +/obj/machinery/button/shieldwallgen{ + dir = 8; + pixel_y = 11; + pixel_x = 24; + id = "shield" }, -/obj/structure/window/reinforced/spawner/west, -/obj/machinery/door/window/eastleft, -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/button/door{ + dir = 8; + pixel_x = 26; + id = "bubbledoors"; + pixel_y = 3 }, +/obj/structure/catwalk/over, +/obj/machinery/suit_storage_unit/mining/eva, /turf/open/floor/plating, -/area/ship/maintenance/aft) -"ZM" = ( +/area/ship/cargo) +"YL" = ( +/obj/effect/turf_decal/corner/opaque/green/mono, +/obj/machinery/door/airlock{ + name = "Dormitories" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 5 +/turf/open/floor/plasteel/mono, +/area/ship/crew/dorm) +"ZG" = ( +/obj/effect/turf_decal/corner/opaque/brown/border{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/blue/border{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 11 }, -/obj/effect/landmark/start/scientist, +/obj/machinery/firealarm/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel, -/area/ship/science) -"ZQ" = ( -/obj/machinery/door/airlock/external, -/turf/open/floor/plating, -/area/ship/engineering) +/area/ship/hallway/central) +"ZT" = ( +/obj/effect/turf_decal/corner/opaque/yellow/border, +/obj/effect/turf_decal/corner/opaque/blue/border{ + dir = 4 + }, +/obj/structure/frame/computer{ + anchored = 1; + dir = 1 + }, +/turf/open/floor/plasteel, +/area/ship/hallway/central) (1,1,1) = {" -VB -VB -VB -VB -VB -VB -Ob -wH -Gf -wH -Ob -VB -VB -VB -VB -VB -VB -VB +Tr +Tr +Tr +Tr +Tr +Tr +lC +bc +IM +bc +lC +Tr +Tr +Tr +Tr +Tr +Tr +Tr "} (2,1,1) = {" -VB -VB -VB -VB -Ob -wH -Ob -ZB -hs -GD -Ob -wH -Ob -VB -VB -VB -VB -VB +Tr +Tr +Tr +Tr +lC +Kk +lC +SR +AR +SR +lC +Kk +lC +Tr +Tr +Tr +Tr +Tr "} (3,1,1) = {" -VB -VB -VB -VB -Ob -ZB -Ob -JU -jM -VA -Ob -ZB -Ob -VB -VB -VB -VB -VB +Tr +Tr +Tr +Tr +lC +SR +lC +mo +Iq +mo +lC +SR +lC +Tr +Tr +Tr +Tr +Tr "} (4,1,1) = {" -VB -VB -VB -Ob -Ob -fI -GH -bv -MZ -jI -MW -OR -Ob -Ob -VB -VB -VB -VB +Tr +Tr +Tr +lC +lC +cM +od +sg +qN +Fs +CT +Vu +lC +lC +Tr +Tr +Tr +Tr "} (5,1,1) = {" -VB -VB -VB -Ob -ep -Na -hc -da -Uq -Th -vO -Ak -uw -Ob -VB -VB -VB -VB +Tr +Tr +Tr +lC +pL +ED +WF +Wc +Nn +GQ +No +VQ +cg +lC +Tr +Tr +Tr +Tr "} (6,1,1) = {" -VB -VB -VQ -VQ -VQ -VQ -VQ -Ob -bZ -Ob -nH -nH -nH -nH -nH -VB -VB -VB +Tr +Tr +wY +wY +wY +wY +wY +lC +UR +lC +Jo +Jo +Jo +Jo +Jo +Tr +Tr +Tr "} (7,1,1) = {" -VB -VB -VQ -Gk -AU -gM -VQ -Ua -yw -qq -nH -Lk -NN -KG -nH -VB -VB -VB +Tr +Tr +wY +Jq +XK +rx +wY +rb +Yc +ix +Jo +Ul +dv +VO +Jo +Tr +Tr +Tr "} (8,1,1) = {" -VB -VB -VQ -Cu -JZ -lt -nV -sk -Zg -KD -yb -Cc -ZM -eT -nH -VB -VB -VB +Tr +Tr +wY +Kg +kf +Dk +YL +NR +xe +dy +pR +ii +oO +yl +Jo +Tr +Tr +Tr "} (9,1,1) = {" -VB -Xn -VQ -jr -LK -pt -VQ -Ss -Vw -Mu -nH -Ys -vB -fs -vR -xX -VB -VB +Tr +FK +wY +ew +ew +ka +wY +zo +HC +NA +Jo +bf +kK +Fr +Pv +nK +Tr +Tr "} (10,1,1) = {" -VB -gl -VQ -VQ -VQ -VQ -VQ -mg -ck -hl -nH -ny -KQ -kW -nH -NX -VB -VB +Tr +RM +wY +wY +wY +wY +wY +gK +ni +Nw +Jo +rc +Dt +bG +Jo +kU +Tr +Tr "} (11,1,1) = {" -Xn -WN -wO -kn -fS -VI -MY -GF -Ay -uL -MJ -lN -ln -IL -Vt -Rk -MJ -VB +FK +vf +yK +ki +nM +NC +gZ +sk +zu +lV +iP +bn +Bk +Ae +iP +iP +iP +Tr "} (12,1,1) = {" -Nf -Gl -ec -nS -Je -qi -mV -BJ -im -cF -zu -TP -cH -Ls -ZQ -cG -ZQ -AR +rv +aV +ic +DN +jE +Wx +nm +eM +KM +Rb +pF +Nd +hk +JG +uE +cO +He +tv "} (13,1,1) = {" -xC -Gp -JG -wz -Sj -gz -Xy -DP -eU -hE -MJ -Ya -vS -UC -Vt -mY -MJ -VB +Wg +nd +Iy +Yh +Cr +au +nR +ZG +py +ZT +iP +QP +Ka +vQ +iP +iP +iP +Tr "} (14,1,1) = {" -VB -VB -mV -mV -mV -Cg -mV -CP -RY -CP -CP -rf -MJ -MJ -MJ -VB -VB -VB +Tr +Tr +DQ +DQ +DQ +qs +DQ +VC +Xr +VC +VC +wf +iP +iP +iP +Tr +Tr +Tr "} (15,1,1) = {" -VB -VB -VB -op -Yi -If -CP -qY -uE -Ry -CP -bb -Ul -zy -VB -VB -VB -VB +Tr +Tr +Tr +kq +Ej +rd +VC +lG +GD +Wu +VC +tQ +PC +gf +Tr +Tr +Tr +Tr "} (16,1,1) = {" -VB -VB -VB -op -op -Wx -Js -OY -xm -Ke -Iw -jz -zy -zy -VB -VB -VB -VB +Tr +Tr +Tr +kq +kq +mt +dI +qu +gA +Ew +rV +oU +gf +gf +Tr +Tr +Tr +Tr "} (17,1,1) = {" -VB -VB -VB -VB -op -op -CP -hq -jW -ss -CP -zy -zy -VB -VB -VB -VB -VB +Tr +Tr +Tr +Tr +kq +kq +zX +eI +jk +ws +VC +gf +gf +Tr +Tr +Tr +Tr +Tr "} (18,1,1) = {" -VB -VB -VB -VB -VB -VB -CP -hh -hh -hh -CP -VB -VB -VB -VB -VB -VB -VB +Tr +Tr +Tr +Tr +Tr +Tr +VC +UP +UP +UP +VC +Tr +Tr +Tr +Tr +Tr +Tr +Tr "} (19,1,1) = {" -VB -VB -VB -VB -VB -VB -VB -VB -VB -VB -VB -VB -VB -VB -VB -VB -VB -VB +Tr +Tr +Tr +Tr +Tr +Tr +Tr +Tr +Tr +Tr +Tr +Tr +Tr +Tr +Tr +Tr +Tr +Tr "} diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm index fe5b89def293..a862e43d50e7 100644 --- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -1258,8 +1258,8 @@ /obj/item/clothing/mask/gas/syndicate, /obj/item/tank/internals/oxygen, /obj/item/clothing/shoes/magboots/syndie{ - pixel_x = -6; - pixel_y = -5 + pixel_x = -11; + pixel_y = -11 }, /obj/item/clothing/suit/space/hardsuit/syndi/elite/oldsst, /turf/open/floor/plasteel/tech, From 83634e9bf2434c7070c11f41614309ea1249bb57 Mon Sep 17 00:00:00 2001 From: MrCat15352 Date: Fri, 3 May 2024 21:37:27 +0500 Subject: [PATCH 15/17] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=81=D0=BF=D1=80=D0=B0=D0=B9=D1=82=D1=8B?= =?UTF-8?q?=20=D0=BA=D0=B0=D0=BD=D0=B8=D1=81=D1=82=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mod_celadon/mod_celadon.dme | 1 + mod_celadon/resprite/README.md | 78 +++++++++++++++++++++++ mod_celadon/resprite/_resprite.dm | 9 +++ mod_celadon/resprite/_resprite.dme | 8 +++ mod_celadon/resprite/code/atmos.dm | 4 ++ mod_celadon/resprite/icons/canisters.dmi | Bin 0 -> 30079 bytes 6 files changed, 100 insertions(+) create mode 100644 mod_celadon/resprite/README.md create mode 100644 mod_celadon/resprite/_resprite.dm create mode 100644 mod_celadon/resprite/_resprite.dme create mode 100644 mod_celadon/resprite/code/atmos.dm create mode 100644 mod_celadon/resprite/icons/canisters.dmi diff --git a/mod_celadon/mod_celadon.dme b/mod_celadon/mod_celadon.dme index 5f5f74e6bbde..53c890b3362c 100644 --- a/mod_celadon/mod_celadon.dme +++ b/mod_celadon/mod_celadon.dme @@ -17,6 +17,7 @@ // --- ICONS --- // #include "species_changes/_species_changes.dme" +#include "resprite/_resprite.dme" // --- SOUNDS --- // diff --git a/mod_celadon/resprite/README.md b/mod_celadon/resprite/README.md new file mode 100644 index 000000000000..2ff4ddb0c307 --- /dev/null +++ b/mod_celadon/resprite/README.md @@ -0,0 +1,78 @@ + + +#### Список PRов: + +- https://github.com/MysticalFaceLesS/Shiptest/pulls/##### + + + +## Респрйты текстур + +ID мода: RESPRITE + + +### Описание мода + +Этот мод содержит респрайты текстурок. Заменяет текстуры на наши. Канистры заменились на сьеровские. + + +### Изменения *кор кода* + +- Отсутствуют + + +### Оверрайды + +- Отсутствуют + + +### Дефайны + +- Отсутствуют + + +### Используемые файлы, не содержащиеся в модпаке + +- Отсутствуют + + +### Авторы: + +MrCat15352 + diff --git a/mod_celadon/resprite/_resprite.dm b/mod_celadon/resprite/_resprite.dm new file mode 100644 index 000000000000..ab7b132a1a6b --- /dev/null +++ b/mod_celadon/resprite/_resprite.dm @@ -0,0 +1,9 @@ +/datum/modpack/resprite + /// Строковое имя модпака. Используется для поиска других модпаков в init. + name = "New textures" + /// Строковое описание для модпака. Может использоваться для списка глаголов модпака в качестве описания. + desc = "Включает различные респрайты разных объектов, таких как: канистры" + /// Строка с авторами этого модпака. + author = "MrCat15352" + +///**********************************************************************/// diff --git a/mod_celadon/resprite/_resprite.dme b/mod_celadon/resprite/_resprite.dme new file mode 100644 index 000000000000..575e6403b2fb --- /dev/null +++ b/mod_celadon/resprite/_resprite.dme @@ -0,0 +1,8 @@ +#ifndef MODPACK_CELADON_RESPRITE +#define MODPACK_CELADON_RESPRITE + +#include "_resprite.dm" + +#include "code/atmos.dm" + +#endif diff --git a/mod_celadon/resprite/code/atmos.dm b/mod_celadon/resprite/code/atmos.dm new file mode 100644 index 000000000000..3c338972120f --- /dev/null +++ b/mod_celadon/resprite/code/atmos.dm @@ -0,0 +1,4 @@ +// Canisters + +/obj/machinery/portable_atmospherics/canister + icon = 'mod_celadon/resprite/icons/canisters.dmi' diff --git a/mod_celadon/resprite/icons/canisters.dmi b/mod_celadon/resprite/icons/canisters.dmi new file mode 100644 index 0000000000000000000000000000000000000000..334405286b652a499c6326bb8c95faeafd5e3882 GIT binary patch literal 30079 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

_&%9jC(}?1 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 literal 0 HcmV?d00001 From 6cc05e25848c0da8ce67274648016a7a021655f9 Mon Sep 17 00:00:00 2001 From: MrCat15352 Date: Fri, 3 May 2024 23:25:19 +0500 Subject: [PATCH 16/17] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=86=D0=B2?= =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B2=20=D0=BA=D0=B0=D0=BD=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mod_celadon/resprite/icons/canisters.dmi | Bin 30079 -> 31621 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mod_celadon/resprite/icons/canisters.dmi b/mod_celadon/resprite/icons/canisters.dmi index 334405286b652a499c6326bb8c95faeafd5e3882..c78a3e6da3dc3fc14f9a3db2bc405dc210449c4a 100644 GIT binary patch delta 10281 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 W?)cZWmOcvtepD5;6w2hS!~Y8rR_dt$ From 954e22f32cf3583eb75ac9162a54886bbb80dba2 Mon Sep 17 00:00:00 2001 From: RalseiDreemuurr Date: Fri, 3 May 2024 22:49:28 +0300 Subject: [PATCH 17/17] =?UTF-8?q?Smol=20=D1=80=D0=B5=D0=BC=D0=B0=D0=BF?= =?UTF-8?q?=D0=BF=D0=B8=D0=BD=D0=B3=20=D0=9A=D0=B0=D0=BD=D1=82=D0=B0=D1=82?= =?UTF-8?q?=D1=81=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configs/syndicate_cybersun_kansatsu.json | 9 +- .../syndicate/syndicate_cybersun_kansatsu.dmm | 289 ++++++++---------- 2 files changed, 126 insertions(+), 172 deletions(-) diff --git a/_maps/_mod_celadon/configs/syndicate_cybersun_kansatsu.json b/_maps/_mod_celadon/configs/syndicate_cybersun_kansatsu.json index c6a463e2885b..238d595c9bda 100644 --- a/_maps/_mod_celadon/configs/syndicate_cybersun_kansatsu.json +++ b/_maps/_mod_celadon/configs/syndicate_cybersun_kansatsu.json @@ -7,9 +7,10 @@ "NATURAL_AGGRESSIVE" ], "map_name": "Kansatsu-class Scout Courier", - "description": "Судно класса «Kansatsu» представляет собой модернизированную компанией Cybersun старую модель Type-S SolGov Courier, переоборудованную для быстрой транспортировки груза и операций малого наблюдения в дальних секторах. Несмотря на то, что он довольно тесный, он превосходно справляется со своими задачами, обеспечивая быстрые исследования, разведку и шпионаж, вытекающие из его присутствия. Развертывание синдиката обычно включает в себя 5 человек, рекомендуемое максимальное количество - 7. Оно разбито на 1 капитана, офицера разведки для координации полевых агентов, инженера и 2 полевых агентов. Простота корпуса привела к тому, что корабль стал широко распространенным индикатором интереса Синдиката к локациям, а некоторые модели попали в руки частных покупателей.", + "description": "Судно класса «Kansatsu» представляет собой модернизированную компанией Cybersun старую модель Type-S SolGov Courier, переоборудованную для быстрой транспортировки груза и операций малого наблюдения в дальних секторах. Несмотря на то, что он довольно тесный, он превосходно справляется со своими задачами, обеспечивая быстрые исследования, разведку и шпионаж, вытекающие из его присутствия. Развертывание синдиката обычно включает в себя 3 человека, рекомендуемое максимальное количество - 5. Оно разбито на 1 капитана, офицера разведки для координации полевых агентов, инженера и 2 полевых агентов. Простота корпуса привела к тому, что корабль стал широко распространенным индикатором интереса Синдиката к локациям, а некоторые модели попали в руки частных покупателей.", "tags": [ - "Специализированный" + "Специализированный", + "РП фокус" ], "map_short_name": "Kansatsu-class", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm", @@ -32,10 +33,6 @@ "Field Agent": { "outfit": "/datum/outfit/job/syndicate/miner/cybersun", "slots": 2 - }, - "Junior Agent": { - "outfit": "/datum/outfit/job/syndicate/assistant/cybersun", - "slots": 2 } }, "enabled": true diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index a62baa89ed5f..ea2feec7809a 100644 --- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -1,29 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"ae" = ( -/obj/structure/table/wood, -/obj/item/cutting_board, -/obj/item/reagent_containers/food/snacks/pancakes/blueberry{ - pixel_y = 5 - }, -/obj/item/reagent_containers/food/snacks/pancakes/chocolatechip{ - pixel_y = 7 - }, -/obj/item/reagent_containers/food/snacks/pancakes{ - pixel_y = 9 - }, -/obj/item/reagent_containers/food/drinks/bottle/sake{ - pixel_x = 4; - pixel_y = 21; - name = "Fluffy Tail Sake"; - icon_state = "sakebottle_k"; - desc = "On the bottle is a picture of a kitsune with nine touchable tails." - }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ - pixel_x = -7; - pixel_y = 16 - }, -/turf/open/floor/carpet/red_gold, -/area/ship/crew) "aV" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 5 @@ -172,15 +147,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, -/obj/structure/table, -/obj/item/stack/sheet/mineral/plasma/twenty{ - pixel_x = -1; - pixel_y = 6 - }, -/obj/item/wrench{ - pixel_y = 4; - pixel_x = -5 - }, /turf/open/floor/plating, /area/ship/engineering) "eC" = ( @@ -236,12 +202,12 @@ /turf/closed/wall/mineral/plastitanium, /area/ship/crew/dorm) "fj" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 - }, /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/power/shuttle/engine/electric/premium{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/engineering) "fo" = ( @@ -387,6 +353,10 @@ /obj/item/chameleon, /obj/item/chameleon, /obj/structure/rack, +/obj/item/card/id/syndicate/anyone, +/obj/item/card/id/syndicate/anyone, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/combat, /turf/open/floor/plasteel/dark, /area/ship/bridge) "hP" = ( @@ -429,6 +399,7 @@ /obj/effect/turf_decal/industrial/warning/corner{ dir = 8 }, +/obj/machinery/space_heater, /turf/open/floor/plating, /area/ship/engineering) "iS" = ( @@ -455,13 +426,6 @@ name = "Medical Supplies"; pixel_x = -32 }, -/obj/item/storage/firstaid/regular{ - pixel_y = 6 - }, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/medical{ - pixel_y = -6 - }, /obj/machinery/light_switch{ dir = 4; pixel_x = -20; @@ -473,6 +437,11 @@ /obj/effect/turf_decal/spline/plain/opaque/syndiered{ dir = 4 }, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/medical, /turf/open/floor/plasteel/dark, /area/ship/crew) "jy" = ( @@ -515,11 +484,8 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "jZ" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/turf_decal/box, +/obj/structure/closet/wall/directional/east, +/obj/item/stack/sheet/mineral/uranium/twenty, /turf/open/floor/plating, /area/ship/engineering) "ky" = ( @@ -611,12 +577,7 @@ /turf/open/floor/plating, /area/ship/engineering) "mR" = ( -/obj/structure/table, /obj/machinery/airalarm/directional/west, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 8 - }, -/obj/item/storage/toolbox/electrical, /obj/machinery/light/directional/west, /obj/effect/turf_decal/industrial/warning/corner{ dir = 8 @@ -629,9 +590,6 @@ /area/ship/engineering) "mT" = ( /obj/structure/table/wood, -/obj/item/clothing/glasses/hud/spacecop/hidden{ - pixel_y = 16 - }, /turf/open/floor/carpet/red_gold, /area/ship/crew) "mZ" = ( @@ -666,8 +624,8 @@ icon_state = "0-2"; pixel_y = 1 }, -/obj/machinery/space_heater, /obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plating, /area/ship/engineering) "oB" = ( @@ -720,12 +678,14 @@ pixel_x = 30 }, /obj/item/clothing/glasses/welding, -/obj/item/clothing/glasses/welding, -/obj/item/clothing/gloves/color/yellow, -/obj/item/clothing/gloves/color/yellow, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, /obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/gloves/combat, +/obj/item/storage/belt/utility/syndicate, +/obj/item/clothing/suit/space/engineer, +/obj/item/clothing/head/helmet/space/light/engineer, +/obj/item/tank/internals/generic{ + icon_state = "oxygen_f" + }, /turf/open/floor/plating, /area/ship/engineering) "qB" = ( @@ -909,15 +869,21 @@ /area/ship/engineering) "tR" = ( /obj/structure/table/glass, -/obj/item/paper_bin, -/obj/item/pen/fountain, +/obj/item/paper_bin{ + pixel_y = 3; + pixel_x = 8 + }, +/obj/item/pen/fountain{ + pixel_y = 3; + pixel_x = 7 + }, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/vending/boozeomat/all_access{ - pixel_x = 32; - density = 0 +/obj/item/clipboard{ + pixel_x = -7; + pixel_y = 3 }, /turf/open/floor/plasteel/dark, /area/ship/crew/office) @@ -1001,11 +967,6 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew) "vT" = ( -/obj/machinery/mineral/ore_redemption{ - dir = 8; - input_dir = 8; - output_dir = null - }, /obj/effect/turf_decal/box, /obj/effect/turf_decal/industrial/warning/corner{ dir = 1 @@ -1027,6 +988,7 @@ pixel_y = 23; pixel_x = 6 }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "wk" = ( @@ -1075,19 +1037,6 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/cargo) "xA" = ( -/obj/structure/closet/crate/wooden{ - name = "survival kit" - }, -/obj/item/survivalcapsule, -/obj/item/survivalcapsule, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/item/kitchen/knife/combat/survival, -/obj/item/kitchen/knife/combat/survival, -/obj/item/kitchen/knife/combat/survival, -/obj/item/kitchen/knife/combat/survival, /obj/effect/turf_decal/box, /obj/machinery/light/directional/west, /obj/machinery/camera/autoname{ @@ -1097,25 +1046,25 @@ pixel_x = -28; pixel_y = 1 }, +/obj/structure/closet/crate/wooden, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "xF" = ( -/obj/structure/closet/crate{ - name = "recreation package" - }, -/obj/item/circuitboard/machine/microwave, /obj/effect/turf_decal/box, /obj/effect/turf_decal/industrial/warning/corner{ dir = 4 }, -/obj/structure/cable{ - icon_state = "0-4" +/obj/structure/table/wood, +/obj/machinery/microwave{ + pixel_y = 4; + pixel_x = -1 }, -/obj/effect/spawner/lootdrop/donkpockets, -/obj/effect/spawner/lootdrop/donkpockets, -/obj/item/stack/sheet/mineral/wood/twentyfive, -/obj/machinery/airalarm/directional/west, -/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "xT" = ( @@ -1157,7 +1106,6 @@ /turf/open/floor/plating, /area/ship/engineering) "yI" = ( -/obj/structure/window/reinforced/spawner, /obj/effect/turf_decal/box, /obj/machinery/autolathe/hacked, /obj/structure/railing{ @@ -1215,9 +1163,6 @@ /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -1255,17 +1200,8 @@ /turf/open/floor/plasteel/freezer, /area/ship/crew/toilet) "BD" = ( -/obj/structure/table/reinforced, -/obj/item/clipboard{ - pixel_x = -7; - pixel_y = 3 - }, -/obj/item/clothing/glasses/night{ - pixel_x = -3; - pixel_y = 9 - }, -/obj/item/binoculars{ - pixel_x = 9 +/obj/machinery/computer/secure_data/syndie{ + dir = 1 }, /turf/open/floor/plasteel/dark, /area/ship/bridge) @@ -1290,7 +1226,12 @@ /area/ship/crew) "BY" = ( /obj/effect/turf_decal/box, -/obj/structure/crate_shelf, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 30 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Ce" = ( @@ -1376,23 +1317,25 @@ /obj/structure/safe/floor{ number_of_tumblers = 3 }, -/obj/item/implanter/stealth, -/obj/item/implanter/stealth, -/obj/item/modular_computer/laptop/preset/civilian, -/obj/item/clothing/mask/chameleon, /obj/item/kitchen/knife/combat, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/reagent_containers/pill/cyanide, /obj/item/paper/crumpled{ - default_raw_text = "Hand this stuff out to the field agents. They'll have a blast." + default_raw_text = "Кажется, эти шприцы не то, чем кажутся.. Надо быть с ними поосторожнее.." + }, +/obj/item/implanter/explosive{ + name = "implanter (The last resort)"; + icon_state = "implanter1" + }, +/obj/item/implanter/explosive{ + name = "implanter (The last resort)"; + icon_state = "implanter1" + }, +/obj/item/kitchen/knife/combat, +/obj/item/clothing/glasses/thermal/syndi, +/obj/item/clothing/glasses/thermal/syndi, +/obj/item/card/emag/limited, +/obj/item/toy/plush/goatplushie/angry{ + name = "goat plushie" }, -/obj/item/clothing/mask/chameleon, -/obj/item/card/id/syndicate/anyone, -/obj/item/card/id/syndicate/anyone, /turf/open/floor/plating, /area/ship/crew/office) "DN" = ( @@ -1486,10 +1429,10 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/port_gen/pacman, /obj/structure/sign/poster/contraband/energy_swords{ pixel_x = 31 }, +/obj/machinery/power/port_gen/pacman/super, /turf/open/floor/plating, /area/ship/engineering) "GR" = ( @@ -1514,8 +1457,6 @@ /obj/item/radio, /obj/item/radio, /obj/item/radio, -/obj/item/radio, -/obj/item/radio, /obj/item/clothing/shoes/combat, /obj/item/clothing/shoes/combat, /obj/item/clothing/shoes/combat, @@ -1528,8 +1469,6 @@ /obj/item/clothing/under/syndicate/skirt, /obj/item/clothing/under/syndicate/skirt, /obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate/skirt/maid, -/obj/item/clothing/under/syndicate, /obj/machinery/computer/cryopod/directional/east, /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 10 @@ -1537,6 +1476,7 @@ /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 6 }, +/obj/item/clothing/shoes/combat, /turf/open/floor/plasteel/white, /area/ship/crew/dorm) "HZ" = ( @@ -1568,16 +1508,28 @@ /area/ship/engineering) "IN" = ( /obj/structure/window/reinforced/spawner, -/obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/box, /obj/structure/railing{ dir = 8 }, +/obj/structure/rack, +/obj/item/airlock_painter{ + pixel_y = 5; + pixel_x = 5 + }, +/obj/item/decal_painter, +/obj/item/floor_painter{ + pixel_y = -5; + pixel_x = -5 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "JA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/cargo) "JN" = ( @@ -1629,11 +1581,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/closed/wall/mineral/plastitanium, /area/ship/engineering) -"Ls" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/spline/plain/opaque/syndiered, -/turf/open/floor/plasteel/dark, -/area/ship/crew) "Lt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1697,16 +1644,18 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/cargo) "MY" = ( -/obj/structure/fluff/hedge/opaque, -/obj/effect/turf_decal/trimline/opaque/bar/filled/corner, /obj/machinery/airalarm/directional/north, /obj/structure/sign/poster/contraband/red_rum{ pixel_y = 32 }, /obj/machinery/firealarm/directional/west, +/obj/machinery/vending/boozeomat/syndicate_access, /turf/open/floor/plasteel/dark, /area/ship/crew) "Nd" = ( @@ -1714,6 +1663,9 @@ dir = 8 }, /obj/effect/turf_decal/box, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Nv" = ( @@ -1795,29 +1747,29 @@ }, /turf/open/floor/plating, /area/ship/bridge) +"Pz" = ( +/obj/structure/table/wood, +/obj/machinery/jukebox/boombox, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) "Qu" = ( -/obj/structure/rack, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, /obj/effect/turf_decal/box, /obj/machinery/firealarm/directional/west, -/obj/item/reagent_containers/food/snacks/canned/peaches, -/obj/item/reagent_containers/food/snacks/canned/peaches, -/obj/item/reagent_containers/food/snacks/canned/peaches, -/obj/item/reagent_containers/food/snacks/canned/peaches, /obj/structure/extinguisher_cabinet/directional/west{ pixel_y = 11; pixel_x = -26 }, +/obj/item/kitchen/knife/combat/survival, +/obj/structure/closet/crate/wooden{ + name = "survival kit" + }, +/obj/item/kitchen/knife/combat/survival, +/obj/item/kitchen/knife/combat/survival, +/obj/item/kitchen/knife/combat/survival, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Qv" = ( @@ -1854,10 +1806,10 @@ /area/ship/bridge) "Rj" = ( /obj/machinery/atmospherics/components/unary/portables_connector, -/obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/industrial/warning/corner{ dir = 8 }, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/plating, /area/ship/engineering) "RC" = ( @@ -1935,15 +1887,11 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/central) "Up" = ( -/obj/item/kirbyplants/random{ - pixel_y = 10 - }, /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/end, -/turf/open/floor/plasteel/dark, +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/plasteel/white, /area/ship/hallway/central) "Ur" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -1957,7 +1905,10 @@ "UQ" = ( /obj/effect/turf_decal/box, /obj/machinery/light/directional/east, -/obj/structure/crate_shelf, +/obj/machinery/mineral/ore_redemption{ + input_dir = 8; + output_dir = null + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Vw" = ( @@ -2061,6 +2012,12 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/binoculars, +/obj/item/camera_bug, +/obj/item/melee/classic_baton/telescopic, +/obj/item/melee/classic_baton/telescopic, +/obj/item/melee/classic_baton, +/obj/item/melee/classic_baton, /turf/open/floor/plasteel/stairs{ dir = 4 }, @@ -2431,7 +2388,7 @@ wQ fo zJ qN -ae +Pz mT BU rQ @@ -2446,7 +2403,7 @@ wQ wQ wQ Qw -Ls +zJ UK Om Ge