From 19ca59ea37273c4faf6a9e08f29940a44de14d5f Mon Sep 17 00:00:00 2001 From: Asuraqami Date: Sun, 17 May 2026 03:03:02 +0700 Subject: [PATCH 1/3] Syndi Ship Desc and Roles update --- .../_mod_celadon/configs/syndicate_aegis.json | 8 +- .../configs/syndicate_cybersun_cirrus.json | 33 ++- .../configs/syndicate_cybersun_kansatsu.json | 10 +- .../configs/syndicate_elegia.json | 15 +- .../configs/syndicate_gorlex_beetle.json | 11 +- .../configs/syndicate_gorlex_hyena.json | 14 +- .../configs/syndicate_gorlex_komodo.json | 24 +- .../configs/syndicate_gorlex_sunset.json | 21 +- .../configs/syndicate_kau_delta.json | 14 +- .../_mod_celadon/configs/syndicate_krait.json | 14 +- .../configs/syndicate_litieguai.json | 8 +- .../_mod_celadon/configs/syndicate_lugol.json | 10 +- .../configs/syndicate_luxembourg.json | 6 +- .../configs/syndicate_panacea.json | 14 +- .../configs/syndicate_pangolier.json | 24 +- .../configs/syndicate_twinkleshine.json | 32 +-- mod_celadon/outfit/_outfit.dme | 1 - mod_celadon/outfit/code/syndicate/_card_id.dm | 73 ------ mod_celadon/outfit/code/syndicate/_outfit.dm | 99 +++----- .../outfit/code/syndicate/cybersun_outfit.dm | 38 ++- .../outfit/code/syndicate/donkco_outfit.dm | 6 +- .../outfit/code/syndicate/gec_outfit.dm | 22 +- .../outfit/code/syndicate/gorlex_outfit.dm | 89 ++----- .../outfit/code/syndicate/suns_outfit.dm | 97 ++------ .../outfit/code/syndicate/twinkle_outfit.dm | 219 ------------------ 25 files changed, 212 insertions(+), 690 deletions(-) delete mode 100644 mod_celadon/outfit/code/syndicate/twinkle_outfit.dm diff --git a/_maps/_mod_celadon/configs/syndicate_aegis.json b/_maps/_mod_celadon/configs/syndicate_aegis.json index edfa33b3deba..ebda3653b3ad 100644 --- a/_maps/_mod_celadon/configs/syndicate_aegis.json +++ b/_maps/_mod_celadon/configs/syndicate_aegis.json @@ -2,13 +2,13 @@ "$schema": "https://raw.githubusercontent.com/CeladonSS13/Shiptest/beta-dev/_maps/_mod_celadon/ship_config_schema.json", "map_name": "Aegis-class Long Term Care Ship", "map_short_name": "Aegis", - "description": "Почти в конце войны между Нанотрейзен и Синдикатом стало очевидно, что Синдикат не может собрать такую разбросанную рабочую силу, которую смогли Нанотрейзен с его группами наемников и одноразового персонала. Вместо этого Синдикат начал применять гораздо более консервативный подход к содержанию персонала, выдвинув инициативу по созданию множества медицинских судов, предназначенных для спасения и реабилитации пострадавших. В то время как «Li Tieguai» выполнял роль спасателя, класс «Aegis» должен был выполнять роль реабилитации. Обладая множеством функций «качества жизни» для длительных пациентов (обустроенный бар, гидропонная установка и т.д.), просторным медицинским отсеком и множеством удобных приспособлений, таких как кушетки и сады, Aegis идеально подходит для врачей, которые стремятся помогать, или пациентам. В ЩИТСПАВНЕ ПО ПРИЧИНЕ: ТРЕБУЕТСЯ РЕКОНСТРУКЦИЯ!", + "description": "Корабль является не более чем попыткой Синдиката воссоздать постоянно перемещающийся научный дивизион с целью проведения медицинских опытов, без риска быть осажденным в случае утечки информации. Однако проект не увенчался успехом, поскольку современные реалии делают это судно крайне легкой добычей из-за своих слишком больших габаритов, и на текущий момент GEC занимается созданием его второй модификации. ", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_aegis.dmm", "map_id": "syndicate_aegis", "enabled": false, "limit": 1, "sensor_range": 4, - "prefix": "SSV", + "prefix": "MSSV", "faction": "/datum/faction/syndicate", "tags": [ "Ботаника", @@ -27,12 +27,12 @@ "slots": 1 }, - "Lead Doctor": { + "Associate Professor of Medicine": { "outfit": "/datum/outfit/job/cel/syndicate/cmo/suns", "slots": 1 }, - "Ship Doctor":{ + "Medical Doctor":{ "outfit": "/datum/outfit/job/cel/syndicate/doctor/suns", "slots": 2 }, diff --git a/_maps/_mod_celadon/configs/syndicate_cybersun_cirrus.json b/_maps/_mod_celadon/configs/syndicate_cybersun_cirrus.json index ee4060c4af1b..44cf4fd6133d 100644 --- a/_maps/_mod_celadon/configs/syndicate_cybersun_cirrus.json +++ b/_maps/_mod_celadon/configs/syndicate_cybersun_cirrus.json @@ -1,8 +1,8 @@ { "$schema": "https://raw.githubusercontent.com/CeladonSS13/Shiptest/beta-dev/_maps/_mod_celadon/ship_config_schema.json", - "map_name": "Cirrus-class Medical Carrack", + "map_name": "Cirrus-class Medical Corvette", "map_short_name": "Cirrus", - "description": "Cirrus-class — это проект Cybersun, созданный для предоставления услуг Trauma Team в дали от основных объектов Cybersun. Он полностью оборудован для автономной работы судна, а также имеет пристыкованный к нему шаттл класса Gauze, для высадки Trauma Team к пострадавшим.", + "description": "«Cirrus» - новый корабль Cybersun специально созданный для поддержки специальных операций. Данный корабль способен нести на себе транспортировочный шаттл для выполнения разного рода задач, например как сбор данных, высадка десанта или эвакуация с поля боя. Он полностью оборудован для автономной работы, и всеми необходимыми системами жизнеобеспечения для оказания медицинской помощи.", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_cirrus.dmm", "subshuttle": "ambulance", "starting_funds": 1000, @@ -18,35 +18,30 @@ "NATURAL_AGGRESSIVE" ], "job_slots": { - "Captain": { - "outfit": "/datum/outfit/job/syndicate/captain/cybersun", + "Commander": { + "outfit": "/datum/outfit/job/cel/syndicate/captain/cybersun", "officer": true, "slots": 1 }, "Medical Director": { - "outfit": "/datum/outfit/job/syndicate/cmo", + "outfit": "/datum/outfit/job/cel/syndicate/cmo/cybersun", "officer": true, "slots": 1 }, - "Cybersun Ambassador": { - "outfit": "/datum/outfit/job/syndicate/head_of_personnel/cybersun", - "officer": true, - "slots": 1 - }, - "Cybersun Technician": { - "outfit": "/datum/outfit/job/syndicate/engineer/cybersun", + "Mechanic": { + "outfit": "/datum/outfit/job/cel/syndicate/engineer/cybersun", "slots": 1 }, - "Cybersun Medical Specialist": { - "outfit": "/datum/outfit/job/syndicate/doctor/cybersun", + "Medical Doctor": { + "outfit": "/datum/outfit/job/cel/syndicate/doctor/cybersun", "slots": 2 }, - "Trauma Team Technician": { - "outfit": "/datum/outfit/job/syndicate/paramedic/cybersun", - "slots": 2 + "Paramedic": { + "outfit": "/datum/outfit/job/cel/syndicate/paramedic/cybersun", + "slots": 1 }, - "Ship's Aide": { - "outfit": "/datum/outfit/job/syndicate/assistant/cybersun", + "Ship's Mate": { + "outfit": "/datum/outfit/job/cel/syndicate/assistant/cybersun", "slots": 2 } } diff --git a/_maps/_mod_celadon/configs/syndicate_cybersun_kansatsu.json b/_maps/_mod_celadon/configs/syndicate_cybersun_kansatsu.json index c9f152ad2d7f..180a3d6db752 100644 --- a/_maps/_mod_celadon/configs/syndicate_cybersun_kansatsu.json +++ b/_maps/_mod_celadon/configs/syndicate_cybersun_kansatsu.json @@ -1,8 +1,8 @@ { "$schema": "https://raw.githubusercontent.com/CeladonSS13/Shiptest/beta-dev/_maps/_mod_celadon/ship_config_schema.json", - "map_name": "Kansatsu-class Scout Courier", + "map_name": "Kansatsu-class Scout Corvette", "map_short_name": "Kansatsu", - "description": "Судно класса «Kansatsu» представляет собой модернизированную компанией Cybersun старую модель Type-S SolFed Courier, переоборудованную для быстрой транспортировки груза и операций малого наблюдения в дальних секторах. Несмотря на то, что он довольно тесный, он превосходно справляется со своими задачами, обеспечивая быстрые исследования, разведку и шпионаж, вытекающие из его присутствия. Развертывание синдиката обычно включает в себя 3 человека, рекомендуемое максимальное количество - 5. Оно разбито на 1 капитана, офицера разведки для координации полевых агентов, инженера и 2 полевых агентов. Простота корпуса привела к тому, что корабль стал широко распространенным индикатором интереса Синдиката к локациям, а некоторые модели попали в руки частных покупателей.", + "description": "Судно класса «Kansatsu» представляет собой модернизированную компанией Cybersun старую модель Type-S SolFed Courier, переоборудованную для быстрой транспортировки груза и операций малого наблюдения в дальних секторах. Несмотря на то, что он довольно тесный, он превосходно справляется со своими задачами, обеспечивая быстрые исследования, разведку и шпионаж, вытекающие из его присутствия. Развертывание синдиката обычно включает в себя 3 человека, рекомендуемое максимальное количество - 5. Простота корпуса привела к тому, что корабль стал широко распространенным индикатором интереса Синдиката к локациям, а некоторые модели уходят с молотка на черном рынке.", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm", "map_id": "cybersun_kansatsu", "enabled": true, @@ -30,12 +30,12 @@ "officer": true, "slots": 1 }, - "Engineer": { + "Field Engineer": { "outfit": "/datum/outfit/job/cel/syndicate/engineer/cybersun", "slots": 1 }, - "Field Agent": { - "outfit": "/datum/outfit/job/cel/syndicate/miner/cybersun", + "Commando": { + "outfit": "/datum/outfit/job/cel/syndicate/security/gorlex", "slots": 2 } } diff --git a/_maps/_mod_celadon/configs/syndicate_elegia.json b/_maps/_mod_celadon/configs/syndicate_elegia.json index 01c8572f56e1..8c1ec0a15bf7 100644 --- a/_maps/_mod_celadon/configs/syndicate_elegia.json +++ b/_maps/_mod_celadon/configs/syndicate_elegia.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", - "map_name": "Elegia-class Explorer Schnau", + "map_name": "Elegia-class Research Frigate", "map_short_name": "Elegia", "description": "Исследовательский корвет под названием Элегия предназначен для исследовательских задач, ведь он может находиться длительное время на самообеспечении. Основной целью является исследование планет и фауны. Для этого он оснащен шахтёрским инвентарём, боевым оружием и средствами стабилизации полевых оперативников, а также специальным медицинским боргом Синдиката.", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_elegia.dmm", @@ -13,29 +13,28 @@ "namelists": [ "CYBERSUN"], "job_slots": { - "Cybersun research leader": { + "Research Lead": { "outfit": "/datum/outfit/job/cel/syndicate/captain/cybersun", "officer": true, "slots": 1 }, - "CyberSun paramedic": { + "Paramedic": { "outfit": "/datum/outfit/job/cel/syndicate/paramedic/cybersun", "slots": 1 }, - "Cybersun mechanic": { + "Mechanic": { "outfit": "/datum/outfit/job/cel/syndicate/engineer/cybersun", "slots": 1 - }, - "Cybersun scientist": { + "Scientist": { "outfit": "/datum/outfit/job/cel/syndicate/science/cybersun", "slots": 2 }, - "Cybersun miner": { + "Explorer": { "outfit": "/datum/outfit/job/cel/syndicate/miner/cybersun", "slots": 2 }, - "Cybersun assistant": { + "Ship's Mate": { "outfit": "/datum/outfit/job/cel/syndicate/assistant/cybersun", "slots": 2 } diff --git a/_maps/_mod_celadon/configs/syndicate_gorlex_beetle.json b/_maps/_mod_celadon/configs/syndicate_gorlex_beetle.json index 63c232679adb..4151cb9f9449 100644 --- a/_maps/_mod_celadon/configs/syndicate_gorlex_beetle.json +++ b/_maps/_mod_celadon/configs/syndicate_gorlex_beetle.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/CeladonSS13/Shiptest/beta-dev/_maps/_mod_celadon/ship_config_schema.json", - "map_name": "Beetle-class Battle Schnau", + "map_name": "Beetle-class Destroyer", "map_short_name": "Beetle", "description": "Боевое судно класса Beetle- Небольшое судно используемое Горлексом для поддержки в бою или мелких рейдах. Было разработано при поддержке киберсан для создания манёвренного судна для быстрых операций, в качестве эксперимента экипаж был оснащён лазерным вооружением.", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_beetle.dmm", @@ -18,23 +18,22 @@ "ACLF" ], "job_slots": { - "Squad leader": { + "Squad Commander": { "outfit": "/datum/outfit/job/cel/syndicate/captain/gorlex", "officer": true, "slots": 1, "name": "Gorlex Squad leader" }, - "Paramedic": { + "Field Medic": { "outfit": "/datum/outfit/job/cel/syndicate/doctor/gorlex", "slots": 1, "name": "Paramedic" }, - "Mechanic": { + "Field Engineer": { "outfit": "/datum/outfit/job/cel/syndicate/engineer/gorlex", "slots": 1 - }, - "Operative": { + "Commando": { "outfit": "/datum/outfit/job/cel/syndicate/security/gorlex", "slots": 3 } diff --git a/_maps/_mod_celadon/configs/syndicate_gorlex_hyena.json b/_maps/_mod_celadon/configs/syndicate_gorlex_hyena.json index b94823b6e1f5..582bffb115d9 100644 --- a/_maps/_mod_celadon/configs/syndicate_gorlex_hyena.json +++ b/_maps/_mod_celadon/configs/syndicate_gorlex_hyena.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/CeladonSS13/Shiptest/beta-dev/_maps/_mod_celadon/ship_config_schema.json", "map_name": "Hyena-class Wrecking Tug", "map_short_name": "Hyena", - "description": "«Hyena» обычный спасательный буксир, который часто используется «Мародерами Горлекса» для «спасательных» миссий на заброшенные станции эпохи Второй Галактической войны (а, иногда и на аванпосты и судна). 'Hyena' имеет довольно компактную планировку со специальным безопасным складским помещением и довольно большим грузовым отсеком для своего размера, а также комплектом высококачественных костюмов и шахтёрского оборудования. Низкая стоимость Hyena и высокий спрос в ее нише сделали ее очень распространенным явлением в дальних секторах космоса в годы, последовавшие за войной. и несмотря на ограниченное финансирование, почти все отколовшиеся от фракции Мародёров Горлекса продолжают приобретать такие типы суден ещё больше.", + "description": "«Hyena» обычный спасательный буксир, который часто используется Gorlex Marauders для «спасательных» миссий. Корабль имеет довольно компактную планировку со специальным безопасным складским помещением и довольно большим грузовым отсеком для своего размера, а также комплектом высококачественных костюмов и шахтёрского оборудования.", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_hyena.dmm", "enabled": true, "limit": 1, @@ -18,21 +18,17 @@ "ACLF" ], "job_slots": { - "Captain": { + "Squad Commander": { "outfit": "/datum/outfit/job/cel/syndicate/captain/gorlex", "officer": true, - "slots": 1 - }, - "Foreman": { - "outfit": "/datum/outfit/job/cel/syndicate/ce/gorlex", - "officer": true, - "slots": 1 + "slots": 1, + "name": "Gorlex Squad leader" }, "Mechanic": { "outfit": "/datum/outfit/job/cel/syndicate/engineer/gorlex", "slots": 1 }, - "Wrecker": { + "Explorer": { "outfit": "/datum/outfit/job/cel/syndicate/miner/gorlex", "slots": 2 }, diff --git a/_maps/_mod_celadon/configs/syndicate_gorlex_komodo.json b/_maps/_mod_celadon/configs/syndicate_gorlex_komodo.json index fc8e79f8ea42..dfd227764a8f 100644 --- a/_maps/_mod_celadon/configs/syndicate_gorlex_komodo.json +++ b/_maps/_mod_celadon/configs/syndicate_gorlex_komodo.json @@ -1,8 +1,8 @@ { "$schema": "https://raw.githubusercontent.com/CeladonSS13/Shiptest/beta-dev/_maps/_mod_celadon/ship_config_schema.json", - "map_name": "Komodo-class Warship", + "map_name": "Komodo-class Cruiser", "map_short_name": "Komodo", - "description": "«Komodo» сконструированный в эпоху ICW, является специализированным военным судном, управляемым Мародёрами Горлекса. Современники легендарного класса 'Starfury', 'Komodo' были основой флотов Горлекса и ACLF во время ICW и прошли значительную боевую службу, не всегда с трагическим концом, как их товарищи по Cybersun. Современные примеры часто все еще несут на себе шрамы от боевых действий периода Icw, а тяжелое финансовое положение большинства отколовшихся фракций Горлекс означает, что многие из выживших находятся в плачевном состоянии. Несмотря на возрастные трудности, они остаются боеспособными кораблями и часто все еще имеют на хранении более тяжелое вооружение, связанное с их развертыванием в ICW.", + "description": "«Komodo» является специализированным военным судном, управляемым Gorlex Marauders. Эти корабли прошли значительную боевую службу, и даже не смотря на свои недостатки, многим оперативникам они полюбились. Тем не менее, на текущий момент являются кораблями резерва и ждут своего часа.", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm", "map_id": "syndicate_gorlex_komodo", "enabled": false, @@ -18,17 +18,23 @@ "WEAPONS" ], "job_slots": { - "Captain": { + "Squad Commander": { "outfit": "/datum/outfit/job/cel/syndicate/captain/gorlex", "officer": true, "slots": 1 }, - "Sergeant": { - "outfit": "/datum/outfit/job/cel/syndicate/hos/gorlex", + "First Mate": { + "outfit": "/datum/outfit/job/cel/syndicate/head_of_personnel", "officer": true, "slots": 1 }, - "Medic": { + "Squad leader": { + "outfit": "/datum/outfit/job/cel/syndicate/captain/gorlex", + "officer": true, + "slots": 1, + "name": "Gorlex Squad leader" + }, + "Field Medic": { "outfit": "/datum/outfit/job/cel/syndicate/doctor/gorlex", "slots": 1 }, @@ -36,7 +42,7 @@ "outfit": "/datum/outfit/job/cel/syndicate/engineer/gorlex", "slots": 1 }, - "Trooper": { + "Commando": { "outfit": "/datum/outfit/job/cel/syndicate/security/gorlex", "slots": 3 }, @@ -44,10 +50,6 @@ "outfit": "/datum/outfit/job/cel/syndicate/miner/gorlex", "slots": 1 }, - "Bridge officer": { - "outfit": "/datum/outfit/job/cel/syndicate/head_of_personnel", - "slots": 1 - }, "Bartender": { "outfit": "/datum/outfit/job/cel/syndicate/bartender", "slots": 1 diff --git a/_maps/_mod_celadon/configs/syndicate_gorlex_sunset.json b/_maps/_mod_celadon/configs/syndicate_gorlex_sunset.json index 03ac49da6fca..41f01838df73 100644 --- a/_maps/_mod_celadon/configs/syndicate_gorlex_sunset.json +++ b/_maps/_mod_celadon/configs/syndicate_gorlex_sunset.json @@ -1,8 +1,8 @@ { "$schema": "https://raw.githubusercontent.com/CeladonSS13/Shiptest/beta-dev/_maps/_mod_celadon/ship_config_schema.json", - "map_name": "Sunset-class Warship", + "map_name": "Sunset-class Cruiser", "map_short_name": "Sunset", - "description": " «Sunset» — созданный корабль на основе уроков межкорпоративных войн для замены устаревших типов кораблей класса «Komodo». Он представляет собой новейший средний боевой корабль, сочетающий в себе компактность, надёжность и скорость, идеально подходящий для быстрых и маневренных операций в любой ситуации. На борту носит группу из 5 элитных бойцов, каждый из которых является мастером в своём деле.", + "description": " «Sunset» - корабль созданный на основе уроков межкорпоративных битв для замены устаревших типов кораблей класса «Komodo». Он представляет собой новейший средний боевой корабль, сочетающий в себе компактность, надёжность и скорость, идеально подходящий для быстрых и маневренных операций в любой ситуации.", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_sunset.dmm", "enabled" : true, "limit": 1, @@ -17,21 +17,22 @@ "NATURAL_AGGRESSIVE" ], "job_slots": { - "Squad Leader": { - "outfit": "/datum/outfit/job/cel/syndicate/captain", + "Squad Commander": { + "outfit": "/datum/outfit/job/cel/syndicate/captain/gorlex", "officer": true, - "slots": 1 + "slots": 1, + "name": "Gorlex Squad leader" }, - "Combat Medic": { - "outfit": "/datum/outfit/job/cel/syndicate/doctor", + "Field Medic": { + "outfit": "/datum/outfit/job/cel/syndicate/doctor/gorlex", "slots": 1 }, - "Combat Engineer": { - "outfit": "/datum/outfit/job/cel/syndicate/engineer", + "Field Engineer": { + "outfit": "/datum/outfit/job/cel/syndicate/engineer/gorlex", "slots": 1 }, "Commando": { - "outfit": "/datum/outfit/job/cel/syndicate/security", + "outfit": "/datum/outfit/job/cel/syndicate/security/gorlex", "slots": 2 } } diff --git a/_maps/_mod_celadon/configs/syndicate_kau_delta.json b/_maps/_mod_celadon/configs/syndicate_kau_delta.json index 2365a5b8164b..7e19ff71dda5 100644 --- a/_maps/_mod_celadon/configs/syndicate_kau_delta.json +++ b/_maps/_mod_celadon/configs/syndicate_kau_delta.json @@ -1,8 +1,8 @@ { "$schema": "https://raw.githubusercontent.com/CeladonSS13/Shiptest/beta-dev/_maps/_mod_celadon/ship_config_schema.json", - "map_name": "Kau-Delta-class ship", + "map_name": "Kau-Delta-class Corvette", "map_short_name": "Kau-Delta", - "description": "Боевой корвет класса Кау-Дельта. Нацелен на подрыв деятельности НТ в секторе, в спешке был переоборудован для самообеспечения на протяжение продолжительного времени. Несмотря на причастность киберсан к созданию корабля, экипаж состоит из разных подразделений Синдиката.", + "description": "Боевой корвет класса Кау-Дельта. Нацелен на подрыв деятельности НТ в секторе, в спешке был переоборудован для самообеспечения на протяжение продолжительного времени. Несмотря на причастность Cybersun к созданию корабля, экипаж состоит из разных подразделений Синдиката.", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm", "map_id": "cybersun_kau", "enabled": true, @@ -13,21 +13,21 @@ "tags": ["Боевой"], "namelists": ["CYBERSUN"], "job_slots": { - "Captain": { + "Commander": { "outfit": "/datum/outfit/job/cel/syndicate/captain/cybersun", "officer": true, "slots": 1 }, - "Sergeant": { + "Squad Leader": { "outfit": "/datum/outfit/job/cel/syndicate/hos/gorlex", "officer": true, "slots": 1 }, - "Operative": { - "outfit": "/datum/outfit/job/cel/syndicate/security", + "Commando": { + "outfit": "/datum/outfit/job/cel/syndicate/security/gorlex", "slots": 2 }, - "Engineer": { + "Mechanic": { "outfit": "/datum/outfit/job/cel/syndicate/engineer/gec", "slots": 1 }, diff --git a/_maps/_mod_celadon/configs/syndicate_krait.json b/_maps/_mod_celadon/configs/syndicate_krait.json index 169ae3d66f86..a84ae9793b24 100644 --- a/_maps/_mod_celadon/configs/syndicate_krait.json +++ b/_maps/_mod_celadon/configs/syndicate_krait.json @@ -1,8 +1,8 @@ { "$schema": "https://raw.githubusercontent.com/CeladonSS13/Shiptest/beta-dev/_maps/_mod_celadon/ship_config_schema.json", - "map_name": "Krait-class", + "map_name": "Krait-class Dreadnought", "map_short_name": "Krait", - "description": "Универсальный корабль класса 'Крайт', совмещает в себе две команды SnD и RnD. Команда SnD занимается поиском, захватом и уничтожением для второй команды занимающейся исследованиями. Корабль оснащен передовыми нанотехнологиями для более эффективной работы, обладает суб шаттлом для быстрого захвата и уничтожения объектов.", + "description": "Корабль класса «Krait», совмещает в себе две команды, от Gorlex Marauders и Cybersun прямо выполняющих свое предназначение в Синдикате. Корабль оснащен передовыми нанотехнологиями для более эффективной работы, и небольшим десантным судном для штурмовых операций. ", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_krait.dmm", "subshuttle": "Jet_lancer", "enabled": true, @@ -16,25 +16,25 @@ ], "namelists": ["CYBERSUN", "GORLEX"], "job_slots": { - "Search and Destroy Team Leader": { + "Squad Commander": { "outfit": "/datum/outfit/job/cel/syndicate/captain/gorlex", "officer": true, "slots": 1 }, - "Search and Destroy team member": { + "Commando": { "outfit": "/datum/outfit/job/cel/syndicate/security/gorlex", "slots": 3 }, - "Research and Development Team Leader": { + "Research Lead": { "outfit": "/datum/outfit/job/cel/syndicate/science/director", "officer": true, "slots": 1 }, - "Research and Development team member": { + "Scientist": { "outfit": "/datum/outfit/job/cel/syndicate/science/cybersun", "slots": 3 }, - "GEC Engineering": { + "Mechanic": { "outfit": "/datum/outfit/job/cel/syndicate/engineer/gec", "slots": 2 } diff --git a/_maps/_mod_celadon/configs/syndicate_litieguai.json b/_maps/_mod_celadon/configs/syndicate_litieguai.json index 2d34e5d435d1..0766510d20c6 100644 --- a/_maps/_mod_celadon/configs/syndicate_litieguai.json +++ b/_maps/_mod_celadon/configs/syndicate_litieguai.json @@ -1,8 +1,8 @@ { "$schema": "https://raw.githubusercontent.com/CeladonSS13/Shiptest/beta-dev/_maps/_mod_celadon/ship_config_schema.json", - "map_name": "Li Tieguai-class Rescue Ship", + "map_name": "Li Tieguai-class Support Ship", "map_short_name": "Li-Tieguai", - "description": "Небольшое, проворное и исключительно хорошо построенное медицинское судно 'Li Tieguai' недавно пополнило флот Cybersun и стало важнейшим компонентом программы стабилизации Фронтира. 'Li Tieguai' оснащены высококлассным медицинским оборудованием, включая различные Cybersun аугменты и протезы, а также оружием и броней, достаточными для защиты персонала в часто опасных секторах Фронтира, так что они могут предложить медицинскую помощь высшего класса (по высоким ценам) даже в самых опасных сценариях.", + "description": "«Li Tieguai» чуть ли не самый первый медицинский корабль Синдиката, славится высокой защитой и проворностью помогающие его экипажу избегать неприятностей. Корабль оснащен высококлассным медицинским оборудованием, включая различные Cybersun кибернетические протезы, а также вооружением для самообороны на просторах Фронтира.", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_litieguai.dmm", "enabled": true, "limit": 1, @@ -16,7 +16,7 @@ "NATURAL_AGGRESSIVE" ], "job_slots": { - "Captain": { + "Commander": { "outfit": "/datum/outfit/job/cel/syndicate/captain/cybersun", "slots": 1 }, @@ -25,7 +25,7 @@ "officer": true, "slots": 1 }, - "Trauma Team Technician": { + "Medical Doctor": { "outfit": "/datum/outfit/job/cel/syndicate/doctor/cybersun", "slots": 3 }, diff --git a/_maps/_mod_celadon/configs/syndicate_lugol.json b/_maps/_mod_celadon/configs/syndicate_lugol.json index da21fbd02d72..485f9a97ae5d 100644 --- a/_maps/_mod_celadon/configs/syndicate_lugol.json +++ b/_maps/_mod_celadon/configs/syndicate_lugol.json @@ -1,7 +1,7 @@ { - "map_name": "Lugol-class GEC Engineering Project", + "map_name": "Lugol-class GEC Experimental Engineering Project", "map_short_name": "Lugol", - "description": "«Люголь», по сути, представляет собой огромную исследовательскую баржу Конкордата галактических инженеров, используемую в качестве испытательного стенда для усовершенствований энергетических систем, новых технологий и так далее. Поскольку Люголь предлагает свободу от обычных ограничений работы на борту судов, принадлежащих другим фракциям Синдиката, он особенно популярен среди наиболее радикальных членов GEC. Соответственно, они имеют репутацию либо совершивших невозможное, либо создающих эквивалент новой звезды, когда они неизбежно тают. Люголи обычно встречаются только в дальних секторах, где побочный ущерб от потенциальных аварий можно свести к минимуму, а секретность, когда это необходимо, можно лучше поддерживать.", + "description": "«Lugol», по сути, представляет собой огромную исследовательскую баржу Конкордата галактических инженеров, используемую в качестве испытательного стенда для усовершенствований энергетических систем, новых технологий и так далее. Поскольку Люголь предлагает свободу от обычных ограничений работы на борту судов, принадлежащих другим фракциям Синдиката, он особенно популярен среди наиболее радикальных членов GEC. Соответственно, они имеют репутацию либо совершивших невозможное, либо создающих эквивалент новой звезды, когда они неизбежно тают. Люголи обычно встречаются только в дальних секторах, где побочный ущерб от потенциальных аварий можно свести к минимуму, а секретность, когда это необходимо, можно лучше поддерживать.", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_gec_lugol.dmm", "map_id": "gec_lugol", "enabled": true, @@ -21,11 +21,11 @@ "slots": 1, "officer": true }, - "GEC Engineering": { + "Mechanic": { "outfit": "/datum/outfit/job/cel/syndicate/engineer/gec", "slots": 3 }, - "GEC Atmospherics": { + "Atmos Techician": { "outfit": "/datum/outfit/job/cel/syndicate/atmos/gec", "slots": 3 }, @@ -33,7 +33,7 @@ "outfit": "/datum/outfit/job/cel/syndicate/bartender", "slots": 1 }, - "GEC Miner": { + "Shaft Miner": { "outfit": "/datum/outfit/job/cel/syndicate/miner/gec", "slots": 1 }, diff --git a/_maps/_mod_celadon/configs/syndicate_luxembourg.json b/_maps/_mod_celadon/configs/syndicate_luxembourg.json index 3acd823845c2..c91ec610dd77 100644 --- a/_maps/_mod_celadon/configs/syndicate_luxembourg.json +++ b/_maps/_mod_celadon/configs/syndicate_luxembourg.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/CeladonSS13/Shiptest/beta-dev/_maps/_mod_celadon/ship_config_schema.json", "map_name": "Luxembourg-class Delivery Vessel", "map_short_name": "Luxembourg", - "description": "Судно двойного назначения: доставка и продажа. Судно класса 'Luxembourg' составляет значительную часть флота Donk! Co. на границе, где вечно-оппортунистская корпорация начала заполнять пробелы, оставшиеся после краха логистической сети Nanotrasen. Менеджеры Donk! Co. обладают большой степенью автономии, и поэтому в любом конкретном корабле 'Luxembourg' часто приходится вносить существенные изменения в торговый зал и бортовое кафе, чтобы лучше привлекать новых клиентов в нестабильном, но прибыльном регионе пространства.", + "description": "Судно двойного назначения: доставка и продажа. Судно класса «Luxembourg» является живым воплощением агрессивного маркетинга, который из-за всех сил стремится заполнить пробелы вечно-оппортунистской корпорации Nanotrasen. Несмотря на то, что члены экипажа хоть и носят форму Donk! Co, они не дадут вам ясного ответа о том являются ли они представителями этой компании, дабы не привлекать к себе лишнее внимание федеральных сил на просторах Фронтира.", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_luxembourg.dmm", "enabled": true, "limit": 1, @@ -18,11 +18,11 @@ ], "job_slots": { "Manager": { - "outfit": "/datum/outfit/job/cel/syndicate/quartermaster/donk", + "outfit": "/datum/outfit/job/cel/syndicate/quartermaster", "slots": 1 }, "Customer Service Representative": { - "outfit": "/datum/outfit/job/cel/syndicate/cargo_tech/donk", + "outfit": "/datum/outfit/job/cel/syndicate/cargo_tech", "slots": 5 }, "Food and Beverage Specialist": { diff --git a/_maps/_mod_celadon/configs/syndicate_panacea.json b/_maps/_mod_celadon/configs/syndicate_panacea.json index d9f53a6dcd80..ddac366258d2 100644 --- a/_maps/_mod_celadon/configs/syndicate_panacea.json +++ b/_maps/_mod_celadon/configs/syndicate_panacea.json @@ -1,8 +1,8 @@ { "$schema": "https://raw.githubusercontent.com/CeladonSS13/Shiptest/beta-dev/_maps/_mod_celadon/ship_config_schema.json", - "map_name": "Panacea-class Infirm Vessel", + "map_name": "Panacea-class Support Ship", "map_short_name": "Panacea", - "description": "Вскоре после основания SUNS как такового и присоединения их к Триглаву Синдиката, GEC любезно согласились спроектировать и оборудовать первое судно, удовлетворяющее почти все нужды естествознателей SUNS. Корабль класса 'Панацея' был первым судно в своем роде, которое вмещало в себя все прелести станционных медицинских отсеков. Судно класса 'Панацея' - это судно с умеренным уровнем оснащения, готовое в экстренных случаях принимать пациентов, предлагая им как и первую медицинскую помощь, будь то хирургия или изготовление необходимых препаратов. На судне также присутствует психолог и проводится практика молодых студентов. ", + "description": "Вскоре после присоединения SUNS к Триглаву Синдиката, GEC любезно согласились спроектировать и оборудовать первое судно, которое полностью удовлетворит все нужды научных сотрудников. Судно класса «Panacea» - это мобильный научный дивизион с комфортными условиями для жизни и исследований. В большинстве случаев здесь ведется разработка новых боевых отравляющих веществ, которые потом поставляются для оперативных агентов на объектах Nanotrasen. Нередко экспериментальные образцы сбываются на черном рынке. Тем не менее, данный корабль так же готов в экстренных случаях принимать клиентов, или союзников попавших в беду.", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_panacea.dmm", "enabled": true, "limit": 1, @@ -23,7 +23,7 @@ "slots": 1 }, - "Medical Instructor": { + "Associate Professor of Medicine": { "outfit": "/datum/outfit/job/cel/syndicate/cmo/suns", "officer": true, "slots": 1 @@ -31,16 +31,16 @@ "Peacekeeper": { "outfit": "/datum/outfit/job/cel/syndicate/security/suns", - "slots": 1 + "slots": 2 }, - "Ship Doctor":{ + "Medical Doctor":{ "outfit": "/datum/outfit/job/cel/syndicate/doctor/suns", "slots": 2 }, "Mechanic": { - "outfit": "/datum/outfit/job/cel/syndicate/engineer/suns", + "outfit": "/datum/outfit/job/cel/syndicate/engineer/gec", "slots": 2 }, @@ -56,7 +56,7 @@ "Long Term Patient": { "outfit": "/datum/outfit/job/cel/syndicate/patient/suns", - "slots": 5 + "slots": 3 } } } diff --git a/_maps/_mod_celadon/configs/syndicate_pangolier.json b/_maps/_mod_celadon/configs/syndicate_pangolier.json index 2cd8f7aa1652..3d95f91339df 100644 --- a/_maps/_mod_celadon/configs/syndicate_pangolier.json +++ b/_maps/_mod_celadon/configs/syndicate_pangolier.json @@ -1,8 +1,8 @@ { "$schema": "https://raw.githubusercontent.com/CeladonSS13/Shiptest/beta-dev/_maps/_mod_celadon/ship_config_schema.json", - "map_name": "Pangolier-class Frigate", + "map_name": "Pangolier-class Cruiser", "map_short_name": "Pangolier", - "description": "Судно класса «Pangolier» является результатом совместного сотрудничества Cybersun и Gorlex Marauders. Благодаря их совместному труду в краткие сроки некогда вышедшее из эксплуатации административное судно было отреставрировано и переоборудовано под длительные экспедиции, а также снабжено научным отделом. На судне находятся ведущие специалисты своих областей под командованием предоставленного Cybersun Капитана, в то же время для их защиты на судне расквартирована наемная группа Gorlex Marauders возглавляемая Первым лейтенантом.", + "description": "Судно класса «Pangolier» является результатом совместного сотрудничества Cybersun и Gorlex Marauders. Благодаря их совместному труду в краткие сроки некогда вышедшее из эксплуатации административное судно было отреставрировано и переоборудовано под длительные экспедиции, а также снабжено научным отделом. На судне находятся ведущие специалисты своих областей под командованием предоставленного Cybersun Капитана, в то же время для их защиты на судне расквартирована наемная группа Gorlex Marauders.", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_pangolier.dmm", "enabled": true, "limit": 1, @@ -12,35 +12,31 @@ "tags": ["Исследовательский"], "namelists": ["CYBERSUN", "GORLEX"], "job_slots": { - "Captain": { + "Commander": { "outfit": "/datum/outfit/job/cel/syndicate/captain/cybersun", "officer": true, "slots": 1 }, - "First lieutenant": { - "outfit": "/datum/outfit/job/cel/syndicate/hos/gorlex/lieutenant", - "officer": true, - "slots": 1 - }, "Commando": { - "outfit": "/datum/outfit/job/cel/syndicate/security/gorlex/commando", + "outfit": "/datum/outfit/job/cel/syndicate/security/gorlex", "slots": 2 }, - "Cybersun scientist": { + "Scientist": { "outfit": "/datum/outfit/job/cel/syndicate/science/cybersun", "slots": 2 }, - "Cybersun paramedic": { + "Paramedic": { "outfit": "/datum/outfit/job/cel/syndicate/doctor/cybersun", "slots": 1 }, - "Cybersun engineer": { + "Engineer": { "outfit": "/datum/outfit/job/cel/syndicate/engineer/cybersun", "slots": 2 }, - "Operative": { - "outfit": "/datum/outfit/job/cel/syndicate/assistant/gorlex/operative", + "Junior Agent": { + "outfit": "/datum/outfit/job/cel/syndicate/assistant", "slots": 2 } + } } diff --git a/_maps/_mod_celadon/configs/syndicate_twinkleshine.json b/_maps/_mod_celadon/configs/syndicate_twinkleshine.json index 9fa19dc13be1..00ef0f3cc8a0 100644 --- a/_maps/_mod_celadon/configs/syndicate_twinkleshine.json +++ b/_maps/_mod_celadon/configs/syndicate_twinkleshine.json @@ -1,8 +1,8 @@ { "$schema": "https://raw.githubusercontent.com/CeladonSS13/Shiptest/beta-dev/_maps/_mod_celadon/ship_config_schema.json", - "map_name": "Twinkleshine-class Battle Cruiser", + "map_name": "Twinkleshine-class Dreadnought", "map_short_name": "Twinkleshine", - "description": "После уничтожения более крупных линейных крейсеров класса 'Starfury' во время межкорпоративной войны Cybersun спроектировала 'Twinkleshine' в качестве замены, чтобы занять освободившуюся теперь роль флагмана. Однако война подошла к концу, прежде чем какие-либо образцы этого класса смогли увидеть бои. Теперь они хранятся как ценный символ могущества и единства Синдиката. В теории. Как и в случае с классом 'Starfury', экипажи 'Twinkleshine' состоят из представителей всех фракций членов Синдиката. В силу политической необходимости никто не согласился бы, чтобы Cybersun управлял такими мощными кораблями в одиночку. В то время как экипажи 'Twinkleshine', предположительно отбираются за более дипломатичные наклонности, чем можно было бы ожидать политическая ситуация на борту 'Twinkleshine' часто бывает деликатной, особенно по мере того, как напряженность между корпоративными и антикорпоративными элементами Синдиката продолжает нарастать. Тем не менее, они остаются самыми мощными единичными активами в объединенном арсенале Синдиката и часто выполняют роль изображения силы в пограничном пространстве. В щитспавне по причине: Он никому не сдался ", + "description": "После того как разработка крейсеров класса «Starfury» была свернута, GEC спроектировала «Twinkleshine» новый образец на роль флагмана с учетом всех недостатков своего предшественника.На текущий момент является не более чем символом могущества и единства Синдиката, поскольку реалии текущей ситуации являются наименее удачными для того чтобы разыграть данную карту. В ЩИТСПАВНЕ ПО ПРИЧИНЕ: Большие корабли неактуальны на такой маленький онлайн.", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_twinkleshine.dmm", "enabled" : false, "limit": 1, @@ -17,38 +17,38 @@ "ACLF" ], "job_slots": { - "Flotilla Admiral": { - "outfit": "/datum/outfit/job/cel/syndicate/captain/twink", + "Captain": { + "outfit": "/datum/outfit/job/cel/syndicate/captain", "officer": true, "slots": 1 }, - "Lieutenant": { - "outfit": "/datum/outfit/job/cel/syndicate/hos/twink", + "Squad Leader": { + "outfit": "/datum/outfit/job/cel/syndicate/hos/gorlex", "officer": true, "slots": 1 }, - "Medic": { - "outfit": "/datum/outfit/job/cel/syndicate/paramedic/twink", + "Field Medic": { + "outfit": "/datum/outfit/job/cel/syndicate/paramedic/cybersun", "slots": 2 }, - "Engineer": { - "outfit": "/datum/outfit/job/cel/syndicate/engineer/twink", + "Field Engineer": { + "outfit": "/datum/outfit/job/cel/syndicate/engineer/cybersun", "slots": 2 }, - "Operative": { - "outfit": "/datum/outfit/job/cel/syndicate/security/twink", + "Commando": { + "outfit": "/datum/outfit/job/cel/syndicate/security/gorlex", "slots": 5 }, "Bartender": { - "outfit": "/datum/outfit/job/cel/syndicate/bartender/twink", + "outfit": "/datum/outfit/job/cel/syndicate/bartender", "slots": 1 }, - "Miner": { - "outfit": "/datum/outfit/job/cel/syndicate/miner/twink", + "Explorer": { + "outfit": "/datum/outfit/job/cel/syndicate/miner", "slots": 2 }, "Junior Agent": { - "outfit": "/datum/outfit/job/cel/syndicate/assistant/twink", + "outfit": "/datum/outfit/job/cel/syndicate/assistant", "slots": 3 } } diff --git a/mod_celadon/outfit/_outfit.dme b/mod_celadon/outfit/_outfit.dme index b463623b6132..d1a73981fdb4 100644 --- a/mod_celadon/outfit/_outfit.dme +++ b/mod_celadon/outfit/_outfit.dme @@ -55,7 +55,6 @@ #include "code/syndicate/gec_outfit.dm" #include "code/syndicate/gorlex_outfit.dm" #include "code/syndicate/suns_outfit.dm" -#include "code/syndicate/twinkle_outfit.dm" #include "code/pirate/_card_id.dm" #include "code/pirate/_outfit.dm" diff --git a/mod_celadon/outfit/code/syndicate/_card_id.dm b/mod_celadon/outfit/code/syndicate/_card_id.dm index cd62d4b26e42..8f38e654eda5 100644 --- a/mod_celadon/outfit/code/syndicate/_card_id.dm +++ b/mod_celadon/outfit/code/syndicate/_card_id.dm @@ -7,106 +7,82 @@ //MARK: SYNDICATE /obj/item/card/id/cel/syndicate/admiral - assignment = "Admiral" icon_state = "idsyndicate_admiral" access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS, ACCESS_ARMORY, ACCESS_SYNDICATE_LEADER) /obj/item/card/id/cel/syndicate/captain - assignment = "Captain" icon_state = "idsyndicate_captain" access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS, ACCESS_ARMORY, ACCESS_SYNDICATE_LEADER) /obj/item/card/id/cel/syndicate/command_rd - assignment = "Research Director" icon_state = "idsyndicate_command" access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS, ACCESS_RD, ACCESS_SYNDICATE_LEADER) /obj/item/card/id/cel/syndicate/command_ce - assignment = "Chief Engineer" icon_state = "idsyndicate_command" access = list(ACCESS_SYNDICATE, ACCESS_ENGINE, ACCESS_CE, ACCESS_CONSTRUCTION, ACCESS_SYNDICATE_LEADER) /obj/item/card/id/cel/syndicate/command_cmo - assignment = "Medical Director" icon_state = "idsyndicate_command" access = list(ACCESS_SYNDICATE, ACCESS_MEDICAL, ACCESS_CMO, ACCESS_SYNDICATE_LEADER) /obj/item/card/id/cel/syndicate/command_hop - assignment = "Bridge Officer" icon_state = "idsyndicate_command" access = list(ACCESS_SYNDICATE, ACCESS_HOP, ACCESS_SYNDICATE_LEADER) /obj/item/card/id/cel/syndicate/command_hos - assignment = "Head Of Security" icon_state = "idsyndicate_command" access = list(ACCESS_SYNDICATE, ACCESS_SECURITY, ACCESS_HOS, ACCESS_SYNDICATE_LEADER) /obj/item/card/id/cel/syndicate/command_qm - assignment = "Quartermaster" icon_state = "idsyndicate_command" access = list(ACCESS_SYNDICATE, ACCESS_CARGO, ACCESS_QM,ACCESS_SYNDICATE_LEADER) /obj/item/card/id/cel/syndicate/crew - assignment = "Operative" icon_state = "idsyndicate_crew" /obj/item/card/id/cel/syndicate/crew/security - assignment = "Operative" icon_state = "idsyndicate_crew" access = list(ACCESS_SYNDICATE, ACCESS_SECURITY) /obj/item/card/id/cel/syndicate/crew/bartender - assignment = "Bartender" access = list(ACCESS_SYNDICATE, ACCESS_BAR) /obj/item/card/id/cel/syndicate/crew/botanist - assignment = "Botanist" access = list(ACCESS_SYNDICATE, ACCESS_HYDROPONICS) /obj/item/card/id/cel/syndicate/crew/chemist - assignment = "Chemist" access = list(ACCESS_SYNDICATE, ACCESS_CHEMISTRY) /obj/item/card/id/cel/syndicate/crew/cargo_tech - assignment = "Cargo Tech" access = list(ACCESS_SYNDICATE, ACCESS_CARGO) /obj/item/card/id/cel/syndicate/crew/miner - assignment = "Miner" access = list(ACCESS_SYNDICATE, ACCESS_MINING) /obj/item/card/id/cel/syndicate/crew/doctor - assignment = "Medical Doctor" access = list(ACCESS_SYNDICATE, ACCESS_MEDICAL) /obj/item/card/id/cel/syndicate/crew/doctor/paramedic - assignment = "Paramedic" /obj/item/card/id/cel/syndicate/crew/doctor/psychologist - assignment = "Psychologist" /obj/item/card/id/cel/syndicate/crew/scientist - assignment = "Scientist" access = list(ACCESS_SYNDICATE, ACCESS_RESEARCH, ACCESS_CONSTRUCTION) /obj/item/card/id/cel/syndicate/crew/engineer - assignment = "Engineer" access = list(ACCESS_SYNDICATE, ACCESS_ENGINE, ACCESS_CONSTRUCTION) /obj/item/card/id/cel/syndicate/crew/atmos - assignment = "Atmospheric Technician" access = list(ACCESS_SYNDICATE, ACCESS_ENGINE, ACCESS_ATMOSPHERICS) /obj/item/card/id/cel/syndicate/crew/medic - assignment = "Medic" access = list(ACCESS_SYNDICATE, ACCESS_MEDICAL) /obj/item/card/id/cel/syndicate/crew/lieutenant - assignment = "Lieutenant" access = list(ACCESS_SYNDICATE, ACCESS_ARMORY) /obj/item/card/id/cel/syndicate/assistant - assignment = "Assistant" icon_state = "idsyndicate_assistant" //MARK: GEC @@ -118,26 +94,21 @@ icon_state = "idgec_command" /obj/item/card/id/cel/syndicate/command_ce/gec - assignment = "Chief Engineer (GEC)" icon_state = "idgec_captain" /obj/item/card/id/cel/syndicate/crew/gec icon_state = "idgec_crew" /obj/item/card/id/cel/syndicate/crew/engineer/gec - assignment = "Ship Engineer (GEC)" icon_state = "idgec_crew" /obj/item/card/id/cel/syndicate/crew/miner/gec - assignment = "Shaft Miner (GEC)" icon_state = "idgec_crew" /obj/item/card/id/cel/syndicate/crew/chemist/gec - assignment = "Chemist (GEC)" icon_state = "idgec_crew" /obj/item/card/id/cel/syndicate/crew/atmos/gec - assignment = "Atmospheric Technician (GEC)" icon_state = "idgec_crew" /obj/item/card/id/cel/syndicate/assistant/gec @@ -152,14 +123,12 @@ icon_state = "iddc_command" /obj/item/card/id/cel/syndicate/command_qm/donkco - assignment = "Manager (Donk)" icon_state = "iddc_captain" /obj/item/card/id/cel/syndicate/crew/donkco icon_state = "iddc_crew" /obj/item/card/id/cel/syndicate/crew/cargo_tech/donkco - assignment = "Customer Associate (Donk)" icon_state = "iddc_crew" /obj/item/card/id/cel/syndicate/assistant/donkco @@ -171,38 +140,30 @@ icon_state = "idcs_captain" /obj/item/card/id/cel/syndicate/command_rd/cybersun - assignment = "Research and Development Team Leader (Cybersun)" icon_state = "idcs_command" /obj/item/card/id/cel/syndicate/command_cmo/cybersun - assignment = "Medical Director (Cybersun)" icon_state = "idcs_command" /obj/item/card/id/cel/syndicate/command_hop/cybersun - assignment = "Intelligence Officer (Cybersun)" icon_state = "idcs_command" /obj/item/card/id/cel/syndicate/crew/cybersun icon_state = "idcs_crew" /obj/item/card/id/cel/syndicate/crew/engineer/cybersun - assignment = "Engineer (Cybersun)" icon_state = "idcs_crew" /obj/item/card/id/cel/syndicate/crew/miner/cybersun - assignment = "Field Agent (Cybersun)" icon_state = "idcs_crew" /obj/item/card/id/cel/syndicate/crew/doctor/cybersun - assignment = "Medical Doctor (Cybersun)" icon_state = "idcs_crew" /obj/item/card/id/cel/syndicate/crew/scientist/cybersun - assignment = "Scientist (Cybersun)" icon_state = "idcs_crew" /obj/item/card/id/cel/syndicate/crew/doctor/paramedic/cybersun - assignment = "Paramedic (Cybersun)" icon_state = "idcs_crew" /obj/item/card/id/cel/syndicate/assistant/cybersun @@ -217,37 +178,27 @@ icon_state = "idgorlex_command" /obj/item/card/id/cel/syndicate/command_ce/gorlex - assignment = "Chief Engineer (Gorlex)" icon_state = "idgorlex_command" /obj/item/card/id/cel/syndicate/command_hos/gorlex - assignment = "Sergeant (Hardliner)" icon_state = "idgorlex_command" /obj/item/card/id/cel/syndicate/crew/gorlex icon_state = "idgorlex_crew" /obj/item/card/id/cel/syndicate/crew/engineer/gorlex - assignment = "Mechanic (Hardliner)" icon_state = "idgorlex_crew" /obj/item/card/id/cel/syndicate/crew/miner/gorlex - assignment = "Wrecker (Hardliner)" icon_state = "idgorlex_crew" /obj/item/card/id/cel/syndicate/crew/security/gorlex - assignment = "Trooper (Hardliner)" icon_state = "idgorlex_crew" -/obj/item/card/id/cel/syndicate/crew/security/gorlex/pilot - assignment = "Pilot (Hardliner)" - /obj/item/card/id/cel/syndicate/crew/doctor/gorlex - assignment = "Medical Doctor (Hardliner)" icon_state = "idgorlex_crew" /obj/item/card/id/cel/syndicate/crew/doctor/paramedic/gorlex - assignment = "Paramedic (Gorlex)" icon_state = "idgorlex_crew" /obj/item/card/id/cel/syndicate/assistant/gorlex @@ -262,73 +213,49 @@ icon_state = "idsuns_command" /obj/item/card/id/cel/syndicate/command_cmo/suns - assignment = "Medical Director (SUNS)" icon_state = "idsuns_command" /obj/item/card/id/cel/syndicate/command_hop/suns - assignment = "Academic Staff (SUNS)" icon_state = "idsuns_command" /obj/item/card/id/cel/syndicate/command_hos/suns - assignment = "Senior Peacekeeper (SUNS)" icon_state = "idsuns_command" -/obj/item/card/id/cel/syndicate/command_hos/suns/alt - assignment = "Senior Peacekeeper Alt (SUNS)" - -/obj/item/card/id/cel/syndicate/command_hos/suns/twink - assignment = "Redshield Officer (Twinkleshine, SUNS)" - /obj/item/card/id/cel/syndicate/crew/suns icon_state = "idsuns_crew" /obj/item/card/id/cel/syndicate/crew/security/suns - assignment = "Peacekeeper (SUNS)" icon_state = "idsuns_crew" -/obj/item/card/id/cel/syndicate/crew/security/suns/alternate - assignment = "Peacekeeper - Casual(SUNS)" - /obj/item/card/id/cel/syndicate/crew/miner/suns - assignment = "Miner (SUNS)" icon_state = "idsuns_crew" /obj/item/card/id/cel/syndicate/crew/bartender/suns - assignment = "Student Mixologist (SUNS)" icon_state = "idsuns_crew" /obj/item/card/id/cel/syndicate/crew/botanist/suns - assignment = "Botanist-Chemist (SUNS)" icon_state = "idsuns_crew" access = list(ACCESS_SYNDICATE, ACCESS_HYDROPONICS, ACCESS_CHEMISTRY) /obj/item/card/id/cel/syndicate/crew/doctor/suns - assignment = "Medical Doctor (SUNS)" icon_state = "idsuns_crew" /obj/item/card/id/cel/syndicate/crew/doctor/psychologist/suns - assignment = "Psychologist (SUNS)" icon_state = "idsuns_crew" /obj/item/card/id/cel/syndicate/crew/engineer/suns - assignment = "Ship Engineer (SUNS)" icon_state = "idsuns_crew" /obj/item/card/id/cel/syndicate/crew/scientist/suns - assignment = "Scientist (SUNS)" icon_state = "idsuns_crew" /obj/item/card/id/cel/syndicate/assistant/suns - assignment = "Freshman (SUNS)" icon_state = "idsuns_assistant" /obj/item/card/id/cel/syndicate/assistant/suns/janitor - assignment = "Junior (SUNS)" /obj/item/card/id/cel/syndicate/assistant/suns/graduate - assignment = "Graduate (SUNS)" /obj/item/card/id/cel/syndicate/patient_suns icon_state = "idsuns_patient" - assignment = "Patient" access = list() diff --git a/mod_celadon/outfit/code/syndicate/_outfit.dm b/mod_celadon/outfit/code/syndicate/_outfit.dm index 2299d59ee4bb..f6a4c3506fd7 100644 --- a/mod_celadon/outfit/code/syndicate/_outfit.dm +++ b/mod_celadon/outfit/code/syndicate/_outfit.dm @@ -13,37 +13,6 @@ duffelbag = /obj/item/storage/backpack/duffelbag/syndie courierbag = /obj/item/storage/backpack/messenger/sec -//generates a codename and assigns syndicate access, used in the twinkleshine. -/datum/outfit/job/cel/syndicate/proc/assign_codename(mob/living/carbon/human/H) - var/obj/item/card/id/I = H.get_idcard() - if(I) - I.registered_name = pick(GLOB.twinkle_names) + "-" + num2text(rand(1, 12)) // squidquest real - I.access |= list(ACCESS_SYNDICATE) - I.update_label() - -/datum/outfit/job/cel/syndicate/proc/get_syndi_general_access(mob/living/carbon/human/H) - var/obj/item/storage/wallet/W = null - for (var/obj/item/O in H.contents) - if (istype(O, /obj/item/storage/wallet)) - W = O - break - if (W) - var/obj/item/card/id/I = null - for (var/obj/item/O in W.contents) - if (istype(O, /obj/item/card/id)) - I = O - break - if (I) - I.access += list(ACCESS_OUTPOST_FACTION_SYNDICATE, ACCESS_OUTPOST_OTHER_DONCO) - I.update_label() - W.combined_access = list() - for (var/obj/item/card/id/card in W.contents) - W.combined_access |= card.access - -/datum/outfit/job/cel/syndicate/post_equip(mob/living/carbon/human/H) - . = ..() - get_syndi_general_access(H) - ////////////////////////////////////////////////////////////////////////////////////////////////////// //MARK: Captain @@ -57,7 +26,7 @@ id = /obj/item/card/id/cel/syndicate/captain ears = /obj/item/radio/headset/syndicate/alt/captain uniform = /obj/item/clothing/under/syndicate/ngr/officer - shoes = /obj/item/clothing/shoes/jackboots + shoes = /obj/item/clothing/shoes/combat head = /obj/item/clothing/head/HoS/syndicate gloves = /obj/item/clothing/gloves/combat suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate @@ -85,7 +54,6 @@ /datum/outfit/job/cel/syndicate/cmo name = "Syndi - Medical Director" - id_assignment = "Medical Director" jobtype = /datum/job/cmo job_icon = "chiefmedicalofficer" @@ -93,16 +61,14 @@ id = /obj/item/card/id/cel/syndicate/command_cmo uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer ears = /obj/item/radio/headset/syndicate/alt/captain - shoes = /obj/item/clothing/shoes/jackboots + shoes = /obj/item/clothing/shoes/combat l_pocket = /obj/item/pinpointer/crew head = /obj/item/clothing/head/beret/cmo - suit = /obj/item/clothing/suit/toggle/labcoat/raincoat + suit = /obj/item/clothing/suit/toggle/labcoat l_hand = /obj/item/storage/firstaid/medical - suit_store = /obj/item/flashlight/pen/paramedic /datum/outfit/job/cel/syndicate/head_of_personnel name = "Syndi - Bridge Officer" - id_assignment = "Bridge Officer" jobtype = /datum/job/head_of_personnel job_icon = "headofpersonnel" @@ -110,14 +76,11 @@ id = /obj/item/card/id/cel/syndicate/command_hop ears = /obj/item/radio/headset/syndicate/alt uniform = /obj/item/clothing/under/syndicate - shoes = /obj/item/clothing/shoes/jackboots + shoes = /obj/item/clothing/shoes/combat head = /obj/item/clothing/head/HoS/beret/syndicate gloves = /obj/item/clothing/gloves/color/white - r_pocket = /obj/item/melee/knife/survival - glasses = /obj/item/clothing/glasses/hud/health - backpack_contents = list(/obj/item/storage/box/ids=1) -/datum/outfit/job/cel/syndicate/hos // Не юзается +/datum/outfit/job/cel/syndicate/hos name = "Syndi - Head Of Security" jobtype = /datum/job/hos @@ -128,7 +91,7 @@ uniform = /obj/item/clothing/under/syndicate/combat head = /obj/item/clothing/head/HoS/syndicate suit = /obj/item/clothing/suit/armor/vest/syndie - shoes = /obj/item/clothing/shoes/jackboots + shoes = /obj/item/clothing/shoes/combat glasses = /obj/item/clothing/glasses/hud/security/sunglasses /datum/outfit/job/cel/syndicate/quartermaster // Не юзается @@ -156,6 +119,7 @@ job_icon = "bartender" id = /obj/item/card/id/cel/syndicate/crew/bartender + ears = /obj/item/radio/headset/syndicate head = /obj/item/clothing/head/HoS/beret/syndicate glasses = /obj/item/clothing/glasses/sunglasses/reagent uniform = /obj/item/clothing/under/rank/civilian/bartender @@ -180,6 +144,7 @@ job_icon = "botanist" id = /obj/item/card/id/cel/syndicate/crew/botanist + ears = /obj/item/radio/headset/syndicate suit = /obj/item/clothing/suit/apron gloves =/obj/item/clothing/gloves/botanic_leather suit_store = /obj/item/plant_analyzer @@ -191,6 +156,7 @@ job_icon = "cargotechnician" id = /obj/item/card/id/cel/syndicate/crew/cargo_tech + ears = /obj/item/radio/headset/syndicate uniform = /obj/item/clothing/under/syndicate/donk suit = /obj/item/clothing/suit/hazardvest/donk @@ -205,14 +171,13 @@ job_icon = "atmospherictechnician" id = /obj/item/card/id/cel/syndicate/crew/atmos + ears = /obj/item/radio/headset/syndicate belt = /obj/item/storage/belt/utility/atmostech uniform = /obj/item/clothing/under/rank/engineering/atmospheric_technician alt_uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard alt_suit = /obj/item/clothing/suit/hazardvest dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering - r_pocket = /obj/item/analyzer - backpack = /obj/item/storage/backpack/industrial satchel = /obj/item/storage/backpack/satchel/eng duffelbag = /obj/item/storage/backpack/duffelbag/engineering @@ -228,6 +193,7 @@ job_icon = "chemist" id = /obj/item/card/id/cel/syndicate/crew/chemist + ears = /obj/item/radio/headset/syndicate uniform = /obj/item/clothing/under/syndicate glasses = /obj/item/clothing/glasses/science shoes = /obj/item/clothing/shoes/sneakers/white @@ -241,86 +207,85 @@ job_icon = "medicaldoctor" id = /obj/item/card/id/cel/syndicate/crew/doctor + ears = /obj/item/radio/headset/syndicate uniform = /obj/item/clothing/under/syndicate - shoes = /obj/item/clothing/shoes/jackboots + shoes = /obj/item/clothing/shoes/combat alt_suit = /obj/item/clothing/suit/apron/surgical backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/syndie/med courierbag = /obj/item/storage/backpack/messenger/med -/datum/outfit/job/cel/syndicate/paramedic // Не юзается - name = "Syndi - Paramedic" +/datum/outfit/job/cel/syndicate/paramedic + name = "Syndi - Field Medic" jobtype = /datum/job/paramedic job_icon = "paramedic" id = /obj/item/card/id/cel/syndicate/crew/doctor/paramedic + ears = /obj/item/radio/headset/syndicate uniform = /obj/item/clothing/under/syndicate/gorlex alt_uniform = null - shoes = /obj/item/clothing/shoes/jackboots + shoes = /obj/item/clothing/shoes/combat head = /obj/item/clothing/head/soft/paramedic suit = /obj/item/clothing/suit/toggle/labcoat/paramedic alt_suit = /obj/item/clothing/suit/apron/surgical gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil - belt = /obj/item/storage/belt/medical/paramedic - suit_store = /obj/item/flashlight/pen/paramedic backpack_contents = list(/obj/item/roller=1) pda_slot = ITEM_SLOT_LPOCKET -/datum/outfit/job/cel/syndicate/psychologist // Не юзается +/datum/outfit/job/cel/syndicate/psychologist name = "Syndi - Psychologist" jobtype = /datum/job/psychologist job_icon = "psychologist" id = /obj/item/card/id/cel/syndicate/crew/doctor/psychologist + ears = /obj/item/radio/headset/syndicate uniform = /obj/item/clothing/under/rank/medical/psychiatrist suit = /obj/item/clothing/suit/toggle/labcoat shoes = /obj/item/clothing/shoes/laceup alt_uniform = null l_hand = /obj/item/clipboard pda_slot = ITEM_SLOT_BELT -/datum/outfit/job/cel/syndicate/science // Не юзается + +/datum/outfit/job/cel/syndicate/science name = "Syndi - Scientist" jobtype = /datum/job/scientist job_icon = "scientist" id = /obj/item/card/id/cel/syndicate/crew/scientist + ears = /obj/item/radio/headset/syndicate suit = /obj/item/clothing/suit/toggle/labcoat/science dcoat = /obj/item/clothing/suit/hooded/wintercoat/science /datum/outfit/job/cel/syndicate/security name = "Syndi - Operative" - id_assignment = "Operative" jobtype = /datum/job/officer job_icon = "securityofficer" id = /obj/item/card/id/cel/syndicate/crew/security uniform = /obj/item/clothing/under/syndicate - ears = /obj/item/radio/headset/alt + ears = /obj/item/radio/headset/syndicate gloves = /obj/item/clothing/gloves/color/black - shoes = /obj/item/clothing/shoes/jackboots - l_pocket = /obj/item/restraints/handcuffs - r_pocket = /obj/item/assembly/flash/handheld + shoes = /obj/item/clothing/shoes/combat -/datum/outfit/job/cel/syndicate/miner // Не юзается +/datum/outfit/job/cel/syndicate/miner name = "Syndi - Miner" jobtype = /datum/job/mining job_icon = "shaftminer" id = /obj/item/card/id/cel/syndicate/crew/miner - ears = /obj/item/radio/headset/headset_cargo/mining + ears = /obj/item/radio/headset/syndicate shoes = /obj/item/clothing/shoes/workboots/mining gloves = /obj/item/clothing/gloves/explorer uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland r_pocket = /obj/item/storage/bag/ore backpack_contents = list( - /obj/item/flashlight/seclite=1, /obj/item/melee/knife/survival=1, /obj/item/stack/marker_beacon/ten=1, /obj/item/radio/weather_monitor=1, @@ -328,21 +293,20 @@ /datum/outfit/job/cel/syndicate/engineer name = "Syndi - Ship Technician" - id_assignment = "Ship Technician" jobtype = /datum/job/engineer job_icon = "stationengineer" id = /obj/item/card/id/cel/syndicate/crew/engineer + ears = /obj/item/radio/headset/syndicate uniform = /obj/item/clothing/under/syndicate alt_uniform = /obj/item/clothing/under/syndicate/gec accessory = /obj/item/clothing/accessory/armband/engine glasses = /obj/item/clothing/glasses/sunglasses - shoes = /obj/item/clothing/shoes/jackboots + shoes = /obj/item/clothing/shoes/combat belt = /obj/item/storage/belt/utility/full/engi head = /obj/item/clothing/head/hardhat/dblue - r_pocket = /obj/item/t_scanner backpack = /obj/item/storage/backpack/industrial satchel = /obj/item/storage/backpack/satchel/eng @@ -356,7 +320,6 @@ /datum/outfit/job/cel/syndicate/assistant name = "Syndi - Junior Agent" - id_assignment = "Junior Agent" jobtype = /datum/job/assistant job_icon = "assistant" @@ -364,19 +327,17 @@ uniform = /obj/item/clothing/under/syndicate/intern alt_uniform = null - shoes = /obj/item/clothing/shoes/jackboots + shoes = /obj/item/clothing/shoes/combat gloves = null - ears = /obj/item/radio/headset + ears = /obj/item/radio/headset/syndicate back = /obj/item/storage/backpack id = /obj/item/card/id/cel/syndicate/assistant - r_pocket = /obj/item/radio //MARK: Patient /datum/outfit/job/cel/syndicate/patient name = "Syndi - Long Term Patient" - id_assignment = "Long Term Patient" jobtype = /datum/job/prisoner job_icon = "suns_patient" diff --git a/mod_celadon/outfit/code/syndicate/cybersun_outfit.dm b/mod_celadon/outfit/code/syndicate/cybersun_outfit.dm index 78b6cf245a79..a1b2580478b7 100644 --- a/mod_celadon/outfit/code/syndicate/cybersun_outfit.dm +++ b/mod_celadon/outfit/code/syndicate/cybersun_outfit.dm @@ -1,7 +1,7 @@ //MARK: Captain /datum/outfit/job/cel/syndicate/captain/cybersun - name = "Syndi Cybersun - Captain" + name = "Cybersun - Captain" id = /obj/item/card/id/cel/syndicate/captain/cybersun uniform = /obj/item/clothing/under/syndicate/cybersun/officer @@ -12,28 +12,26 @@ //MARK: Command /datum/outfit/job/cel/syndicate/cmo/cybersun - name = "Syndi Cybersun - Medical Director" + name = "Cybersun - Medical Director" id = /obj/item/card/id/cel/syndicate/command_cmo/cybersun uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer/cybersun head = /obj/item/clothing/head/beret/cmo/cybersun /datum/outfit/job/cel/syndicate/head_of_personnel/cybersun - name = "Syndi Cybersun - Intelligence Officer" - id_assignment = "Intelligence Officer" + name = "Cybersun - Intelligence Officer" id = /obj/item/card/id/cel/syndicate/command_hop/cybersun ears = /obj/item/radio/headset/syndicate/alt uniform = /obj/item/clothing/under/syndicate/cybersun/officer suit = /obj/item/clothing/suit/cybersun_suit - shoes = /obj/item/clothing/shoes/jackboots head = /obj/item/clothing/head/HoS/cybersun gloves = /obj/item/clothing/gloves/combat glasses = /obj/item/clothing/glasses/sunglasses /datum/outfit/job/cel/syndicate/science/director - name = "Syndi Cybersun - Research and Development Team Leader" - id_assignment = "Research and Development Team Leader" + name = "Cybersun - Research Lead" + jobtype = /datum/job/rd job_icon = "headofpersonnel" @@ -42,32 +40,32 @@ uniform = /obj/item/clothing/under/syndicate/cybersun/officer suit = /obj/item/clothing/suit/cybersun_suit shoes = /obj/item/clothing/shoes/jackboots - head = /obj/item/clothing/head/HoS/cybersun + head = /obj/item/clothing/head/beret/rd gloves = /obj/item/clothing/gloves/combat glasses = /obj/item/clothing/glasses/sunglasses //MARK: Crew /datum/outfit/job/cel/syndicate/doctor/cybersun - name = "Syndi Cybersun - Medical Doctor" + name = "Cybersun - Medical Doctor" id = /obj/item/card/id/cel/syndicate/crew/doctor/cybersun + head = /obj/item/clothing/head/soft/cybersun/medical uniform = /obj/item/clothing/under/syndicate/medic accessory = /obj/item/clothing/accessory/armband/medblue shoes = /obj/item/clothing/shoes/combat /datum/outfit/job/cel/syndicate/paramedic/cybersun - name = "Syndi Cybersun - Field Medic (Cybersun Industries)" - id_assignment = "Field Medic" + name = "Cybersun - Field Medic" id = /obj/item/card/id/cel/syndicate/crew/doctor/paramedic/cybersun uniform = /obj/item/clothing/under/syndicate/medic head = /obj/item/clothing/head/soft/cybersun/medical shoes = /obj/item/clothing/shoes/combat - suit = /obj/item/clothing/suit/toggle/labcoat/raincoat + suit = /obj/item/clothing/suit/armor/vest/trauma /datum/outfit/job/cel/syndicate/science/cybersun - name = "Syndi Cybersun - Scientist" + name = "Cybersun - Scientist" jobtype = /datum/job/scientist job_icon = "scientist" @@ -81,33 +79,27 @@ courierbag = /obj/item/storage/backpack/messenger/tox /datum/outfit/job/cel/syndicate/miner/cybersun - name = "Syndi Cybersun - Field Agent" - id_assignment = "Field Agent" + name = "Cybersun - Explorer" id = /obj/item/card/id/cel/syndicate/crew/miner/cybersun - ears = /obj/item/radio/headset uniform = /obj/item/clothing/under/syndicate/cybersun accessory = /obj/item/clothing/accessory/armband/cargo head = /obj/item/clothing/head/soft/cybersun - r_pocket = /obj/item/radio /datum/outfit/job/cel/syndicate/engineer/cybersun - name = "Syndi Cybersun - Engineer" + name = "Cybersun - Engineer" id = /obj/item/card/id/cel/syndicate/crew/engineer/cybersun - uniform = /obj/item/clothing/under/syndicate/cybersun/research + uniform = /obj/item/clothing/under/syndicate/cybersun shoes = /obj/item/clothing/shoes/workboots - r_pocket = /obj/item/radio head = /obj/item/clothing/head/soft/cybersun accessory = /obj/item/clothing/accessory/armband/engine //MARK: Assistant /datum/outfit/job/cel/syndicate/assistant/cybersun - name = "Syndi Cybersun - Junior Agent" + name = "Cybersun - Junior Agent" id = /obj/item/card/id/cel/syndicate/assistant/cybersun uniform = /obj/item/clothing/under/syndicate/cybersun - shoes = /obj/item/clothing/shoes/jackboots - r_pocket = /obj/item/radio head = /obj/item/clothing/head/soft/cybersun diff --git a/mod_celadon/outfit/code/syndicate/donkco_outfit.dm b/mod_celadon/outfit/code/syndicate/donkco_outfit.dm index 07c72bcb280e..16c360191f60 100644 --- a/mod_celadon/outfit/code/syndicate/donkco_outfit.dm +++ b/mod_celadon/outfit/code/syndicate/donkco_outfit.dm @@ -1,19 +1,17 @@ //MARK: Command /datum/outfit/job/cel/syndicate/quartermaster/donk - name = "Syndi DonkCo - Manager" + name = "DonkCo - Manager" id = /obj/item/card/id/cel/syndicate/command_qm/donkco ears = /obj/item/radio/headset/syndicate/alt uniform = /obj/item/clothing/under/syndicate/donk/qm suit = /obj/item/clothing/suit/hazardvest/donk/qm - ears = /obj/item/radio/headset/syndicate/alt shoes = /obj/item/clothing/shoes/laceup //MARK: Crew /datum/outfit/job/cel/syndicate/cargo_tech/donk - name = "Syndi DonkCo - Customer Associate" - id_assignment = "Customer Associate" + name = "DonkCo - Customer Associate" id = /obj/item/card/id/cel/syndicate/crew/cargo_tech/donkco diff --git a/mod_celadon/outfit/code/syndicate/gec_outfit.dm b/mod_celadon/outfit/code/syndicate/gec_outfit.dm index 9081064f143e..695daebe20a9 100644 --- a/mod_celadon/outfit/code/syndicate/gec_outfit.dm +++ b/mod_celadon/outfit/code/syndicate/gec_outfit.dm @@ -1,7 +1,7 @@ //MARK: Command /datum/outfit/job/cel/syndicate/ce/gec - name = "Syndi GEC - Chief Engineer" + name = "GEC - Chief Engineer" id = /obj/item/card/id/cel/syndicate/command_ce/gec uniform = /obj/item/clothing/under/syndicate/gec/chief_engineer @@ -14,24 +14,15 @@ //MARK: Crew /datum/outfit/job/cel/syndicate/atmos/gec - name = "Syndi GEC - Atmospheric Technician" + name = "GEC - Atmospheric Technician" id = /obj/item/card/id/cel/syndicate/crew/atmos/gec uniform = /obj/item/clothing/under/syndicate/gec/atmos_tech suit = /obj/item/clothing/suit/toggle/hazard head = /obj/item/clothing/head/hardhat -/datum/outfit/job/cel/syndicate/chemist/gec // Не юзается - name = "Syndi GEC - Chemist" - - id = /obj/item/card/id/cel/syndicate/crew/chemist/gec - uniform = /obj/item/clothing/under/syndicate/intern - suit = /obj/item/clothing/suit/toggle/hazard - head = /obj/item/clothing/head/hardhat - belt = /obj/item/storage/belt/utility/full/engi - /datum/outfit/job/cel/syndicate/miner/gec - name = "Syndi GEC - Shaft Miner" + name = "GEC - Shaft Miner" id = /obj/item/card/id/cel/syndicate/crew/miner/gec ears = /obj/item/radio/headset @@ -39,14 +30,12 @@ alt_uniform = null accessory = /obj/item/clothing/accessory/armband/cargo head = /obj/item/clothing/head/soft/black - r_pocket = /obj/item/radio head = /obj/item/clothing/head/hardhat/orange suit = /obj/item/clothing/suit/toggle/industrial suit_store = /obj/item/tank/internals/emergency_oxygen/double /datum/outfit/job/cel/syndicate/engineer/gec - name = "Syndi GEC - Ship Engineer" - id_assignment = "Ship Engineer" + name = "GEC - Mechanic" id = /obj/item/card/id/cel/syndicate/crew/engineer/gec uniform = /obj/item/clothing/under/syndicate/gec @@ -57,8 +46,7 @@ //MARK: Assistant /datum/outfit/job/cel/syndicate/assistant/gec - name = "Syndi GEC - Deckhand" - id_assignment = "Deckhand" + name = "GEC - Deckhand" id = /obj/item/card/id/cel/syndicate/assistant/gec uniform = /obj/item/clothing/under/syndicate diff --git a/mod_celadon/outfit/code/syndicate/gorlex_outfit.dm b/mod_celadon/outfit/code/syndicate/gorlex_outfit.dm index f443e45a1e6a..c73249d39af8 100644 --- a/mod_celadon/outfit/code/syndicate/gorlex_outfit.dm +++ b/mod_celadon/outfit/code/syndicate/gorlex_outfit.dm @@ -1,7 +1,7 @@ //MARK: Captain /datum/outfit/job/cel/syndicate/captain/gorlex - name = "Syndi Gorlex - Captain" + name = "Gorlex - Captain" id = /obj/item/card/id/cel/syndicate/captain/gorlex uniform = /obj/item/clothing/under/syndicate/hardliners/officer @@ -12,69 +12,42 @@ //MARK: Command -/datum/outfit/job/cel/syndicate/ce/gorlex - name = "Syndi Gorlex - Chief Engineer" - - id = /obj/item/card/id/cel/syndicate/command_ce/gorlex - head = /obj/item/clothing/head/hardhat - ears = /obj/item/radio/headset/syndicate/alt - uniform = /obj/item/clothing/under/syndicate/gorlex - shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/color/red/insulated - /datum/outfit/job/cel/syndicate/hos/gorlex - name = "Syndi Gorlex - Sergeant" - id_assignment = "Sergeant" + name = "Gorlex - Squad Leader" id = /obj/item/card/id/cel/syndicate/command_hos/gorlex - uniform = /obj/item/clothing/under/syndicate/hardliners/officer - head = /obj/item/clothing/head/hardliners/peaked - suit = /obj/item/clothing/suit/armor/hardliners/sergeant - shoes = /obj/item/clothing/shoes/combat - -/datum/outfit/job/cel/syndicate/hos/gorlex/lieutenant // Pangolier - name = "Syndi Gorlex - Lieutenant" - id_assignment = null - ears = /obj/item/radio/headset/syndicate/alt - uniform = /obj/item/clothing/under/syndicate/hardliners/officer - suit = null + suit = /obj/item/clothing/suit/toggle/armor/vest/hardliners + shoes = /obj/item/clothing/shoes/combat mask = /obj/item/clothing/mask/breath/facemask glasses = /obj/item/clothing/glasses/hud/security/sunglasses gloves = /obj/item/clothing/gloves/combat head = /obj/item/clothing/head/beret/sec/officer - l_pocket = /obj/item/flashlight/seclite - //MARK: Crew /datum/outfit/job/cel/syndicate/doctor/gorlex - name = "Syndi Gorlex - Medical Doctor" + name = "Gorlex - Field Medic" id = /obj/item/card/id/cel/syndicate/crew/doctor/gorlex - uniform = /obj/item/clothing/under/syndicate/hardliners + ears = /obj/item/radio/headset/syndicate/alt + glasses = /obj/item/clothing/glasses/hud/health/prescription head = /obj/item/clothing/head/hardliners + uniform = /obj/item/clothing/under/syndicate/hardliners suit = /obj/item/clothing/suit/hardliners - glasses = /obj/item/clothing/glasses/hud/health + gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil shoes = /obj/item/clothing/shoes/combat /datum/outfit/job/cel/syndicate/paramedic/gorlex // Не юзается - name = "Syndi Gorlex - Paramedic" + name = "Gorlex - Paramedic" id = /obj/item/card/id/cel/syndicate/crew/doctor/paramedic/gorlex - -/datum/outfit/job/cel/syndicate/security/gorlex - name = "Syndi Gorlex - Trooper" - id_assignment = "Trooper" - job_icon = "securityofficer" - - id = /obj/item/card/id/cel/syndicate/crew/security/gorlex + ears = /obj/item/radio/headset/syndicate/alt uniform = /obj/item/clothing/under/syndicate/hardliners - gloves = /obj/item/clothing/gloves/color/black + gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil shoes = /obj/item/clothing/shoes/combat -/datum/outfit/job/cel/syndicate/security/gorlex/commando // Pangolier - name = "Syndi Gorlex - Commando" - id_assignment = null +/datum/outfit/job/cel/syndicate/security/gorlex + name = "Gorlex - Commando" ears = /obj/item/radio/headset/syndicate/alt uniform = /obj/item/clothing/under/syndicate/hardliners @@ -83,34 +56,22 @@ mask = /obj/item/clothing/mask/breath/facemask head = /obj/item/clothing/head/beret/black - r_pocket = /obj/item/restraints/handcuffs - l_pocket = /obj/item/flashlight/seclite - -/datum/outfit/job/cel/syndicate/security/gorlex/pilot // Не юзается - name = "Syndi Gorlex - Pilot" - id_assignment = "Pilot" - job_icon = "securityofficer" - - id = /obj/item/card/id/cel/syndicate/crew/security/gorlex/pilot - head = /obj/item/clothing/head/helmet/hardliners/swat - /datum/outfit/job/cel/syndicate/miner/gorlex - name = "Syndi Gorlex - Wrecker" - id_assignment = "Wrecker" + name = "Gorlex - Explorer" id = /obj/item/card/id/cel/syndicate/crew/miner/gorlex + ears = /obj/item/radio/headset/syndicate/alt head = /obj/item/clothing/head/hardhat/hardliners suit = /obj/item/clothing/suit/hazardvest/hardliners uniform = /obj/item/clothing/under/syndicate/hardliners/jumpsuit accessory = /obj/item/clothing/accessory/armband/cargo shoes = /obj/item/clothing/shoes/workboots - ears = /obj/item/radio/headset/alt /datum/outfit/job/cel/syndicate/engineer/gorlex - name = "Syndi Gorlex - Mechanic" - id_assignment = "Mechanic" + name = "Gorlex - Field Engineer" id = /obj/item/card/id/cel/syndicate/crew/engineer/gorlex + ears = /obj/item/radio/headset/syndicate/alt head = /obj/item/clothing/head/hardhat/hardliners suit = /obj/item/clothing/suit/hazardvest/hardliners uniform = /obj/item/clothing/under/syndicate/hardliners @@ -120,20 +81,10 @@ //MARK: Assistant /datum/outfit/job/cel/syndicate/assistant/gorlex - name = "Syndi Gorlex - Junior Agent" + name = "Gorlex - Junior Agent" id = /obj/item/card/id/cel/syndicate/assistant/gorlex + ears = /obj/item/radio/headset/syndicate/alt uniform = /obj/item/clothing/under/syndicate/hardliners alt_uniform = /obj/item/clothing/under/syndicate/hardliners/jumpsuit - -/datum/outfit/job/cel/syndicate/assistant/gorlex/operative //Pangolier - name = "Syndi Gorlex - Operative" - id_assignment = null - - uniform = /obj/item/clothing/under/syndicate/hardliners - shoes = /obj/item/clothing/shoes/combat - ears = /obj/item/radio/headset/syndicate gloves = /obj/item/clothing/gloves/color/black - - r_pocket = /obj/item/assembly/flash/handheld - l_pocket = /obj/item/flashlight/seclite diff --git a/mod_celadon/outfit/code/syndicate/suns_outfit.dm b/mod_celadon/outfit/code/syndicate/suns_outfit.dm index e31a5ae2cee6..82f46bf5ca2f 100644 --- a/mod_celadon/outfit/code/syndicate/suns_outfit.dm +++ b/mod_celadon/outfit/code/syndicate/suns_outfit.dm @@ -1,7 +1,7 @@ //MARK: Captain /datum/outfit/job/cel/syndicate/captain/suns - name = "Syndi SUNS - Captain" + name = "SUNS - Captain" faction_icon = "bg_suns" job_icon = "suns_cap" @@ -23,8 +23,7 @@ //MARK: Command /datum/outfit/job/cel/syndicate/cmo/suns - name = "Syndi SUNS - Medical Instructor" - id_assignment = "Medical Instructor" + name = "SUNS - Associate Professor of Medicine" faction_icon = "bg_suns" job_icon = "suns_cmo" @@ -47,8 +46,7 @@ courierbag = /obj/item/storage/backpack/messenger /datum/outfit/job/cel/syndicate/head_of_personnel/suns // Не юзается - name = "Syndi SUNS - Academic Staff" - id_assignment = "Academic Staff" + name = "SUNS - Academic Staff" faction_icon = "bg_suns" job_icon = "suns_hop" @@ -60,7 +58,6 @@ head = /obj/item/clothing/head/suns gloves = /obj/item/clothing/gloves/suns/xo neck = /obj/item/clothing/neck/cloak/suns/xo - r_pocket = null glasses = /obj/item/clothing/glasses/science/suns backpack = /obj/item/storage/backpack @@ -68,39 +65,10 @@ duffelbag = /obj/item/storage/backpack/duffelbag courierbag = /obj/item/storage/backpack/messenger -/datum/outfit/job/cel/syndicate/hos/suns // Не юзается - name = "Syndi SUNS - Senior Peacekeeper" - id_assignment = "Senior Peacekeeper" - faction_icon = "bg_suns" - job_icon = "suns_hos" - - id = /obj/item/card/id/cel/syndicate/command_hos/suns - uniform = /obj/item/clothing/under/syndicate/suns/pkuniform - suit = /obj/item/clothing/suit/armor/vest/suns/hos - belt = /obj/item/melee/sword/sabre/suns/telescopic - gloves = /obj/item/clothing/gloves/tackler/dolphin/suns - shoes = /obj/item/clothing/shoes/combat/suns - head = /obj/item/clothing/head/welding/suns/hos - glasses = /obj/item/clothing/glasses/hud/security/suns - suit_store = /obj/item/gun/ballistic/automatic/powered/gauss/modelh/suns - - backpack = /obj/item/storage/backpack - satchel = /obj/item/storage/backpack/satchel - duffelbag = /obj/item/storage/backpack/duffelbag - courierbag = /obj/item/storage/backpack/messenger - -/datum/outfit/job/cel/syndicate/hos/suns/alt // Не юзается - name = "Syndi SUNS - Senior Peacekeeper Alt" - - id = /obj/item/card/id/cel/syndicate/command_hos/suns/alt - suit = /obj/item/clothing/suit/armor/vest/suns/ehos - head = /obj/item/clothing/head/HoS/syndicate/suns - //MARK: Crew /datum/outfit/job/cel/syndicate/bartender/suns - name = "Syndi SUNS - Student Mixologist" - id_assignment = "Student Mixologist" + name = "SUNS - Student Mixologist" faction_icon = "bg_suns" job_icon = "suns_bartender" @@ -124,8 +92,7 @@ backpack_contents = null /datum/outfit/job/cel/syndicate/botanist/suns - name = "Syndi SUNS - Botanist-Chemist" - id_assignment = "Botanist-Chemist" + name = "SUNS - Botanist-Chemist" faction_icon = "bg_suns" job_icon = "suns_sci" @@ -143,7 +110,7 @@ courierbag = /obj/item/storage/backpack/messenger /datum/outfit/job/cel/syndicate/doctor/suns - name = "Syndi SUNS - Medical Doctor" + name = "SUNS - Medical Doctor" faction_icon = "bg_suns" job_icon = "suns_doctor" @@ -162,7 +129,7 @@ courierbag = /obj/item/storage/backpack/messenger /datum/outfit/job/cel/syndicate/psychologist/suns - name = "Syndi SUNS - Psychologist" + name = "SUNS - Psychologist" faction_icon = "bg_suns" id = /obj/item/card/id/cel/syndicate/crew/doctor/psychologist/suns @@ -179,8 +146,7 @@ courierbag = /obj/item/storage/backpack/messenger /datum/outfit/job/cel/syndicate/security/suns - name = "Syndi SUNS - Peacekeeper" - id_assignment = "Peacekeeper" + name = "SUNS - Peacekeeper" faction_icon = "bg_suns" job_icon = "suns_peacekeeper" @@ -199,8 +165,9 @@ duffelbag = /obj/item/storage/backpack/duffelbag courierbag = /obj/item/storage/backpack/messenger +/* Не используется /datum/outfit/job/cel/syndicate/engineer/suns - name = "Syndi SUNS - Ship Engineer" + name = "SUNS - Ship Engineer" faction_icon = "bg_suns" job_icon = "suns_eng" @@ -218,8 +185,8 @@ duffelbag = /obj/item/storage/backpack/duffelbag courierbag = /obj/item/storage/backpack/messenger -/datum/outfit/job/cel/syndicate/science/suns // Не юзается - name = "Syndi SUNS - Scientist" +/datum/outfit/job/cel/syndicate/science/suns + name = "SUNS - Scientist" faction_icon = "bg_suns" job_icon = "suns_sci" @@ -235,41 +202,12 @@ duffelbag = /obj/item/storage/backpack/duffelbag courierbag = /obj/item/storage/backpack/messenger -/datum/outfit/job/cel/syndicate/security/suns/alternate // Не юзается - name = "Syndi SUNS - Peacekeeper - Casual" - id_assignment = "Peacekeeper" - - id = /obj/item/card/id/cel/syndicate/crew/security/suns/alternate - suit = /obj/item/clothing/suit/toggle/suns/pkcoat - belt = null - head = null - -/datum/outfit/job/cel/syndicate/miner/suns // Не юзается - name = "Syndi SUNS - Miner" - faction_icon = "bg_suns" - job_icon = "suns_miner" - - id = /obj/item/card/id/cel/syndicate/crew/miner - uniform = /obj/item/clothing/under/syndicate/suns/workerjumpsuit - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - shoes = /obj/item/clothing/shoes/jackboots/suns - glasses = null - gloves = null - ears = null - r_pocket = null - l_pocket = null - belt = null - - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/syndie - courierbag = /obj/item/storage/backpack/messenger/sec +*/ //MARK: Assistant /datum/outfit/job/cel/syndicate/assistant/suns - name = "Syndi SUNS - Freshman" - id_assignment = "Freshman" + name = "SUNS - Freshman" faction_icon = "bg_suns" id = /obj/item/card/id/cel/syndicate/assistant/suns @@ -287,8 +225,7 @@ courierbag = /obj/item/storage/backpack/messenger /datum/outfit/job/cel/syndicate/assistant/suns/halfway // не юзается нигде - name = "Syndi SUNS - Junior" - id_assignment = "Junior" + name = "SUNS - Junior" job_icon = "suns_janitor" id = /obj/item/card/id/cel/syndicate/assistant/suns/janitor @@ -296,8 +233,7 @@ alt_uniform = /obj/item/clothing/under/syndicate/suns/uniform2/alt /datum/outfit/job/cel/syndicate/assistant/suns/complete // не юзается нигде - name = "Syndi SUNS - Graduate" - id_assignment = "Graduate" + name = "SUNS - Graduate" id = /obj/item/card/id/cel/syndicate/assistant/suns/graduate uniform = /obj/item/clothing/under/syndicate/suns/uniform3 @@ -306,6 +242,7 @@ //MARK: Patient /datum/outfit/job/cel/syndicate/patient/suns + name = "SUNS - Long Term Patient" faction_icon = "bg_suns" job_icon = "suns_patient" diff --git a/mod_celadon/outfit/code/syndicate/twinkle_outfit.dm b/mod_celadon/outfit/code/syndicate/twinkle_outfit.dm deleted file mode 100644 index d0d05345c9ed..000000000000 --- a/mod_celadon/outfit/code/syndicate/twinkle_outfit.dm +++ /dev/null @@ -1,219 +0,0 @@ -//MARK: Admiral - -/datum/outfit/job/cel/syndicate/captain/twink - name = "Syndi Twinkleshine - Flotilla Admiral (ACLF)" - id_assignment = "Flotilla Admiral" - - id = /obj/item/card/id/cel/syndicate/admiral - uniform = /obj/item/clothing/under/syndicate/ngr/officer - head = null - gloves = /obj/item/clothing/gloves/color/white - shoes = /obj/item/clothing/shoes/combat - ears = /obj/item/radio/headset/syndicate/alt/captain - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - suit = null - belt = null - backpack_contents = null - implants = list(/obj/item/implant/weapons_auth) - -/datum/outfit/job/cel/syndicate/captain/twink/post_equip(mob/living/carbon/human/H) - . = ..() - assign_codename(H) - -//MARK: Command - -/datum/outfit/job/cel/syndicate/hos/twink - name = "Syndi Twinkleshine - Lieutenant" - id_assignment = "Lieutenant" - job_icon = "lieutenant" - - uniform = /obj/item/clothing/under/syndicate/ngr/officer - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - head = null - ears = null - gloves = /obj/item/clothing/gloves/combat - l_pocket = null - r_pocket = null - belt = null - shoes = /obj/item/clothing/shoes/combat - suit = null - suit_store = null - alt_suit = null - implants = list(/obj/item/implant/weapons_auth) - - backpack_contents = null - - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/syndie - courierbag = /obj/item/storage/backpack/messenger/sec - -/datum/outfit/job/cel/syndicate/hos/twink/post_equip(mob/living/carbon/human/H) - . = ..() - assign_codename(H) - -/datum/outfit/job/cel/syndicate/hos/suns/twink // Не юзается ?????? - name = "Syndi Twinkleshine SUNS - Redshield Officer" - id_assignment = "Redshield Officer" - - id = /obj/item/card/id/cel/syndicate/command_hos/suns/twink - suit = null - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - ears = null - head = null - suit_store = null - glasses = null - -/datum/outfit/job/cel/syndicate/hos/suns/twink/post_equip(mob/living/carbon/human/H) - . = ..() - assign_codename(H) - -//MARK: Crew - -/datum/outfit/job/cel/syndicate/bartender/twink - name = "Syndi Twinkleshine DonkCo - Bartender" - - uniform = /obj/item/clothing/under/syndicate/donk - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - suit = null - belt = null - head = null - shoes = /obj/item/clothing/shoes/laceup - gloves = null - ears = null - - - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/syndie - courierbag = /obj/item/storage/backpack/messenger/sec - -/datum/outfit/job/cel/syndicate/bartender/twink/post_equip(mob/living/carbon/human/H) - . = ..() - assign_codename(H) - -/datum/outfit/job/cel/syndicate/paramedic/twink - name = "Syndi Twinkleshine Cybersun - Medic" - - id = /obj/item/card/id/cel/syndicate/crew/doctor/paramedic - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - uniform = /obj/item/clothing/under/rank/medical/doctor/red - belt = null - head = null - gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil - shoes = /obj/item/clothing/shoes/combat - suit = null - alt_suit = null - suit_store = null - ears = null - l_pocket = null - r_pocket = null - implants = list(/obj/item/implant/weapons_auth) - - backpack_contents = null - - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/syndie/med - courierbag = /obj/item/storage/backpack/messenger/sec - -/datum/outfit/job/cel/syndicate/paramedic/twink/post_equip(mob/living/carbon/human/H) - . = ..() - assign_codename(H) - -/datum/outfit/job/cel/syndicate/security/twink - name = "Syndi Twinkleshine - Operative" - - id = /obj/item/card/id/cel/syndicate/crew/security - uniform = /obj/item/clothing/under/syndicate/combat - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - head = null - ears = null - suit = null - belt = null - gloves = /obj/item/clothing/gloves/color/black - shoes = /obj/item/clothing/shoes/combat - l_pocket = null - r_pocket = null - implants = list(/obj/item/implant/weapons_auth) - - backpack_contents = null - - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/syndie - courierbag = /obj/item/storage/backpack/messenger/sec - -/datum/outfit/job/cel/syndicate/security/twink/post_equip(mob/living/carbon/human/H) - . = ..() - assign_codename(H) - -/datum/outfit/job/cel/syndicate/miner/twink - name = "Syndi Twinkleshine - Miner" - - id = /obj/item/card/id/cel/syndicate/crew/miner - uniform = /obj/item/clothing/under/syndicate/suns/workerjumpsuit - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - shoes = /obj/item/clothing/shoes/jackboots/suns - glasses = null - gloves = null - ears = null - r_pocket = null - l_pocket = null - belt = null - - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/syndie - courierbag = /obj/item/storage/backpack/messenger/sec - -/datum/outfit/job/cel/syndicate/miner/twink/post_equip(mob/living/carbon/human/H) - . = ..() - assign_codename(H) - -/datum/outfit/job/cel/syndicate/engineer/twink - name = "Syndi Twinkleshine GEC - Ship Engineer" - - id = /obj/item/card/id/cel/syndicate/crew/engineer - uniform = /obj/item/clothing/under/syndicate/gec - alt_uniform = null - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - ears = null - accessory = null - glasses = null - head = null - gloves = /obj/item/clothing/gloves/tackler/combat - belt = null - shoes = /obj/item/clothing/shoes/combat - suit = null - alt_suit = null - l_pocket = null - r_pocket = null - implants = list(/obj/item/implant/weapons_auth) - -/datum/outfit/job/cel/syndicate/engineer/twink/post_equip(mob/living/carbon/human/H) - . = ..() - assign_codename(H) - -//MARK: Assistant - -/datum/outfit/job/cel/syndicate/assistant/twink - name = "Syndi Twinkleshine - Deck Assistant" - id_assignment = "Deck Assistant" - - uniform = /obj/item/clothing/under/syndicate - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger - belt = null - shoes = /obj/item/clothing/shoes/combat - gloves = null - ears = null - implants = list(/obj/item/implant/weapons_auth) - - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/syndie - courierbag = /obj/item/storage/backpack/messenger/sec - -/datum/outfit/job/cel/syndicate/assistant/twink/post_equip(mob/living/carbon/human/H) - . = ..() - assign_codename(H) From 179eae56b236fe50bdfb9ad535b11cab947efcb9 Mon Sep 17 00:00:00 2001 From: Asuraqami Date: Thu, 21 May 2026 21:29:20 +0700 Subject: [PATCH 2/3] aegis fix --- _maps/_mod_celadon/configs/syndicate_aegis.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/_mod_celadon/configs/syndicate_aegis.json b/_maps/_mod_celadon/configs/syndicate_aegis.json index ebda3653b3ad..46141c416c26 100644 --- a/_maps/_mod_celadon/configs/syndicate_aegis.json +++ b/_maps/_mod_celadon/configs/syndicate_aegis.json @@ -38,7 +38,7 @@ }, "Mechanic": { - "outfit": "/datum/outfit/job/cel/syndicate/engineer/suns", + "outfit": "/datum/outfit/job/cel/syndicate/engineer/gec", "slots": 1 }, From 0426266ab554923566f1f974e35b49c677ec5fcb Mon Sep 17 00:00:00 2001 From: Asuraqami Date: Thu, 21 May 2026 21:40:58 +0700 Subject: [PATCH 3/3] access shit pants --- mod_celadon/outfit/code/syndicate/_outfit.dm | 31 +++++++++++++++++++ .../outfit/code/syndicate/gorlex_outfit.dm | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/mod_celadon/outfit/code/syndicate/_outfit.dm b/mod_celadon/outfit/code/syndicate/_outfit.dm index f6a4c3506fd7..288b71ec5486 100644 --- a/mod_celadon/outfit/code/syndicate/_outfit.dm +++ b/mod_celadon/outfit/code/syndicate/_outfit.dm @@ -13,6 +13,37 @@ duffelbag = /obj/item/storage/backpack/duffelbag/syndie courierbag = /obj/item/storage/backpack/messenger/sec +//generates a codename and assigns syndicate access, used in the twinkleshine. +/datum/outfit/job/cel/syndicate/proc/assign_codename(mob/living/carbon/human/H) + var/obj/item/card/id/I = H.get_idcard() + if(I) + I.registered_name = pick(GLOB.twinkle_names) + "-" + num2text(rand(1, 12)) // squidquest real + I.access |= list(ACCESS_SYNDICATE) + I.update_label() + +/datum/outfit/job/cel/syndicate/proc/get_syndi_general_access(mob/living/carbon/human/H) + var/obj/item/storage/wallet/W = null + for (var/obj/item/O in H.contents) + if (istype(O, /obj/item/storage/wallet)) + W = O + break + if (W) + var/obj/item/card/id/I = null + for (var/obj/item/O in W.contents) + if (istype(O, /obj/item/card/id)) + I = O + break + if (I) + I.access += list(ACCESS_OUTPOST_FACTION_SYNDICATE, ACCESS_OUTPOST_OTHER_DONCO) + I.update_label() + W.combined_access = list() + for (var/obj/item/card/id/card in W.contents) + W.combined_access |= card.access + +/datum/outfit/job/cel/syndicate/post_equip(mob/living/carbon/human/H) + . = ..() + get_syndi_general_access(H) + ////////////////////////////////////////////////////////////////////////////////////////////////////// //MARK: Captain diff --git a/mod_celadon/outfit/code/syndicate/gorlex_outfit.dm b/mod_celadon/outfit/code/syndicate/gorlex_outfit.dm index c73249d39af8..cb712f2f92fd 100644 --- a/mod_celadon/outfit/code/syndicate/gorlex_outfit.dm +++ b/mod_celadon/outfit/code/syndicate/gorlex_outfit.dm @@ -1,7 +1,7 @@ //MARK: Captain /datum/outfit/job/cel/syndicate/captain/gorlex - name = "Gorlex - Captain" + name = "Gorlex - Squad Commander" id = /obj/item/card/id/cel/syndicate/captain/gorlex uniform = /obj/item/clothing/under/syndicate/hardliners/officer