From e7b670f77b61ffafd1969dfbc766674a378b40fc Mon Sep 17 00:00:00 2001 From: Molnia <161384279+molnizz@users.noreply.github.com> Date: Wed, 24 Apr 2024 02:21:53 +0500 Subject: [PATCH 1/3] CentCom fix --- .../_mod_celadon/map_files/generic/blank.dmm | 78 +++++-------------- 1 file changed, 20 insertions(+), 58 deletions(-) diff --git a/_maps/_mod_celadon/map_files/generic/blank.dmm b/_maps/_mod_celadon/map_files/generic/blank.dmm index 76914a56c149..f9cdb54fceb8 100644 --- a/_maps/_mod_celadon/map_files/generic/blank.dmm +++ b/_maps/_mod_celadon/map_files/generic/blank.dmm @@ -534,15 +534,6 @@ /obj/item/staff/broom, /turf/open/floor/engine/cult, /area/wizard_station) -"bR" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/directions/engineering{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - icon_state = "doors"; - name = "WARNING: BLAST DOORS" - }, -/turf/open/floor/plating, -/area/centcom/control) "bS" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/lavendergrass, @@ -2682,15 +2673,6 @@ /obj/item/seeds/cherry/bomb, /turf/open/floor/wood, /area/centcom/holding) -"ja" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/directions/engineering{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - icon_state = "doors"; - name = "WARNING: BLAST DOORS" - }, -/turf/open/floor/plating, -/area/centcom/evac) "jc" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/corner/opaque/green{ @@ -7427,7 +7409,6 @@ /turf/open/floor/plasteel, /area/centcom/ferry) "Ak" = ( -/obj/item/gun/energy/pulse/carbine/loyalpin, /obj/item/flashlight/seclite, /obj/structure/table/reinforced, /obj/machinery/airalarm/directional/south, @@ -8082,7 +8063,9 @@ /area/centcom/ferry) "CB" = ( /obj/structure/table/reinforced, -/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite{ + pixel_x = 1 + }, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -13767,15 +13750,6 @@ /obj/machinery/fax/admin/roumain, /turf/open/floor/wood/mahogany, /area/centcom) -"Wn" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/directions/engineering{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - icon_state = "doors"; - name = "WARNING: BLAST DOORS" - }, -/turf/open/floor/plating, -/area/centcom/ferry) "Wo" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /obj/item/reagent_containers/food/snacks/grown/banana, @@ -14129,9 +14103,6 @@ /area/wizard_station) "Xn" = ( /obj/structure/closet/secure_closet/ertEngi, -/obj/structure/sign/directions/engineering{ - pixel_y = 25 - }, /obj/effect/turf_decal/industrial/warning, /turf/open/floor/plasteel, /area/centcom/ferry) @@ -14904,15 +14875,6 @@ }, /turf/open/floor/plasteel/dark, /area/tdome/tdomeobserve) -"ZV" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/directions/engineering{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - icon_state = "doors"; - name = "WARNING: EXTERNAL AIRLOCK" - }, -/turf/open/floor/plating, -/area/centcom/ferry) "ZX" = ( /obj/machinery/abductor/console{ team_number = 1 @@ -18763,7 +18725,7 @@ Wd ce mc Kx -ZV +YW YW KW YW @@ -19410,7 +19372,7 @@ Kx Kx Kx ox -Wn +YW ox Kx Kx @@ -19668,7 +19630,7 @@ io cw Kx ti -Wn +YW ti Kx KO @@ -21861,7 +21823,7 @@ Kx Kx Kx ox -Wn +YW ox Kx lm @@ -22119,7 +22081,7 @@ Es me hi oq -bR +Es oq hi me @@ -22875,7 +22837,7 @@ gd gd me JG -bR +Es DX lK lK @@ -22887,7 +22849,7 @@ lK Pw Es Lo -bR +Es Iq lK Es @@ -22901,7 +22863,7 @@ lK mE Es vA -bR +Es Tj lK lK @@ -23143,7 +23105,7 @@ lK lK lK Pw -bR +Es Lo Es kF @@ -23157,7 +23119,7 @@ Dc hi lK Bo -bR +Es vA Es sl @@ -23525,7 +23487,7 @@ Es me Es Bv -bR +Es Bv Es me @@ -23783,7 +23745,7 @@ tR hi Es oq -bR +Es oq Es me @@ -23925,7 +23887,7 @@ Vi me hi Bv -bR +Es Bv hi me @@ -24183,7 +24145,7 @@ ju me hi oq -bR +Es oq hi me @@ -25073,7 +25035,7 @@ tR hi Es Qe -bR +Es Qe Es me @@ -25215,7 +25177,7 @@ hq me hi Bv -bR +Es Bv hi me @@ -25473,7 +25435,7 @@ hq hq JD Yr -ja +MB Yr JD hq From c215b107e2ba7723ec99dd4f52f2a9eb4c5caa68 Mon Sep 17 00:00:00 2001 From: Molnia <161384279+molnizz@users.noreply.github.com> Date: Wed, 24 Apr 2024 18:16:33 +0500 Subject: [PATCH 2/3] Fix ships after merge --- .../independent/independent_halftrack.dmm | 26 +++++++++++---- .../shuttles/independent/independent_nemo.dmm | 5 +-- .../shuttles/nanotrasen/nanotrasen_heron.dmm | 13 ++------ .../shuttles/nanotrasen/nanotrasen_mimir.dmm | 1 - .../shuttles/nanotrasen/nanotrasen_ranger.dmm | 2 +- .../shuttles/pirate/pirate_ember.dmm | 4 --- .../shuttles/pirate/pirate_noderider.dmm | 2 +- .../shuttles/solgov/solgov_cepheus.dmm | 7 ++-- .../syndicate/syndicate_cybersun_remora.dmm | 33 +++++++++++++++++-- .../shuttles/syndicate/syndicate_eligia.dmm | 4 +-- .../syndicate/syndicate_gorlex_komodo.dmm | 5 +-- .../shuttles/syndicate/syndicate_kaas.dmm | 6 ++-- .../syndicate/syndicate_kau_delta.dmm | 7 ++-- .../syndicate/syndicate_luxembourg.dmm | 2 +- 14 files changed, 71 insertions(+), 46 deletions(-) diff --git a/_maps/_mod_celadon/shuttles/independent/independent_halftrack.dmm b/_maps/_mod_celadon/shuttles/independent/independent_halftrack.dmm index ecafe4025afd..3f946c8dfc43 100644 --- a/_maps/_mod_celadon/shuttles/independent/independent_halftrack.dmm +++ b/_maps/_mod_celadon/shuttles/independent/independent_halftrack.dmm @@ -218,8 +218,6 @@ /area/ship/maintenance/port) "fT" = ( /obj/structure/closet/secure_closet/security, -/obj/item/gun/ballistic/shotgun/bulldog/unrestricted, -/obj/item/gun/ballistic/shotgun/bulldog/unrestricted, /obj/item/gun/ballistic/automatic/hmg/l6_saw, /obj/item/gun/ballistic/automatic/hmg/l6_saw, /obj/item/ammo_box/magazine/m12g/slug, @@ -1195,6 +1193,19 @@ }, /turf/open/floor/plating, /area/ship/maintenance/starboard) +"Fj" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{ + dir = 4; + name = "warningr" + }, +/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{ + dir = 8; + name = "warningr" + }, +/obj/item/gun/ballistic/automatic/smg/c20r/toy, +/turf/open/floor/plasteel/tech, +/area/ship/security/range) "Fx" = ( /obj/structure/sign/poster/contraband/c20r, /turf/closed/wall/r_wall, @@ -1282,6 +1293,10 @@ dir = 8; name = "warningr" }, +/obj/item/gun/ballistic/automatic/smg/c20r/toy, +/obj/item/gun/ballistic/automatic/hmg/l6_saw/toy{ + pixel_y = 11 + }, /turf/open/floor/plasteel/tech, /area/ship/security/range) "Hl" = ( @@ -1600,18 +1615,14 @@ pixel_x = 28; name = "foam gun cabinet" }, -/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted, -/obj/item/gun/ballistic/automatic/hmg/l6_saw/toy/unrestricted, /obj/item/ammo_box/magazine/toy/m762, /obj/item/ammo_box/magazine/toy/m762, /obj/item/ammo_box/magazine/toy/m762, -/obj/item/gun/ballistic/automatic/smg/c20r/toy/unrestricted, /obj/item/ammo_box/magazine/toy/smg, /obj/item/ammo_box/magazine/toy/smg, /obj/item/ammo_box/magazine/toy/smg, /obj/item/ammo_box/foambox, /obj/item/ammo_box/foambox, -/obj/item/gun/ballistic/shotgun/toy/unrestricted, /turf/open/floor/plasteel/dark, /area/ship/security/range) "Ob" = ( @@ -1690,6 +1701,7 @@ dir = 8; name = "warningr" }, +/obj/item/gun/ballistic/automatic/smg/c20r/toy, /turf/open/floor/plasteel/tech, /area/ship/security/range) "PH" = ( @@ -2392,7 +2404,7 @@ UJ nu Qe oX -Hk +Fj Hk PG aT diff --git a/_maps/_mod_celadon/shuttles/independent/independent_nemo.dmm b/_maps/_mod_celadon/shuttles/independent/independent_nemo.dmm index a19b762e612a..0a25b246562f 100644 --- a/_maps/_mod_celadon/shuttles/independent/independent_nemo.dmm +++ b/_maps/_mod_celadon/shuttles/independent/independent_nemo.dmm @@ -551,7 +551,9 @@ /obj/machinery/light/directional/north, /obj/machinery/firealarm/directional/north, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/fishfingers, +/obj/item/reagent_containers/food/snacks/fishfingers{ + pixel_y = 1 + }, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -2191,7 +2193,6 @@ pixel_x = -32; req_access = list(30) }, -/obj/item/firing_pin, /obj/item/kitchen/knife/hunting, /obj/item/gun/ballistic/shotgun/doublebarrel/beacon, /obj/item/ammo_box/a4570, diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_heron.dmm index 28a59c22727b..746a3486b26f 100644 --- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_heron.dmm +++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_heron.dmm @@ -3374,15 +3374,6 @@ "mt" = ( /obj/structure/window/reinforced/spawner, /obj/structure/rack, -/obj/item/gun/ballistic/automatic/smg/proto/unrestricted{ - pixel_y = 3 - }, -/obj/item/gun/ballistic/automatic/smg/proto/unrestricted{ - pixel_y = -2 - }, -/obj/item/gun/ballistic/automatic/smg/proto/unrestricted{ - pixel_y = -7 - }, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "my" = ( @@ -6188,7 +6179,9 @@ pixel_x = -8; pixel_y = 6 }, -/obj/item/trash/candy, +/obj/item/trash/candy{ + pixel_x = 4 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "wF" = ( diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_mimir.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_mimir.dmm index ad4889732fad..f5ffea852281 100644 --- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_mimir.dmm +++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_mimir.dmm @@ -3232,7 +3232,6 @@ /obj/item/storage/box/handcuffs, /obj/item/storage/box/handcuffs, /obj/item/storage/box/prisoner, -/obj/item/storage/box/firingpins, /obj/item/storage/box/seccarts, /obj/item/storage/box/teargas, /obj/item/storage/box/zipties, diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm index b597d12f69e0..288fd6235cf8 100644 --- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm +++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm @@ -3115,7 +3115,7 @@ /area/ship/engineering) "Ha" = ( /obj/structure/closet/secure_closet/lp/lieutenant, -/obj/item/gun/energy/e_gun/mindshield{ +/obj/item/gun/energy/e_gun{ pixel_y = 1 }, /obj/item/stock_parts/cell/gun, diff --git a/_maps/_mod_celadon/shuttles/pirate/pirate_ember.dmm b/_maps/_mod_celadon/shuttles/pirate/pirate_ember.dmm index 93d276197563..6173f14db95b 100644 --- a/_maps/_mod_celadon/shuttles/pirate/pirate_ember.dmm +++ b/_maps/_mod_celadon/shuttles/pirate/pirate_ember.dmm @@ -4019,10 +4019,6 @@ pixel_y = 7; pixel_x = 4 }, -/obj/item/storage/box/firingpins{ - pixel_x = -6; - pixel_y = 4 - }, /obj/item/storage/box/syndie_kit/throwing_weapons, /obj/machinery/light/directional/south, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/_mod_celadon/shuttles/pirate/pirate_noderider.dmm b/_maps/_mod_celadon/shuttles/pirate/pirate_noderider.dmm index df346f703dd3..10c591d8f52f 100644 --- a/_maps/_mod_celadon/shuttles/pirate/pirate_noderider.dmm +++ b/_maps/_mod_celadon/shuttles/pirate/pirate_noderider.dmm @@ -1039,7 +1039,7 @@ /obj/item/gun/energy/laser/iot, /obj/item/gun/energy/laser/iot, /obj/item/gun/energy/e_gun/smg, -/obj/item/gun/energy/lasercannon/unrestricted, +/obj/item/gun/energy/lasercannon, /obj/item/melee/baton/loaded, /obj/item/melee/baton/loaded, /turf/open/floor/plasteel/tech, diff --git a/_maps/_mod_celadon/shuttles/solgov/solgov_cepheus.dmm b/_maps/_mod_celadon/shuttles/solgov/solgov_cepheus.dmm index b5c8fc854735..df43b201cb55 100644 --- a/_maps/_mod_celadon/shuttles/solgov/solgov_cepheus.dmm +++ b/_maps/_mod_celadon/shuttles/solgov/solgov_cepheus.dmm @@ -1211,10 +1211,6 @@ pixel_x = 8; pixel_y = -22 }, -/obj/item/firing_pin{ - pixel_x = 3; - pixel_y = -7 - }, /obj/structure/table/wood, /obj/effect/turf_decal/techfloor, /turf/open/floor/plasteel/white, @@ -2473,7 +2469,8 @@ pixel_y = 12 }, /obj/item/pen/fountain/solgov{ - pixel_x = -5 + pixel_x = -5; + pixel_y = 1 }, /obj/machinery/recharger{ pixel_x = 7 diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm index ad86d6584d25..1bf663500260 100644 --- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm +++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm @@ -2690,14 +2690,14 @@ open = 0; anchored = 1 }, -/obj/item/gun/ballistic/shotgun/bulldog/unrestricted, -/obj/item/gun/ballistic/automatic/smg/m90/unrestricted, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/automatic/pistol, /obj/machinery/door/window{ icon_state = "left"; dir = 8 }, +/obj/item/gun/ballistic/automatic/smg/m90, +/obj/item/gun/ballistic/shotgun/bulldog, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "fk" = ( @@ -2759,6 +2759,7 @@ pixel_x = -5; pixel_y = -1 }, +/obj/item/gun/ballistic/automatic/smg/m90, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "fo" = ( @@ -4498,6 +4499,32 @@ }, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) +"Vy" = ( +/obj/structure/closet/secure_closet{ + icon_state = "med_secure"; + name = "doctor locker" + }, +/obj/item/clothing/under/syndicate/cybersun, +/obj/item/clothing/head/soft/red, +/obj/item/storage/belt/medical/webbing, +/obj/item/holosign_creator/medical/infinite, +/obj/item/organ/cyberimp/eyes/hud/medical, +/obj/item/storage/bag/medical, +/obj/item/cartridge/medical, +/obj/item/clothing/suit/longcoat, +/obj/item/clothing/suit/toggle/labcoat, +/obj/item/clothing/suit/toggle/lawyer/medical, +/obj/item/clothing/under/plasmaman/medical, +/obj/item/clothing/head/helmet/space/plasmaman/medical, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/neck/stethoscope, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/organ/cyberimp/eyes/hud/medical, +/obj/item/implanter/explosive, +/obj/item/gun/ballistic/automatic/smg/m90, +/turf/open/floor/plasteel/mono/white, +/area/ship/hallway/central) "WF" = ( /obj/effect/turf_decal/corner/transparent/syndiered/border{ icon_state = "bordercolor"; @@ -4919,7 +4946,7 @@ dO eg ac eZ -fl +Vy fl gb ac diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_eligia.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_eligia.dmm index fa6c71e57c5a..d590cd822b2f 100644 --- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_eligia.dmm +++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_eligia.dmm @@ -2170,9 +2170,9 @@ /obj/machinery/airalarm/directional/west, /obj/machinery/light/directional/north, /obj/effect/turf_decal/industrial/traffic/full, -/obj/item/gun/ballistic/automatic/smg/m90/unrestricted, -/obj/item/gun/ballistic/shotgun/bulldog/unrestricted, /obj/item/gun/energy/ionrifle, +/obj/item/gun/ballistic/shotgun/bulldog, +/obj/item/gun/ballistic/automatic/smg/m90, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Kw" = ( diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm index f38f8b78b433..eae2089a3261 100644 --- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -2171,6 +2171,9 @@ pixel_y = 2; pixel_x = 6 }, +/obj/item/gun/ballistic/automatic/smg/c20r{ + pixel_x = 14 + }, /turf/open/floor/pod/dark, /area/ship/security/armory) "uh" = ( @@ -2701,9 +2704,7 @@ }, /obj/structure/guncase, /obj/structure/railing, -/obj/item/gun/ballistic/automatic/smg/c20r/unrestricted, /obj/machinery/light/directional/east, -/obj/item/gun/ballistic/automatic/smg/c20r/unrestricted, /obj/item/gun/ballistic/shotgun/bulldog, /obj/item/gun/ballistic/automatic/pistol, /turf/open/floor/pod/dark, diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kaas.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kaas.dmm index 2debe727bb76..15a789dcb0b6 100644 --- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kaas.dmm +++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kaas.dmm @@ -24,7 +24,9 @@ /area/ship/medical) "aB" = ( /obj/structure/table/wood/fancy/royalblack, -/obj/item/folder/documents/syndicate/red, +/obj/item/folder/documents/syndicate/red{ + pixel_y = 1 + }, /turf/open/floor/carpet/red_gold, /area/ship/bridge) "aP" = ( @@ -1270,8 +1272,6 @@ /obj/item/ammo_box/magazine/pistolm9mm, /obj/item/ammo_box/magazine/pistolm9mm, /obj/item/card/emag/limited, -/obj/item/storage/box/firingpins/syndicate, -/obj/item/storage/box/firingpins/syndicate, /turf/open/floor/carpet/royalblack, /area/ship/bridge) "BP" = ( diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm index 6ca24aedbc20..0a170b0861f7 100644 --- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm +++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm @@ -1145,7 +1145,6 @@ }, /obj/item/storage/backpack/duffelbag/syndie/c4, /obj/item/storage/box/syndie_kit/signaler, -/obj/item/storage/box/firingpins, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "xN" = ( @@ -2161,12 +2160,12 @@ /obj/item/gun/ballistic/automatic/smg/c20r/sc_c20r{ pixel_y = -5 }, -/obj/item/gun/ballistic/shotgun/bulldog/unrestricted{ - pixel_y = -12 - }, /obj/item/gun/energy/ionrifle/carbine{ pixel_y = 8 }, +/obj/item/gun/ballistic/shotgun/bulldog{ + pixel_y = -10 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Qb" = ( diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_luxembourg.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_luxembourg.dmm index c8c459456cee..e4d103a8083e 100644 --- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_luxembourg.dmm +++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_luxembourg.dmm @@ -750,6 +750,7 @@ /obj/structure/table, /obj/machinery/door/firedoor, /obj/item/radio/intercom/directional/north, +/obj/item/gun/ballistic/automatic/smg/c20r/toy, /turf/open/floor/plasteel/mono/dark, /area/ship/crew/canteen) "qh" = ( @@ -817,7 +818,6 @@ /obj/structure/closet/crate/wooden/toy, /obj/item/ammo_box/magazine/toy/smgm45/riot, /obj/item/ammo_box/magazine/toy/smgm45/riot, -/obj/item/gun/ballistic/automatic/smg/c20r/toy/unrestricted/riot, /obj/item/soap/syndie, /obj/item/soap/syndie, /obj/item/soap/syndie, From f27f2ec68d33920a6df24d820944ade45952118c Mon Sep 17 00:00:00 2001 From: Overteh <153842573+Overteh@users.noreply.github.com> Date: Wed, 24 Apr 2024 22:42:16 +0800 Subject: [PATCH 3/3] Mini Bullfinch fix (#450) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Реворк radio_funny --- .../independent_radio_broadcast.dmm | 114 +++++++++++------- 1 file changed, 72 insertions(+), 42 deletions(-) diff --git a/_maps/_mod_celadon/shuttles/independent/independent_radio_broadcast.dmm b/_maps/_mod_celadon/shuttles/independent/independent_radio_broadcast.dmm index ce12cb6755bd..da4d86008fd3 100644 --- a/_maps/_mod_celadon/shuttles/independent/independent_radio_broadcast.dmm +++ b/_maps/_mod_celadon/shuttles/independent/independent_radio_broadcast.dmm @@ -36,6 +36,7 @@ /obj/item/clothing/under/syndicate, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/item/clothing/head/beret/captain, +/obj/item/areaeditor/shuttle, /turf/open/floor/carpet/nanoweave/blue, /area/ship/bridge) "cs" = ( @@ -90,6 +91,38 @@ /obj/structure/window/bronze{ dir = 8 }, +/obj/structure/closet/crate/engineering{ + name = "relay crate" + }, +/obj/item/circuitboard/machine/telecomms/relay, +/obj/item/circuitboard/machine/telecomms/relay, +/obj/item/circuitboard/machine/telecomms/relay, +/obj/item/circuitboard/machine/telecomms/relay, +/obj/item/circuitboard/machine/telecomms/relay, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/storage/part_replacer, +/obj/item/stack/sheet/metal/five, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/cable_coil/random, /turf/open/floor/plasteel/telecomms_floor, /area/ship/maintenance/central) "hX" = ( @@ -128,26 +161,26 @@ /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/rice, /obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/food/condiment/mayonnaise, +/obj/item/reagent_containers/food/condiment/ketchup, +/obj/item/storage/box/ingredients/vegetarian, +/obj/item/storage/box/ingredients/wildcard, /turf/open/floor/carpet/nanoweave/beige, /area/ship/maintenance/central) "iE" = ( -/obj/machinery/computer/communications{ - icon_state = "computer-right"; - dir = 8; - pixel_x = 7 - }, /obj/machinery/light/small/directional/south{ pixel_x = -15 }, /obj/machinery/airalarm/directional/south, +/obj/machinery/computer/secure_data{ + icon_state = "computer-right"; + dir = 8; + pixel_x = 7 + }, /turf/open/floor/carpet/nanoweave/blue, /area/ship/bridge) "iM" = ( /obj/machinery/power/apc/auto_name/directional/west, -/obj/machinery/power/terminal{ - icon_state = "term"; - dir = 8 - }, /obj/structure/cable{ icon_state = "0-4" }, @@ -164,12 +197,17 @@ /obj/item/clothing/head/helmet/space/eva, /obj/item/clothing/suit/space/eva, /obj/item/clothing/suit/space/eva, -/obj/item/tank/internals/oxygen/red, -/obj/item/tank/internals/oxygen/red, /obj/structure/closet/emcloset/wall/directional/west{ pixel_x = -34; name = "Emergency space suits" }, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /turf/open/floor/plasteel, /area/ship/maintenance/central) "jA" = ( @@ -186,8 +224,8 @@ /obj/machinery/power/port_gen/pacman{ anchored = 1 }, -/obj/item/stack/sheet/mineral/plasma/fifty, /obj/effect/decal/cleanable/plasma, +/obj/item/stack/sheet/mineral/plasma/twenty, /turf/open/floor/plasteel, /area/ship/maintenance/central) "jC" = ( @@ -232,12 +270,13 @@ default_raw_text = "Б/У машинерия, возможно нужна повторная настройка" }, /obj/item/multitool{ - pixel_x = -10 + pixel_x = -10; + name = "telecomms debug tool" }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/maintenance/central) "ml" = ( -/obj/machinery/telecomms/relay{ +/obj/machinery/telecomms/hub{ network = "all_broadcast" }, /turf/open/floor/plasteel/telecomms_floor, @@ -309,10 +348,6 @@ }, /turf/open/floor/carpet/nanoweave/beige, /area/ship/maintenance/central) -"on" = ( -/obj/effect/decal/cleanable/food/egg_smudge, -/turf/open/floor/carpet/nanoweave, -/area/ship/maintenance/central) "pa" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/cryo) @@ -336,11 +371,8 @@ dir = 8 }, /obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/power/terminal{ - dir = 1 - }, /obj/machinery/light_switch{ - pixel_y = 22; + pixel_y = 23; pixel_x = 11 }, /obj/structure/window/reinforced/tinted/frosted{ @@ -414,10 +446,9 @@ /area/ship/maintenance/central) "vM" = ( /obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/power/terminal, /obj/structure/cable, /obj/machinery/light_switch{ - pixel_y = -15; + pixel_y = -16; pixel_x = -12; dir = 1 }, @@ -431,6 +462,8 @@ /obj/structure/closet/wall/directional/south{ pixel_y = -32 }, +/obj/item/clothing/suit/det_suit, +/obj/item/clothing/head/fedora/det_hat, /turf/open/floor/carpet/nanoweave/orange, /area/ship/crew/office) "xF" = ( @@ -447,12 +480,12 @@ /turf/open/floor/plating, /area/ship/maintenance/central) "yT" = ( -/obj/machinery/telecomms/hub{ - network = "all_broadcast" - }, /obj/machinery/light/directional/east{ pixel_y = -3 }, +/obj/machinery/computer/telecomms/server{ + dir = 1 + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/maintenance/central) "zh" = ( @@ -490,11 +523,11 @@ /obj/structure/bed, /obj/item/bedsheet/dorms, /obj/structure/curtain/cloth/grey, -/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium{ - pixel_x = -7; - pixel_y = -6 - }, /obj/machinery/light/small/directional/north, +/obj/item/reagent_containers/food/drinks/bottle/rum{ + pixel_y = -5; + pixel_x = -3 + }, /turf/open/floor/carpet/nanoweave, /area/ship/crew/cryo) "Cd" = ( @@ -520,7 +553,6 @@ /obj/item/flashlight/seclite, /obj/item/flashlight/seclite, /obj/item/tank/internals/emergency_oxygen/double, -/obj/item/clothing/under/syndicate/camo, /obj/item/clothing/under/suit/beige, /obj/item/clothing/under/suit/black, /obj/item/clothing/under/color/black, @@ -612,16 +644,13 @@ pixel_x = -15 }, /obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/power/terminal{ - dir = 1 - }, /obj/structure/cable{ d2 = 2; icon_state = "0-2"; pixel_y = 1 }, /obj/machinery/light_switch{ - pixel_y = 22; + pixel_y = 23; pixel_x = 11 }, /turf/open/floor/carpet/nanoweave/blue, @@ -738,7 +767,6 @@ }, /obj/item/clothing/gloves/color/yellow, /obj/item/clothing/glasses/welding, -/obj/item/storage/belt/utility/full, /obj/item/stack/sheet/glass/twenty, /obj/item/pickaxe/mini, /obj/item/clothing/glasses/meson/engine, @@ -758,13 +786,15 @@ /obj/item/clothing/head/beret/atmos, /obj/item/circuitboard/machine/vendor, /obj/item/circuitboard/machine/vendor, +/obj/item/clothing/suit/space/engineer, +/obj/item/clothing/head/helmet/space/light/engineer, +/obj/item/reagent_containers/glass/bottle/welding_fuel, +/obj/item/reagent_containers/glass/bottle/welding_fuel, +/obj/item/storage/belt/utility/full/engi, /turf/open/floor/carpet/nanoweave, /area/ship/maintenance/central) "Vb" = ( -/obj/effect/decal/cleanable/ash{ - pixel_x = 9; - pixel_y = 5 - }, +/obj/structure/table/bronze, /turf/open/floor/carpet/nanoweave/beige, /area/ship/maintenance/central) "VV" = ( @@ -898,7 +928,7 @@ VV (5,1,1) = {" VV ho -on +ho ho pf rM