From 954e22f32cf3583eb75ac9162a54886bbb80dba2 Mon Sep 17 00:00:00 2001 From: RalseiDreemuurr Date: Fri, 3 May 2024 22:49:28 +0300 Subject: [PATCH] =?UTF-8?q?Smol=20=D1=80=D0=B5=D0=BC=D0=B0=D0=BF=D0=BF?= =?UTF-8?q?=D0=B8=D0=BD=D0=B3=20=D0=9A=D0=B0=D0=BD=D1=82=D0=B0=D1=82=D1=81?= =?UTF-8?q?=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