From 07448d05bb301805b73224f15ed4eb55c154f7d5 Mon Sep 17 00:00:00 2001 From: Rinary Date: Wed, 5 Jun 2024 13:00:24 +0300 Subject: [PATCH 01/11] Vulpkanin Lang Fix --- .../Locale/ru-RU/_sunrise/markings/foxes.ftl | 14 ---- .../ru-RU/_sunrise/markings/vulpkanin.ftl | 68 +++++++++++++++++++ 2 files changed, 68 insertions(+), 14 deletions(-) delete mode 100644 Resources/Locale/ru-RU/_sunrise/markings/foxes.ftl create mode 100644 Resources/Locale/ru-RU/_sunrise/markings/vulpkanin.ftl diff --git a/Resources/Locale/ru-RU/_sunrise/markings/foxes.ftl b/Resources/Locale/ru-RU/_sunrise/markings/foxes.ftl deleted file mode 100644 index 8c69e2c0834..00000000000 --- a/Resources/Locale/ru-RU/_sunrise/markings/foxes.ftl +++ /dev/null @@ -1,14 +0,0 @@ -marking-PawSocks-pawsocks = Носки с лапками -marking-PawSocks = Носки с лапками -marking-FoxTail-vulp_tail = Лисий хвост -marking-FoxTail = Лисий хвост -marking-FoxEar-vulp_ear = Лисье ухо (внешний) -marking-FoxEar-vulp_ear_inner = Лисье ухо (внутренний) -marking-FoxEar = Лисье ухо (внутренний) -marking-WolfTail-wolf_tail = Волчий хвост (стандарт) -marking-WolfTail-wolf_tail_inner = Волчий хвост (кончик) -marking-WolfTail = Волчий хвост (кончик) -marking-FoxBelly-vulp_belly-torso = Лисий живот -marking-FoxBelly = Лисий живот -marking-FoxSnout-vulp_face = Лисья морда -marking-FoxSnout = Лисья морда diff --git a/Resources/Locale/ru-RU/_sunrise/markings/vulpkanin.ftl b/Resources/Locale/ru-RU/_sunrise/markings/vulpkanin.ftl new file mode 100644 index 00000000000..c39d3b4fc9a --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/markings/vulpkanin.ftl @@ -0,0 +1,68 @@ +marking-VulpHeadSlash = Голова Вульпканина +marking-VulpHeadTiger = Голова Вульпканина (Тигр) +marking-VulpHeadTigerFace = Голова Вульпканина (Тигриное лицо) + +marking-VulpEar = Уши Вульпканина +marking-VulpEarCoyote = Уши Вульпканина (Койот) +marking-VulpEarDalmatian = Уши Вульпканина (Далматин) +marking-VulpEarFade = Уши Вульпканина (Плавный переход) +marking-VulpEarFennec = Уши Вульпканина (Фенек) +marking-VulpEarFox = Уши Вульпканина (Лиса) +marking-VulpEarJackal = Уши Вульпканина (Шакал) +marking-VulpEarOtie = Уши Вульпканина (Оти) +marking-VulpEarSharp = Уши Вульпканина (Острые) +marking-VulpEarShock = Уни Вульпканина (Узкие) +marking-VulpEarTajaran = Уши Вульпканина (Таджаран) +marking-VulpEarTerrier = Уши Вульпканина (Терьер) +marking-VulpEarWolf = Уши Вульпканина (Волк) + +marking-VulpSnout = Морда Вульпканина +marking-VulpSnoutAlt = Морда Вульпканина (альтернативная) +marking-VulpSnoutBlaze = Морда Вульпканина (Пятно) +marking-VulpSnoutFade = Морда Вульпканина (Плавный переход) +marking-VulpSnoutMask = Морда Вульпканина (Маска) +marking-VulpSnoutNose = Морда Вульпканина (Нос) +marking-VulpSnoutPatch = Морда Вульпканина (Патч) +marking-VulpSnoutSharp = Морда Вульпканина (Щетина) +marking-VulpSnoutSwift = Морда Вульпканина (Скулы) +marking-VulpSnoutVulpine = Морда Вульпканина (Лисья) + +marking-VulpBellyCrest = Живот Вульпканина (Гребень) +marking-VulpBellyFox = Живот Вульпканина (Лиса) +marking-VulpBellyFull = Живот Вульпканина (Полный) + +marking-VulpPointsCrestArms = Лапы Вульпканина (Локоть) +marking-VulpPointsFadeArms = Лапы Вульпканина (Плавный Переход) +marking-VulpPointsSharpArms = Лапы Вульпканина (Затемнение) + +marking-VulpPointsCrestLegs = Ноги Вульпканина +marking-VulpPointsFadeLegs = Ноги Вульпканина (Плавный Переход) +marking-VulpPointsSharpLegs = Ноги Вульпканина (Затемнение) + +marking-VulpTail = Хвост Вульпканина +marking-VulpTailAlt = Хвост Вульпканина (Альтернативный) +marking-VulpTailAltTip = Хвост Вульпканина (Альтернативный, Кончик) +marking-VulpTailBushy = Хвост Вульпканина (Закрученый) +marking-VulpTailBushyWag = Хвост Вульпканина (Закрученый, Виляющий) +marking-VulpTailCorgiWag = Хвост Вульпканина (Корги, Виляющий) +marking-VulpTailCoyote = Хвост Вульпканина (Койот) +marking-VulpTailCoyoteWag = Хвост Вульпканина (Койот, Виляющий) +marking-VulpTailDalmatianWag = Хвост Вульпканина (Далматин, Виляющий) +marking-VulpTailFennec = Хвост Вульпканина (Фенек) +marking-VulpTailFluffy = Хвост Вульпканина (Пушистый) +marking-VulpTailFox = Хвост Вульпканина (Лиса) +marking-VulpTailFox2 = Хвост Вульпканина (Лиса, второй вариант +marking-VulpTailFox3 =Хвост Вульпканина (Лиса, третий вариант) +marking-VulpTailFoxTip = Хвост Вульпканина (Лиса, Кончик) +marking-VulpTailFoxWag = Хвост Вульпканина (Лиса, Виляющий) +marking-VulpTailFoxWagTip = Хвост Вульпканина (Лиса, Виляющий, Кончик) +marking-VulpTailHusky = Хвост Вульпканина (Хаски) +marking-VulpTailHuskyAlt = Хвост Вульпканина (Хаски, Альтернативный) +marking-VulpTailLong = Хвост Вульпканина (Длинный) +marking-VulpTailOtie = Хвост Вульпканина (Оти) +marking-VulpTailTip = Хвост Вульпканина (Кончик) +marking-VulpTailWag = Хвост Вульпканина (Виляющий) +marking-VulpTailWagTip = Хвост Вульпканина (Виляющий, Кончик) + +marking-VulpPointsFeet = Лапы Вульпканина +marking-VulpPointsHands = Руки Вульпканина \ No newline at end of file From f4b74911d17037cbb14d28111eabde08b11cdfb8 Mon Sep 17 00:00:00 2001 From: Rinary Date: Wed, 5 Jun 2024 21:05:02 +0300 Subject: [PATCH 02/11] Blueshield --- .../Locale/en-US/_sunrise/job/job-names.ftl | 1 + .../Locale/en-US/_sunrise/job/nyano-desc.ftl | 1 + .../Locale/ru-RU/_sunrise/job/job-names.ftl | 1 + .../Locale/ru-RU/_sunrise/job/nyano-desc.ftl | 1 + .../catalog/fills/locker/suit_storage.ftl | 3 + .../catalog/fills/locker/wardrobe_job.ftl | 3 + .../entities/clothing/eyes/glasses.ftl | 2 + .../clothing/head/hardsuit-helmets.ftl | 2 + .../entities/clothing/masks/masks.ftl | 2 + .../clothing/outerclothing/hardsuits.ftl | 2 + .../entities/markers/spawners/jobs.ftl | 2 + .../_sunrise/entities/objects/devices/pda.ftl | 2 + .../objects/misc/identification_cards.ftl | 2 + Resources/Prototypes/Access/misc.yml | 1 + .../Prototypes/Roles/Jobs/departments.yml | 1 + .../Prototypes/_Sunrise/Access/service.yml | 3 + .../Catalog/Fills/Locker/suit_storage.yml | 13 ++++ .../Catalog/Fills/Locker/wardrobe_job.yml | 14 +++++ .../Entities/Clothing/Eyes/glasses.yml | 21 +++++++ .../Clothing/Head/hardsuit-helmets.yml | 16 +++++ .../Entities/Clothing/Masks/masks.yml | 10 +++ .../Clothing/OuterClothing/hardsuits.yml | 26 ++++++++ .../Entities/Markers/Spawners/jobs.yml | 13 ++++ .../_Sunrise/Entities/Objects/Devices/pda.yml | 19 ++++++ .../Objects/Misc/identification_cards.yml | 12 ++++ .../Storage/Closets/Lockers/lockers.yml | 27 ++++++++ .../Roles/Jobs/Civilian/Blueshield.yml | 59 ++++++++++++++++++ .../_Sunrise/Roles/play_time_trackers.yml | 3 + .../Prototypes/_Sunrise/StatusEffects/job.yml | 7 +++ .../Misc/job_icons.rsi/blueshield.png | Bin 0 -> 205 bytes .../Interface/Misc/job_icons.rsi/meta.json | 5 +- .../Misc/id_cards.rsi/idblueshield.png | Bin 0 -> 238 bytes .../Objects/Misc/id_cards.rsi/meta.json | 5 +- .../sunglasseshudmed.rsi/equipped-EYES.png | Bin 0 -> 301 bytes .../Glasses/sunglasseshudmed.rsi/icon.png | Bin 0 -> 180 bytes .../sunglasseshudmed.rsi/inhand-left.png | Bin 0 -> 197 bytes .../sunglasseshudmed.rsi/inhand-right.png | Bin 0 -> 201 bytes .../Glasses/sunglasseshudmed.rsi/meta.json | 26 ++++++++ .../hardsuits/blueshield.rsi/icon-flash.png | Bin 0 -> 577 bytes .../Head/hardsuits/blueshield.rsi/icon.png | Bin 0 -> 242 bytes .../Head/hardsuits/blueshield.rsi/meta.json | 25 ++++++++ .../blueshield.rsi/off-equipped-HELMET.png | Bin 0 -> 624 bytes .../blueshield.rsi/on-equipped-HELMET.png | Bin 0 -> 704 bytes .../Mask/swat_blue.rsi/equipped-MASK-digi.png | Bin 0 -> 775 bytes .../Mask/swat_blue.rsi/equipped-MASK.png | Bin 0 -> 714 bytes .../Clothing/Mask/swat_blue.rsi/icon.png | Bin 0 -> 407 bytes .../Mask/swat_blue.rsi/inhand-left.png | Bin 0 -> 435 bytes .../Mask/swat_blue.rsi/inhand-right.png | Bin 0 -> 456 bytes .../Clothing/Mask/swat_blue.rsi/meta.json | 30 +++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 1522 bytes .../blueshield_hardsuit.rsi/icon.png | Bin 0 -> 301 bytes .../blueshield_hardsuit.rsi/inhand-left.png | Bin 0 -> 109 bytes .../blueshield_hardsuit.rsi/inhand-right.png | Bin 0 -> 109 bytes .../blueshield_hardsuit.rsi/meta.json | 26 ++++++++ .../_Sunrise/Markers/jobs.rsi/blueshield.png | Bin 0 -> 1053 bytes .../_Sunrise/Markers/jobs.rsi/green.png | Bin 0 -> 309 bytes .../_Sunrise/Markers/jobs.rsi/jobicon.png | Bin 0 -> 226 bytes .../_Sunrise/Markers/jobs.rsi/meta.json | 20 ++++++ .../Structures/Storage/closet.rsi/bs.png | Bin 0 -> 319 bytes .../Structures/Storage/closet.rsi/bs_door.png | Bin 0 -> 296 bytes .../Structures/Storage/closet.rsi/bs_open.png | Bin 0 -> 231 bytes .../Structures/Storage/closet.rsi/locked.png | Bin 0 -> 127 bytes .../Structures/Storage/closet.rsi/meta.json | 32 ++++++++++ .../Storage/closet.rsi/sparking.png | Bin 0 -> 166 bytes .../Storage/closet.rsi/unlocked.png | Bin 0 -> 127 bytes .../Structures/Storage/closet.rsi/welded.png | Bin 0 -> 206 bytes 66 files changed, 436 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/en-US/_sunrise/job/job-names.ftl create mode 100644 Resources/Locale/en-US/_sunrise/job/nyano-desc.ftl create mode 100644 Resources/Locale/ru-RU/_sunrise/job/job-names.ftl create mode 100644 Resources/Locale/ru-RU/_sunrise/job/nyano-desc.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/catalog/fills/locker/suit_storage.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/catalog/fills/locker/wardrobe_job.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/eyes/glasses.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/head/hardsuit-helmets.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/masks/masks.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/outerclothing/hardsuits.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl create mode 100644 Resources/Prototypes/_Sunrise/Access/service.yml create mode 100644 Resources/Prototypes/_Sunrise/Catalog/Fills/Locker/suit_storage.yml create mode 100644 Resources/Prototypes/_Sunrise/Catalog/Fills/Locker/wardrobe_job.yml create mode 100644 Resources/Prototypes/_Sunrise/Entities/Clothing/Masks/masks.yml create mode 100644 Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml create mode 100644 Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml create mode 100644 Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Blueshield.yml create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/blueshield.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idblueshield.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon-flash.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/off-equipped-HELMET.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/on-equipped-HELMET.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/equipped-MASK-digi.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/equipped-MASK.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Markers/jobs.rsi/blueshield.png create mode 100644 Resources/Textures/_Sunrise/Markers/jobs.rsi/green.png create mode 100644 Resources/Textures/_Sunrise/Markers/jobs.rsi/jobicon.png create mode 100644 Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs.png create mode 100644 Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs_door.png create mode 100644 Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs_open.png create mode 100644 Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/locked.png create mode 100644 Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/sparking.png create mode 100644 Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/unlocked.png create mode 100644 Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/welded.png diff --git a/Resources/Locale/en-US/_sunrise/job/job-names.ftl b/Resources/Locale/en-US/_sunrise/job/job-names.ftl new file mode 100644 index 00000000000..9853a197555 --- /dev/null +++ b/Resources/Locale/en-US/_sunrise/job/job-names.ftl @@ -0,0 +1 @@ +job-name-blueshield = Blueshield \ No newline at end of file diff --git a/Resources/Locale/en-US/_sunrise/job/nyano-desc.ftl b/Resources/Locale/en-US/_sunrise/job/nyano-desc.ftl new file mode 100644 index 00000000000..6dcda39cfa8 --- /dev/null +++ b/Resources/Locale/en-US/_sunrise/job/nyano-desc.ftl @@ -0,0 +1 @@ +job-description-blueshield = Your task is to protect and save the head and captain, you demonstrate order, courage and firmness at this station. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl b/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl new file mode 100644 index 00000000000..70cd75fef05 --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl @@ -0,0 +1 @@ +job-name-blueshield = Офицер Синий Щит \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_sunrise/job/nyano-desc.ftl b/Resources/Locale/ru-RU/_sunrise/job/nyano-desc.ftl new file mode 100644 index 00000000000..587139a187d --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/job/nyano-desc.ftl @@ -0,0 +1 @@ +job-description-blueshield = Ваша задача охранять и спасать глав и капитана, вы показатель порядка, смелости и крепкости на этой станции. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/catalog/fills/locker/suit_storage.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/catalog/fills/locker/suit_storage.ftl new file mode 100644 index 00000000000..7ce07824c7a --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/catalog/fills/locker/suit_storage.ftl @@ -0,0 +1,3 @@ +ent-SuitStorageBlueshield = { ent-SuitStorageBase } + .suffix = Blueshield + .desc = { ent-SuitStorageBase.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/catalog/fills/locker/wardrobe_job.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/catalog/fills/locker/wardrobe_job.ftl new file mode 100644 index 00000000000..ecab61d63e9 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/catalog/fills/locker/wardrobe_job.ftl @@ -0,0 +1,3 @@ +ent-WardrobeBlueshieldFilled = { ent-LockerBlueShield } + .desc = { ent-LockerBlueShield.desc } + .suffix = Filled \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/eyes/glasses.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/eyes/glasses.ftl new file mode 100644 index 00000000000..094349baf5a --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/eyes/glasses.ftl @@ -0,0 +1,2 @@ +ent-ClothingEyesGlassesSunglassesMed = медецинские Солнцезащитные очки + .desc = Солнцезащитные очки с медецинским визором \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/head/hardsuit-helmets.ftl new file mode 100644 index 00000000000..30d92ff20dd --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/head/hardsuit-helmets.ftl @@ -0,0 +1,2 @@ +ent-ClothingHeadHelmetHardsuitBlueshield = Шлем скафандра синего щита + .desc = Усиленный Шлем Скафандра, сделан для синего щита \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/masks/masks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/masks/masks.ftl new file mode 100644 index 00000000000..287b71dd00b --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/masks/masks.ftl @@ -0,0 +1,2 @@ +ent-ClothingMaskGasBlueSwat = Синий противогаз спецназа + .desc = Элитный противогаз Службы безопасности. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/outerclothing/hardsuits.ftl new file mode 100644 index 00000000000..d0c98ab8391 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/outerclothing/hardsuits.ftl @@ -0,0 +1,2 @@ +ent-ClothingOuterHardsuitBlueshield = Скафандр Синего Щита + .desc = Бронированный Скафандр, Сделанный для Синего Щита. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl new file mode 100644 index 00000000000..0790c31e3f1 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl @@ -0,0 +1,2 @@ +ent-SpawnPointBlueshield = Синий Щит + .desc = { ent-SpawnPointJobBase.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl new file mode 100644 index 00000000000..5cfb9f85f36 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl @@ -0,0 +1,2 @@ +ent-BlueshieldPDA = КПК Синего щита + .desc = { ent-CaptainPDA.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl new file mode 100644 index 00000000000..6c9a22da559 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl @@ -0,0 +1,2 @@ +ent-BlueshieldIDCard = ID карта Синего Щита + .desc = { ent-IDCardStandard.desc } \ No newline at end of file diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index f79f1779c22..07f84c557ef 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -32,3 +32,4 @@ - Chapel - Hydroponics - Atmospherics + - Blueshield diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 8ea3e363a6e..42d8cab3289 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -13,6 +13,7 @@ color: "#9FED58" weight: -10 roles: + - Blueshield #_sunrise - Bartender - Borg - Botanist diff --git a/Resources/Prototypes/_Sunrise/Access/service.yml b/Resources/Prototypes/_Sunrise/Access/service.yml new file mode 100644 index 00000000000..50f981b6483 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Access/service.yml @@ -0,0 +1,3 @@ +- type: accessLevel + id: Blueshield + name: id-card-access-level-blueshield \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Locker/suit_storage.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Locker/suit_storage.yml new file mode 100644 index 00000000000..d311516910b --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Locker/suit_storage.yml @@ -0,0 +1,13 @@ +- type: entity + id: SuitStorageBlueshield + parent: SuitStorageBase + suffix: Blueshield + components: + - type: StorageFill + contents: + - id: NitrogenTankFilled + - id: OxygenTankFilled + - id: ClothingOuterHardsuitBlueshield + - id: ClothingMaskGasSecurity + - type: AccessReader + access: [["Blueshield"]] \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Locker/wardrobe_job.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Locker/wardrobe_job.yml new file mode 100644 index 00000000000..536075ca09e --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Locker/wardrobe_job.yml @@ -0,0 +1,14 @@ + - type: entity + id: WardrobeBlueshieldFilled + suffix: Filled + parent: LockerBlueShield + components: + - type: StorageFill + contents: + - id: BriefcaseBrown + - id: ClothingBeltSecurityFilled + - id: MedkitAdvancedFilled + - id: ClothingMaskGasSecurity + - id: FlashlightSeclite + - id: HandheldCrewMonitor + - id: ClothingMaskGasBlueSwat \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml index f25c2fdd953..c892d824c63 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml @@ -19,3 +19,24 @@ sprite: _Sunrise/Clothing/Eyes/Glasses/kim.rsi - type: Clothing sprite: _Sunrise/Clothing/Eyes/Glasses/kim.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesSunglassesMed + name: medical HUDSunglasses + description: Sunglasses with a medical HUD. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi + - type: FlashImmunity + - type: EyeProtection + protectionTime: 5 + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon + - type: ShowHealthIcons + damageContainers: + - Biological diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml index 22172f8352b..cea53320567 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml @@ -39,3 +39,19 @@ Shock: 0.1 Cold: 0.2 Radiation: 0.2 + +#Blueshield Hardsuit +- type: entity + parent: ClothingHeadHelmetHardsuitSecurity + id: ClothingHeadHelmetHardsuitBlueshield + noSpawn: true + name: Blueshield's hardsuit helmet + description: Strong hardsuit helmet, made for the blueshield. + components: + - type: PointLight + color: "#daffad" + - type: BreathMask + - type: Sprite + sprite: Backmen/Clothing/Head/Hardsuits/blueshield.rsi + - type: Clothing + sprite: Backmen/Clothing/Head/Hardsuits/blueshield.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Masks/masks.yml new file mode 100644 index 00000000000..19b392f5910 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Masks/masks.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingMaskGasExplorer + id: ClothingMaskGasBlueSwat + name: swat blue gas mask + description: A elite issue Security gas mask. + components: + - type: Sprite + sprite: Clothing/Mask/swat_blue.rsi + - type: Clothing + sprite: Clothing/Mask/swat_blue.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml index 9eba9f5df70..c899a1cd9fa 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml @@ -30,3 +30,29 @@ damageCoefficient: 0.7 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetCBURNLeader + +#Blueshield Hardsuit +- type: entity + parent: ClothingOuterHardsuitCap + id: ClothingOuterHardsuitBlueshield + name: blueshield's armored spacesuit + description: Armored spacesuit, made for the blueshield. + components: + - type: Sprite + sprite: Backmen/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi + - type: Clothing + sprite: Backmen/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi + - type: ExplosionResistance + damageCoefficient: 0.4 + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.5 + Heat: 0.3 + Radiation: 0.4 + Caustic: 0.5 + Stun: 0.4 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitBlueshield diff --git a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml new file mode 100644 index 00000000000..bb7c9c1507f --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml @@ -0,0 +1,13 @@ +- type: entity + id: SpawnPointBlueshield + parent: SpawnPointJobBase + name: Blueshield + components: + - type: SpawnPoint + job_id: Blueshield + - type: Sprite + sprite: Backmen/Markers/jobs.rsi + layers: + - state: green + - state: blueshield + - state: jobicon \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml index f72b10c0a43..dff8022d781 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml @@ -11,3 +11,22 @@ borderColor: "#6f6192" - type: Icon state: pda-lawyer + +- type: entity + parent: CaptainPDA + id: BlueshieldPDA + name: blueshield PDA + components: + - type: Pda + id: BlueshieldIDCard + state: pda-captain + penSlot: + startingItem: Pen + priority: -1 + whitelist: + tags: + - Write + - type: PdaBorderColor + borderColor: "#7C5D00" + - type: Icon + state: pda-captain \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml index cbdbc0e6227..684ff8fde44 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml @@ -9,3 +9,15 @@ - state: idiaa - type: PresetIdCard job: IAA + +- type: entity + parent: IDCardStandard + id: BlueshieldIDCard + name: Blueshield ID Card + components: + - type: Sprite + layers: + - state: silver + - state: idblueshield + - type: PresetIdCard + job: Blueshield \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml new file mode 100644 index 00000000000..3bfbd060277 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -0,0 +1,27 @@ +- type: entity + id: LockerBlueShield + parent: LockerBaseSecure + name: blueshield's locker + components: + - type: Sprite + noRot: true + netsync: false + sprite: Backmen/Structures/Storage/closet.rsi + layers: + - state: bs + map: ["enum.StorageVisualLayers.Base"] + - state: bs_door + map: ["enum.StorageVisualLayers.Door"] + - state: locked + map: ["enum.StorageVisualLayers.Lock"] + shader: unshaded + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: bs + stateDoorOpen: bs_open + stateDoorClosed: bs_door + - type: AccessReader + access: [["Blueshield"]] \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Blueshield.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Blueshield.yml new file mode 100644 index 00000000000..ff712ca7be4 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Blueshield.yml @@ -0,0 +1,59 @@ +- type: job + id: Blueshield + name: job-name-blueshield + description: job-description-blueshield + playTimeTracker: JobBlueshield + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 180000 #50 hrs + - !type:DepartmentTimeRequirement + department: Command + time: 180000 #50 hrs + - !type:OverallPlaytimeRequirement + time: 900000 #250 hrs + startingGear: BlueshieldGear + icon: "JobIconBlueshield" + supervisors: job-supervisors-service + canBeAntag: false + setPreference: true + access: + - Blueshield + - Maintenance + - Command + - Service + - External + - Brig + - Security + - Medical + extendedAccess: + - Hydroponics + minBankBalance: 300 + maxBankBalance: 500 + wageDepartment: Civilian + wage: 80 + special: + - !type:AddComponentSpecial + components: + - type: PsionicBonusChance + flatBonus: 0.025 + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + - !type:AddComponentSpecial + components: + - type: CommandStaff + +- type: startingGear + id: BlueshieldGear + equipment: + jumpsuit: BlueshieldUniformSuit + back: ClothingBackpackFilled + shoes: ClothingShoesBootsNedoSpetsnaz + eyes: ClothingEyesGlassesSunglassesMed + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterArmorBlueshieldCarapace + id: BlueshieldPDA + ears: ClothingHeadsetAltCommand + innerClothingSkirt: BlueshieldUniformSuit + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml index a6fbbfbb1a8..07e428e69db 100644 --- a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml @@ -1,2 +1,5 @@ - type: playTimeTracker id: JobIAA + +- type: playTimeTracker + id: JobBlueshield \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/StatusEffects/job.yml b/Resources/Prototypes/_Sunrise/StatusEffects/job.yml index db9c13c057f..ee03834b4de 100644 --- a/Resources/Prototypes/_Sunrise/StatusEffects/job.yml +++ b/Resources/Prototypes/_Sunrise/StatusEffects/job.yml @@ -4,3 +4,10 @@ icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: IAA + +- type: statusIcon + parent: JobIcon + id: JobIconBlueshield + icon: + sprite: Interface/Misc/job_icons.rsi + state: blueshield \ No newline at end of file diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/blueshield.png b/Resources/Textures/Interface/Misc/job_icons.rsi/blueshield.png new file mode 100644 index 0000000000000000000000000000000000000000..edc7da2352d665081b018d45e0ac9a95ca8a178f GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|+C5zyLnNjq z|M~ylesM&==l%KN-wg^fcN-{Nj?a@zNqQ2t`M3Uq8RrfF!G{z#5oRE0_Bm$61_W*K z>)#m}bg-HIJYIPYwYzt3Sq+|b}DXo%=z%;;-WVP9Yxx-o;TTjjXMDxUnb(nj;~ pZ}(KpeEIiL&C7IWVVL0z)BUvH`TjU|wUQkq|d7eLnyI literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a4dac5bec1bd3dd70575c73c9db1521f9ea454b0 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*8>L*XlZFN?BDNK`j3I( z83V&?28Ij<1{(&3{T?13JCubbfhrkGg8YIR9G=}s19DtET^vI+CMG9H6gmVOEZ?Ln`LH zy=BOC*no#M;OTHMY_MlIE$=azaUVdB0d-vS$BL&M>ykGV{@mK9T`@9$LtDGhN8iMozf%mN4 q-5)si-*$~S@I&v=q!tE-3lEt#t+AQT>iy&fNP(xTpUXO@geCxy@lbaF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..feaa25730ab3f10282cf63adc787e1eec3ad9bb8 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|nmt_{Ln`LH zy=5qLNI`%#;GIj~gpV3B+Sj+laGz0WwVLI~d!|~H_ssu*O`42A^$h(}cj#RIQQj4v zweOPJ<0-{!mcFjaEB|qQibrOj=JN>s#cBU9Y+KoW>HL)6i{Jj<^YB7%X~LB_kWL1M u1Lx<|=Pg)i_nb{iGCA*o!vEJm2kc~AdC+G1(wR){ASIrzelF{r5}E*;flqY+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/meta.json new file mode 100644 index 00000000000..541bdfbedca --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon-flash.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon-flash.png new file mode 100644 index 0000000000000000000000000000000000000000..6248083a8f25ffb41aeca5e695129f5034d27445 GIT binary patch literal 577 zcmV-H0>1r;P)Px$`$(iYJY9oWs`uJLcPW|I9$OV#ejNfvOf~YC>4}eitBK zCXLJnbj^s%Wdi`;@6MPQiSz2k11@|c=GGk>pyM0@^OMMAK-Y{IAPBAiC=}$e;3PqC z#o*UA06%_q1i;?C^+sCng;6EqnpR3Z_x#yS{ppkYL{Y?J^C19Vn%~*0?buvjHefc1 z)C6?Rh)vVPaU4AFJk>xL$^b-BlzMKOR0D0#U1K!eiIL*%&und0shDjF+d2S2ug#~A zI)h;oc*(B13w#5>s%^aC`f~0JtS@pnGBIXrvx;UwKhz0&ZGv8#eyF1vH?>Ku`dxcb z|IA;3supRr6x^@`oR3W;crLhMiT58AgeY?1A7j<_8;kb9!UPg*`vf5@BuQZ~Y~s0a z+NyKfs^hsZ7&eh41tBbK`y^}I?5j8#NL4Lzbo6yBmYD1JLk6FMi=32kV P00000NkvXXu0mjf{(u0G literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8f5ef2b43ba1e515b410939e5521c561ec228735 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#Q>iW*8>L*C@ZOj1P9pJ+DnK_ z>gyS6%HAg2)Xl+^mDvx|d~EnQU6Rb8drV1oqPY%XQZgoFYf lGf~HnGTq(WT}_Sb46Zz4ZZlUMoB(tRgQu&X%Q~loCIAh@QGx&f literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/meta.json new file mode 100644 index 00000000000..154d0219e9f --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "#Sunrise Rinary1(Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/off-equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..665a5194a7a2d4699c7b85b25d1132044a4d55f5 GIT binary patch literal 624 zcmV-$0+0QPP)Px%DoI2^RCt{2nlX#pFdW5SLbo)5EOs2zB>@?-dCKBX(zTzfYd=EQE?GKdJ2*kR z6rImr0&&G19K;=hTwQvhkpR`BT!=PJle5>ADuZ@{tsh0xZoIB{-uf4JfLZy?=IhxxMX?3~ zb%J?#DJ6susOue~Xxcrzl(L)WqVH7bEKb_dXpG757I6a1Q{YYkRSE158MJP2UzNc+ zz~}>j-HA$-0N|xRbeTLFjgjXo><<~L68QXO-aUMtuV9J`h0zC&Z`}Lm9UifKi5`SYx}*o{tB_)`{bJH(phD-ulk%I*XGQ0E7@2Pu`;0|LopE$o4Gs#c;B|_2e8@vc85=Ea=|MgVJ9`BXo~Ij29x0}_J<5WxWmvKen!i*zNtm2(%Gza z3P=D)kKXJ*rOM8iHwA^p1T;)mz^=t7AKh8A%qY@2qAdkYObepkt>10000< KMNUMnLSTY74k3a7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/on-equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..dea2e50e3dfa1fde388b1e21c80d3b214f651a31 GIT binary patch literal 704 zcmV;x0zdtUP)Px%dPzhOtA8$)&LC(n2BYA zR$EnzA%p+`IF74z9JD4{_x#*(TvRK&@O+@bfKddDV<4Hf@ap+GIyatKI|ltXck`Qf zdH?{%d^H|LF#sUTQv4XlTKQTpmb)Mfhp1L|5vL9K?g+`W1vzf>9w_E#S*pez$2HE^ zx&*T<#bmNS3wK)Rbgm!_TgS&OD&}}zLyeEeBjbGSPpj_vIRJ3Z;a1NhO@6BLr@Q@3 z$ozRs@{K1f?*o%_M+hN=5JCtcgb+dqA%u`KQCfchu)H3DGV_i417u;cR$B#tV!7IS zk3iY^M*RWB@Z#^LHF}f$CtDX0hC_tm@KpKQr*B_y|Ir6kn>5MS zUI5OyYD^G9px7_KE&wlHuUI_-w>R@V`VMS8xQC5f+W=;T+Txt7E`Z~>V9bXQLIuly zfn?eOVDB=N+goM@L0kRPoO47`tX-_tx&we&jb3(SL{Y5j@^V791wk9h^mk7}aV{qP z0a^ln`VqD(<0000Px%!AV3xRCt{2nz3%%Fc5}+7aizHE(%ae27+6%2pTo&jq(5n(yOVWTy#AHgb{XKERM5!S~-C>64*5fOy|5QomT1r4Q$A+a}xj*ZLn* z#jmfgad~-({eBMs{+vm8P5lok;>+a{!!TgK-(wgCESJlp6`7N=EPYWF01$#lQ54Dg z(K|qE4aOKA9v)z=9gohr6#Zzl*5mnVwZbqAP)Z$Lk0ELYge>>{E!y@5N-4DM4f_7} z=>A*;`_@`0rN-c`waNNX2?#=uVt1(P8fAI++xv51twmK;aL&P6i~IZgaraeKm82h4 zI5_8CN(rSDvMhtOc03kEfv)RdjG3(%a?X98=TClej4@bCDJ7~b!*;ukHTlPAtx;7KzFAvzU5BQwvDs|E7{hM2OX^TZ7p!R~ zm@x+D+_($EkVLR+jEQ#W1zi9b2Q&bT+S9;e2PC5B1B@|?@CgotN7CFABF30SD86-F zkHJrUnoIjxgb@DpPs#tROArJ>5ClOG1VIo4K@h~-<`)QbpZfE>lYjsK002ovPDHLk FV1oR{We@-W literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/equipped-MASK.png b/Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..f4d41e90070f301842f71b9a8b3084fb96133140 GIT binary patch literal 714 zcmV;*0yX`KP)Px%gh@m}RCt{2nz63hFcgM=st#rflZhBCZ?Hs+9`g*m$bA8H$G*UQD@K$l8)QHZ zlRe?h9l$Q6RaILz-1hc-OCkdP&pCD+l>Y$4|IH-#hgDViaNaac_BbD{|20>9wOV1Z zSm1Oz0f2vI5#Ce(OOE(-I)yO?r_%|>7)+)}n3Oxcb)Xb(Vh8#=$xFQc7s8 zQ4|HNweeV%B@TxJ&gb)Jn<3}i&*$@>ZaKynilRW@_sROn!3rUK5SLQoa5%&ux~?1j zNf7k!6Xl%yT>a#yfO8IYT?0T&zOL)1ZGv6bO@_04KA$JgD1L-u@SDvh+T+HU zZ2jZ{gye@tq*5w7h*bTMyfG%mahs52{iHA7Cm(FF0Amcm__sn>`a>&DN{ON<(6((- z49P1Xc=J+90Ju5A-v9udZ&Qa$=4y=o&-|Cx~^lPgDrj^Q>sau`4&nk?Du;B z!0~v@a;TH<*Lx?JF$U*cTm@q{N!&MR0EpW6iI3hOF${=C5ClOG1VIo4K@bE%5dSvc0fpm_&-N|ZPx$QAtEWR9J=Wl_77#FcgHpP6IEf%&`irGLx|a|G47)ox$-8Fdq9_>mqp4vS;(l%` zl4c-;KnMX5iGoE@FbqR{`w&73W%>|`2u)*v7hs1{d%S-IK7db*X_8FLo`LCb{fGmX zb$6-XyZ?72C!n9|d&&U;1|I4Iw6E$yYv%QO4LPa0(Bu6zCKdU@xbt68nfGUb9=W`<1I zY9{W=xK!lSrXw#)oO%SGf0n%c_S>`P5!ss!*-|6RuA9y7y-^vxKFIN2b;}1@wR-wd!z6_)hLE!o;k%D zT}=0?b;P(Wp0hn)n*H@x>jbrLLOhCR<`hThO@FaovBmNK?Qi?01bv^$vbOZy`v1E9 z9SD%I>0R!@?sM!tzDaV9d+ytby{v3Gx$_Ixb;*e5t5)s$yVmx|$uO_%xz9iUER|b$ zEN}bnbIMC*TV0x5$1ailVDIs|{q5i7j?GAy&y0zBeaFQ2-TL!(mtR=eJGgxR!T2&| W(XCC!M}Yy)z~JfX=d#Wzp$P!4&dA{a literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c7a6d122cfe021c7fb5fe348f81081f4573c1fda GIT binary patch literal 456 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zn><|{Ln`LH zy=9o!Y#_nr&M6eU1n!}FN*d)LelRQGSHVP_CI z$~J#~J_CbdT)THQyJAb#!8yer?v>xW|C19aRXNXjrTCMd>`6TqTid*c@0oR(^N>%F`M z|F7Q+AAav~>bR0~JTI%VvjYw?l$LEtU*MaaxyHBng4fEE{)c=^H?MprDRE}!y=}e+ z%tT!S=lk#EE5E#oQ}I%b-TpU{0XN=%pKi;1^~LIAxq1KCJv1NgJ^rwu;k#VWsp=mdKI;Vst0L$0P^8f$< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/meta.json new file mode 100644 index 00000000000..867a1aa0a19 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/RemieRichards/-tg-station/blob/f8c05e21694cd3cb703e40edc5cfc375017944b1/icons/obj/clothing/masks.dmi, digi made by kuro(388673708753027083)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-digi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..d33df7b2230b4cb0eeca43975a64021091d82d35 GIT binary patch literal 1522 zcmVPx)tVu*cRCt{2Tg^@@Hx&M8t5DrZ%8jm=$z)(rBAJ%E$|{=(v1E(HrVqkX@Cf$- zx~bGHON3^V71CYY3QJHH9YO|GXh;SHq$*v6<2aK)+mivccRpzZ<2e58MM?^G++w%CBk7-Il1u&mO= zI{;i>@udqR$#2_b@mUz&8}lnwtZlKu<@yD73wz+4!?H^7JQucIMi|~B2->1!XV0go z-EA*b2uXebNNNB8BmQqx$UV=+$IU*@o=*V)_4*EippEnMF9?D*>h&D}z}fRDK5q8m zd9IkTw4lKsZXAd*%POH>-w}^2jKhrsT&`az^DkTiaoj}^03P;Hx#n=3Dty0%$DjVh zLw^-NeE$UB{}GN;1+J_3P+&qMmVr3#qK0jR1s9wT`8%B(gyB6n=U|K>j=ON2>Wg+T z)b6&G`R8gt#c>Dr{;`;G0O)jX000mDRd^r%!9#y_teiB$-akggaZ_o*JpL%^!Lmw- zqFyTgg-hW5)hF=c;n+F@fZf6#g1^7TZeee%JdV5I#Y4Qm`lL5n1%Asaq1kKz7!Ej& zyJFzYW&>oDb@*o*ii+b77-Pcd+;-Y4R2D@&K@0$nQ^nd^5u9^T4;TuC%5(=lk3R_7 zC>BdtTPq@pdg%4K@I2Ruf1w7D#L1}8;2C4$>2z*{DpEcAURqE)vO3eubIye(5U8Fi z|3U%yeoJh7mQ_Nhb2Bt}638&g^?bjj)BzQKV6^R#A(SUzWB^C?RQYEL;I`9Vk*%z4 zm&H1y8K;K^FV{<>{z-mdwAat$m+PtWFWd%)CoU!=>Ul1rs5HX{bm99gaZ-DklvE&o zn&CzK0JQiQ&JL|9GA=aJ@-mP$KsG|lxF5{oPo4x#`L#Mo4bz$@HKTV`Qd7__06-kW z=`R4ICAZKBPD8IZI(a!x6}{eaPJODNL37T95KN>%~Cgn$3nF1~9Sb+IAVf-^xS_ zh(|Vd^0J^Z>X&M}S{e|B_hP?KB8qxK6|(|ef@rIyGS71-E=8&^vH?khL+?QLHeitk z=<;hhL}VWTZ8-p5d;>cO!+Tg(X^@peWIlh{h+kO%bS<8C)#aQc2*%gpvXK?PvH+4^ zATFIU$N&z#Ljcg$>cm^}D+z$q&nmt{{P;ArPW<=;tN0F{=K{b|mqAkfry;Q&D)TE< zn&nuKx4~(jskHrH;LnjGM~)mha^(15!Z<%bet)Y|*E0H{?Glsk-;6Odn~l^lKogLM zihP8YRWj;_wnK!xGV+Z~c97_HzywJr4BZCL&%bE*Lt6tb*DnAJa{);DF3Y5P&fb;`IF%f}oAV zjRV;G$J%Xb3m`l>n#dQRpa|s(WC`M+zzi_TNeEAlwA<4b0Amc{$sa|S3(MtJcFW&*iw z3dyC-N6;1k=Uiw2jHNXW_#$R|BH zPD%fhV08G6PJ(i_2H`DEf-<)Zoqi|>MyTP6gNYbD49p6b z>$YRG3nW9*uYDt=o8Yu?xh{+ZkVMvb0a^-Dm@2+BzQULcEz@H|XLi_I=!#sYYa zoPc?lmoK0LV*$uNTcMwna**8>L*NQg@+E2-Jp+B2B{ z4+##?4*9OHXUu2+Loa@bwAUX`PtSg>lX5`yj3q&S!3+-1ZlnP@+dW+zLo_CC?Kk8* zWWeM4dY(dGCzEvEgc-h^JU$$p8@J81aJ$l2tg!9?=Yys#&dx^4`?jb5KB?Db@5VcI zNlM~Mp$$UUKbHNJy&-#hm1VvXL;7=ZZ<&LOj@}ghYFhQuuSBWFhruQAK-@x~1KHkN zuc|Q>-no8oqf7h6Z_9XHS5CaxXvY-rxaH83G9IB#?+bD*SuZFCOm4Dmnwrz97_GUt x!GGU+6XguQUwIS61RASl@BI{XHu{ilw{Vt3w#2rTyg)B7c)I$ztaD0e0su^YaQOfL literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2975c479be7566a6c59a7aca4e20778aa850feb7 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)ID7sLn`LH rJ;=xlwOr9UK@K`#+rw1POb(`njxgN@xNA?@buF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2975c479be7566a6c59a7aca4e20778aa850feb7 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)ID7sLn`LH rJ;=xlwOr9UK@K`#+rw1POb(`njxgN@xNA?@buF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/meta.json new file mode 100644 index 00000000000..d231e0b8aa2 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a ", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/blueshield.png b/Resources/Textures/_Sunrise/Markers/jobs.rsi/blueshield.png new file mode 100644 index 0000000000000000000000000000000000000000..6d6aa9ab6510c7e9625b0863b38c4f792788575f GIT binary patch literal 1053 zcmV+&1mgRNP)Px&*GWV{R9Jj8y4N%Wxu};LzY839e(nhMJ*n1awJ&qJW1YOa6g) z@X|jZd%I=Kl&NcmE?v_O>7qiZwxBU!!Ic)-hDw^XAm>cMRIdX;TB;36jQarsPj~O` zeSG)5yGKX>%d)g(Svu+1B-~0mA)C!6>i^$hS(Yvqi`sFVD{pF9mUbLR7mLNjQAj5- zZZsN5DFN8o+0jZV27>|hdL1bxjYfk?rIKXHWCWy?xUS3g_BORzE$**YtGKQklS_g` z8gN~gN~J=rR>Si=06foQZ*Py?-CbPQO-x{BL>dV9_$&SO59ivp?YM2-y{k*5Qeq9v z9D!Gl=lJdWPuZ+|4wU(M=Nsnd=i~O~XIs?1TjkZ`xkN8Evj!f%Y#G0Th7C%kU&v;& z93SknzHTrW41i6VwLf|IvSlP8kjNO|i|UtpaWT(9^N+Z1b#0Sg&*S%cE%ADZCTvw7 z>D!ArS_k`A#>%VrIPIO$sJ}_H=FD5LRehvOz;QAz=?BstxeS5^9~8KV>V2UfNk5_G)yy|<|8qfMc?AHa6sBon z+qUj>I#VMtm4NU2V^61hL}7V_#l?JV)9ZOS-6M+S^(*!_A|R#ILI`}{M=3?S)uOPx zg3~=3vx`WzTdg=!LI|Xk+I8KDQJAO!rBv*Eqw;|F@7~7FpWi>`r*BQ3-#?B?ynpwW zjmm?udDAeNz}ges?H^IqXPlmNF-?~8CXHQ>iE-o(U_xqTpNu&P8P}OJQ zytOA&2}}%6E|=2)>2z3Zq|*jM2t3atpTE?AHnJFcfbaVRK}akJ1^}F$oqhZkM9wpr zOuS%(NMzc`!iyK-6Y%{HWHOnU^wjky4F*9#5Cmj086ebz5Q5RP6au28AKi1`|1cAQ zsd*}d(BXo$jeR7Oa${3w;LRg$EEG&%8 zX}8-q)4(W%5V3RL_vv&xW9cS@Ae+s`zjQiHsZ^SHEGI6@f!L{1%81BZhg2#xmBdF8 zm<7Y(Fm6vGk*F$8>UcODl1in3Fr%(Rq6o|hGp>gJ3(xbI6K4EBO5ssL*CF9|K>;ZX zxUMsn^LK9Nk+J}Qd-4}S5X9=ACc>EsEajzcHp5bE^cap1jRBl^mp5R$-8LqXnCTo? z%1gbrb`Jp8b?`iob3e=i(=_#*Fv;gHqtI;bkCB*!nIjN61~~V}ui0~7;dxxSq-Mdt XPmt)EwcJmO00000NkvXXu0mjfX9)u1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/green.png b/Resources/Textures/_Sunrise/Markers/jobs.rsi/green.png new file mode 100644 index 0000000000000000000000000000000000000000..0becfdb0c54a42a943da2d51056a0bc22c451f37 GIT binary patch literal 309 zcmV-50m}Y~P)h6Uc+1&8LKWkAox;{xRy4*DB2-C)TMDJVqc7zy8u)O;^v^-f|X$gP>woL%N zk1*Rih5*BBnCu;009zr-H82&xT3)jaOa$=O_6&qNlzPi+6ha+JBjq&$(H}|!70wHx z4yBp$>VY^#zagUL*RW`A+J>yTRr4l(ZkS*m)?E2>`tx`LmfB@-I0Zg>00000NkvXX Hu0mjfW+Qp! literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/jobicon.png b/Resources/Textures/_Sunrise/Markers/jobs.rsi/jobicon.png new file mode 100644 index 0000000000000000000000000000000000000000..4cc9627e719610327d550f31b3951fb1ddb4537a GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbUCt5N5&tmxg|Nqlypb&$f@e@uU#aa^N7yKUx7=CZ#3kC{s7I;J! zGcfQS0%1l`4X*~Eptq-sV~B@?x$gWw6J}T#C^5(9kGB4@z?%7I{xGmK z7){7|eIP`awT8*O;W$%IFXsc7yfbDqKGv~3bzf`OVb>wY@Q&BOf$xbyP`wS%SO!m5 KKbLh*2~7a2AVz5b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json b/Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json new file mode 100644 index 00000000000..297daed2fd9 --- /dev/null +++ b/Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from the game", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "jobicon" + }, + { + "name": "green" + }, + { + "name": "blueshield" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs.png new file mode 100644 index 0000000000000000000000000000000000000000..5f28ca635882051fbb676d3ff11dd08ed683bcb3 GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|5(0ceTn`*L z5LG>WR-Z@x+?}WQCRq6=D(IMn`e`^v7dVFJ=-c~MOxLZ(6OfYp7jNs)>8JbwHA|ijKKgjCEkLU0||(Xr_rzO1$)1;)mk4V)Rw%~(G< z9N)azvC)PxKI!Z7mKGbC9ud|*Eg~BdLl3aBTdY~o%*1G+5YBk;i^ByLIg14|nV9;f hxKBGi?M)#AgY8E79iL{EoCaFP;OXk;vd$@?2>>W{eSZJ| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs_door.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs_door.png new file mode 100644 index 0000000000000000000000000000000000000000..a4de81278f2feef4666aeba0f384d0cd0baf7678 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|oC178Tn`*L z5LGoTvuDley$KmTYeI^8{4$$n^?CSZHH8#*yTufmxP|HJ_^@$sDJYpahUZ8rX=nDX zG4+Tv^N7ssU0YvfQ*!CVe4uG!B|(0{4F9o#kjCD{Kov!vE{-7Bl#ayKaOv?UtP zop?m+_5c4@pNTZhu;#c|#Xe7NU-Pj)wX@dDUHf?Kxjrp!`p7+p z>xZ(-gZr!k2fY#)JEUXn7krh7X5hY2%w?hBz&b}$RWxSGJ_p{o2T}|lkImw+s%Ef_ W=h$4o;a4}%b_P#ZKbLh*2~7ZP!g#L$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs_open.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs_open.png new file mode 100644 index 0000000000000000000000000000000000000000..eec99eb8745f75acba69fecb0bf1111a173c4d20 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|R04cLTn`*L zprB)x*|WwirZB2%n!dfCw5qOSc#gV>qpZ4tsEo3ef1=8RDGfmNJS9PX!3_Tqfb&Rz z8c;ma)5S5wqW9^ggIo;;Jj@pqql2&g{~vGseCtb3ku#?K4hz@*)i}1|9G@ENY8C~C zb$hsevHiV#z}$gr4b#&@cip*~)@B>jWF>t5$QsY>tf%0l^Wog5x0@$fGERENy8OG3 RUc{f0#Jy# zB*-tA!Nz9UtAopcTp3Rn#}JM4$q5pyM;P54OBkI^7}eBE7?&!(&t{lx!>~3iF>NAH O9fPN@jRu?6^qxB}@PKW5l4zD@zM7)yfu zf*Bm1-ADs+{5)M8Lp07OCrFemVC<4)X}H07q=MlH*NICBiR?2t_5*ph#_&!%v3oMt;US#13y~q-w%fThFV0PoW zMG-=G^~G9b!ZJJ64yPX> literal 0 HcmV?d00001 From 525782a59c46c89654d606ef755b3229b48c9dc8 Mon Sep 17 00:00:00 2001 From: Rinary Date: Wed, 5 Jun 2024 21:29:15 +0300 Subject: [PATCH 03/11] Revert "Blueshield" This reverts commit f4b74911d17037cbb14d28111eabde08b11cdfb8. --- .../Locale/en-US/_sunrise/job/job-names.ftl | 1 - .../Locale/en-US/_sunrise/job/nyano-desc.ftl | 1 - .../Locale/ru-RU/_sunrise/job/job-names.ftl | 1 - .../Locale/ru-RU/_sunrise/job/nyano-desc.ftl | 1 - .../catalog/fills/locker/suit_storage.ftl | 3 - .../catalog/fills/locker/wardrobe_job.ftl | 3 - .../entities/clothing/eyes/glasses.ftl | 2 - .../clothing/head/hardsuit-helmets.ftl | 2 - .../entities/clothing/masks/masks.ftl | 2 - .../clothing/outerclothing/hardsuits.ftl | 2 - .../entities/markers/spawners/jobs.ftl | 2 - .../_sunrise/entities/objects/devices/pda.ftl | 2 - .../objects/misc/identification_cards.ftl | 2 - Resources/Prototypes/Access/misc.yml | 1 - .../Prototypes/Roles/Jobs/departments.yml | 1 - .../Prototypes/_Sunrise/Access/service.yml | 3 - .../Catalog/Fills/Locker/suit_storage.yml | 13 ---- .../Catalog/Fills/Locker/wardrobe_job.yml | 14 ----- .../Entities/Clothing/Eyes/glasses.yml | 21 ------- .../Clothing/Head/hardsuit-helmets.yml | 16 ----- .../Entities/Clothing/Masks/masks.yml | 10 --- .../Clothing/OuterClothing/hardsuits.yml | 26 -------- .../Entities/Markers/Spawners/jobs.yml | 13 ---- .../_Sunrise/Entities/Objects/Devices/pda.yml | 19 ------ .../Objects/Misc/identification_cards.yml | 12 ---- .../Storage/Closets/Lockers/lockers.yml | 27 -------- .../Roles/Jobs/Civilian/Blueshield.yml | 59 ------------------ .../_Sunrise/Roles/play_time_trackers.yml | 3 - .../Prototypes/_Sunrise/StatusEffects/job.yml | 7 --- .../Misc/job_icons.rsi/blueshield.png | Bin 205 -> 0 bytes .../Interface/Misc/job_icons.rsi/meta.json | 5 +- .../Misc/id_cards.rsi/idblueshield.png | Bin 238 -> 0 bytes .../Objects/Misc/id_cards.rsi/meta.json | 5 +- .../sunglasseshudmed.rsi/equipped-EYES.png | Bin 301 -> 0 bytes .../Glasses/sunglasseshudmed.rsi/icon.png | Bin 180 -> 0 bytes .../sunglasseshudmed.rsi/inhand-left.png | Bin 197 -> 0 bytes .../sunglasseshudmed.rsi/inhand-right.png | Bin 201 -> 0 bytes .../Glasses/sunglasseshudmed.rsi/meta.json | 26 -------- .../hardsuits/blueshield.rsi/icon-flash.png | Bin 577 -> 0 bytes .../Head/hardsuits/blueshield.rsi/icon.png | Bin 242 -> 0 bytes .../Head/hardsuits/blueshield.rsi/meta.json | 25 -------- .../blueshield.rsi/off-equipped-HELMET.png | Bin 624 -> 0 bytes .../blueshield.rsi/on-equipped-HELMET.png | Bin 704 -> 0 bytes .../Mask/swat_blue.rsi/equipped-MASK-digi.png | Bin 775 -> 0 bytes .../Mask/swat_blue.rsi/equipped-MASK.png | Bin 714 -> 0 bytes .../Clothing/Mask/swat_blue.rsi/icon.png | Bin 407 -> 0 bytes .../Mask/swat_blue.rsi/inhand-left.png | Bin 435 -> 0 bytes .../Mask/swat_blue.rsi/inhand-right.png | Bin 456 -> 0 bytes .../Clothing/Mask/swat_blue.rsi/meta.json | 30 --------- .../equipped-OUTERCLOTHING.png | Bin 1522 -> 0 bytes .../blueshield_hardsuit.rsi/icon.png | Bin 301 -> 0 bytes .../blueshield_hardsuit.rsi/inhand-left.png | Bin 109 -> 0 bytes .../blueshield_hardsuit.rsi/inhand-right.png | Bin 109 -> 0 bytes .../blueshield_hardsuit.rsi/meta.json | 26 -------- .../_Sunrise/Markers/jobs.rsi/blueshield.png | Bin 1053 -> 0 bytes .../_Sunrise/Markers/jobs.rsi/green.png | Bin 309 -> 0 bytes .../_Sunrise/Markers/jobs.rsi/jobicon.png | Bin 226 -> 0 bytes .../_Sunrise/Markers/jobs.rsi/meta.json | 20 ------ .../Structures/Storage/closet.rsi/bs.png | Bin 319 -> 0 bytes .../Structures/Storage/closet.rsi/bs_door.png | Bin 296 -> 0 bytes .../Structures/Storage/closet.rsi/bs_open.png | Bin 231 -> 0 bytes .../Structures/Storage/closet.rsi/locked.png | Bin 127 -> 0 bytes .../Structures/Storage/closet.rsi/meta.json | 32 ---------- .../Storage/closet.rsi/sparking.png | Bin 166 -> 0 bytes .../Storage/closet.rsi/unlocked.png | Bin 127 -> 0 bytes .../Structures/Storage/closet.rsi/welded.png | Bin 206 -> 0 bytes 66 files changed, 2 insertions(+), 436 deletions(-) delete mode 100644 Resources/Locale/en-US/_sunrise/job/job-names.ftl delete mode 100644 Resources/Locale/en-US/_sunrise/job/nyano-desc.ftl delete mode 100644 Resources/Locale/ru-RU/_sunrise/job/job-names.ftl delete mode 100644 Resources/Locale/ru-RU/_sunrise/job/nyano-desc.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/catalog/fills/locker/suit_storage.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/catalog/fills/locker/wardrobe_job.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/eyes/glasses.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/head/hardsuit-helmets.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/masks/masks.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/outerclothing/hardsuits.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl delete mode 100644 Resources/Prototypes/_Sunrise/Access/service.yml delete mode 100644 Resources/Prototypes/_Sunrise/Catalog/Fills/Locker/suit_storage.yml delete mode 100644 Resources/Prototypes/_Sunrise/Catalog/Fills/Locker/wardrobe_job.yml delete mode 100644 Resources/Prototypes/_Sunrise/Entities/Clothing/Masks/masks.yml delete mode 100644 Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml delete mode 100644 Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml delete mode 100644 Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Blueshield.yml delete mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/blueshield.png delete mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idblueshield.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/equipped-EYES.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/icon.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/inhand-left.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/inhand-right.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/meta.json delete mode 100644 Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon-flash.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/meta.json delete mode 100644 Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/off-equipped-HELMET.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/on-equipped-HELMET.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/equipped-MASK-digi.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/equipped-MASK.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/icon.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/inhand-left.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/inhand-right.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/meta.json delete mode 100644 Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/icon.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/inhand-left.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/inhand-right.png delete mode 100644 Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/meta.json delete mode 100644 Resources/Textures/_Sunrise/Markers/jobs.rsi/blueshield.png delete mode 100644 Resources/Textures/_Sunrise/Markers/jobs.rsi/green.png delete mode 100644 Resources/Textures/_Sunrise/Markers/jobs.rsi/jobicon.png delete mode 100644 Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json delete mode 100644 Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs.png delete mode 100644 Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs_door.png delete mode 100644 Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs_open.png delete mode 100644 Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/locked.png delete mode 100644 Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/meta.json delete mode 100644 Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/sparking.png delete mode 100644 Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/unlocked.png delete mode 100644 Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/welded.png diff --git a/Resources/Locale/en-US/_sunrise/job/job-names.ftl b/Resources/Locale/en-US/_sunrise/job/job-names.ftl deleted file mode 100644 index 9853a197555..00000000000 --- a/Resources/Locale/en-US/_sunrise/job/job-names.ftl +++ /dev/null @@ -1 +0,0 @@ -job-name-blueshield = Blueshield \ No newline at end of file diff --git a/Resources/Locale/en-US/_sunrise/job/nyano-desc.ftl b/Resources/Locale/en-US/_sunrise/job/nyano-desc.ftl deleted file mode 100644 index 6dcda39cfa8..00000000000 --- a/Resources/Locale/en-US/_sunrise/job/nyano-desc.ftl +++ /dev/null @@ -1 +0,0 @@ -job-description-blueshield = Your task is to protect and save the head and captain, you demonstrate order, courage and firmness at this station. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl b/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl deleted file mode 100644 index 70cd75fef05..00000000000 --- a/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl +++ /dev/null @@ -1 +0,0 @@ -job-name-blueshield = Офицер Синий Щит \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_sunrise/job/nyano-desc.ftl b/Resources/Locale/ru-RU/_sunrise/job/nyano-desc.ftl deleted file mode 100644 index 587139a187d..00000000000 --- a/Resources/Locale/ru-RU/_sunrise/job/nyano-desc.ftl +++ /dev/null @@ -1 +0,0 @@ -job-description-blueshield = Ваша задача охранять и спасать глав и капитана, вы показатель порядка, смелости и крепкости на этой станции. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/catalog/fills/locker/suit_storage.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/catalog/fills/locker/suit_storage.ftl deleted file mode 100644 index 7ce07824c7a..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/catalog/fills/locker/suit_storage.ftl +++ /dev/null @@ -1,3 +0,0 @@ -ent-SuitStorageBlueshield = { ent-SuitStorageBase } - .suffix = Blueshield - .desc = { ent-SuitStorageBase.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/catalog/fills/locker/wardrobe_job.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/catalog/fills/locker/wardrobe_job.ftl deleted file mode 100644 index ecab61d63e9..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/catalog/fills/locker/wardrobe_job.ftl +++ /dev/null @@ -1,3 +0,0 @@ -ent-WardrobeBlueshieldFilled = { ent-LockerBlueShield } - .desc = { ent-LockerBlueShield.desc } - .suffix = Filled \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/eyes/glasses.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/eyes/glasses.ftl deleted file mode 100644 index 094349baf5a..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/eyes/glasses.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-ClothingEyesGlassesSunglassesMed = медецинские Солнцезащитные очки - .desc = Солнцезащитные очки с медецинским визором \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/head/hardsuit-helmets.ftl deleted file mode 100644 index 30d92ff20dd..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/head/hardsuit-helmets.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-ClothingHeadHelmetHardsuitBlueshield = Шлем скафандра синего щита - .desc = Усиленный Шлем Скафандра, сделан для синего щита \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/masks/masks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/masks/masks.ftl deleted file mode 100644 index 287b71dd00b..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/masks/masks.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-ClothingMaskGasBlueSwat = Синий противогаз спецназа - .desc = Элитный противогаз Службы безопасности. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/outerclothing/hardsuits.ftl deleted file mode 100644 index d0c98ab8391..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/outerclothing/hardsuits.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-ClothingOuterHardsuitBlueshield = Скафандр Синего Щита - .desc = Бронированный Скафандр, Сделанный для Синего Щита. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl deleted file mode 100644 index 0790c31e3f1..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-SpawnPointBlueshield = Синий Щит - .desc = { ent-SpawnPointJobBase.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl deleted file mode 100644 index 5cfb9f85f36..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-BlueshieldPDA = КПК Синего щита - .desc = { ent-CaptainPDA.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl deleted file mode 100644 index 6c9a22da559..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-BlueshieldIDCard = ID карта Синего Щита - .desc = { ent-IDCardStandard.desc } \ No newline at end of file diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 07f84c557ef..f79f1779c22 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -32,4 +32,3 @@ - Chapel - Hydroponics - Atmospherics - - Blueshield diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 42d8cab3289..8ea3e363a6e 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -13,7 +13,6 @@ color: "#9FED58" weight: -10 roles: - - Blueshield #_sunrise - Bartender - Borg - Botanist diff --git a/Resources/Prototypes/_Sunrise/Access/service.yml b/Resources/Prototypes/_Sunrise/Access/service.yml deleted file mode 100644 index 50f981b6483..00000000000 --- a/Resources/Prototypes/_Sunrise/Access/service.yml +++ /dev/null @@ -1,3 +0,0 @@ -- type: accessLevel - id: Blueshield - name: id-card-access-level-blueshield \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Locker/suit_storage.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Locker/suit_storage.yml deleted file mode 100644 index d311516910b..00000000000 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Locker/suit_storage.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: entity - id: SuitStorageBlueshield - parent: SuitStorageBase - suffix: Blueshield - components: - - type: StorageFill - contents: - - id: NitrogenTankFilled - - id: OxygenTankFilled - - id: ClothingOuterHardsuitBlueshield - - id: ClothingMaskGasSecurity - - type: AccessReader - access: [["Blueshield"]] \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Locker/wardrobe_job.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Locker/wardrobe_job.yml deleted file mode 100644 index 536075ca09e..00000000000 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Locker/wardrobe_job.yml +++ /dev/null @@ -1,14 +0,0 @@ - - type: entity - id: WardrobeBlueshieldFilled - suffix: Filled - parent: LockerBlueShield - components: - - type: StorageFill - contents: - - id: BriefcaseBrown - - id: ClothingBeltSecurityFilled - - id: MedkitAdvancedFilled - - id: ClothingMaskGasSecurity - - id: FlashlightSeclite - - id: HandheldCrewMonitor - - id: ClothingMaskGasBlueSwat \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml index c892d824c63..f25c2fdd953 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml @@ -19,24 +19,3 @@ sprite: _Sunrise/Clothing/Eyes/Glasses/kim.rsi - type: Clothing sprite: _Sunrise/Clothing/Eyes/Glasses/kim.rsi - -- type: entity - parent: ClothingEyesBase - id: ClothingEyesGlassesSunglassesMed - name: medical HUDSunglasses - description: Sunglasses with a medical HUD. - components: - - type: Sprite - sprite: _Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi - - type: Clothing - sprite: _Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi - - type: FlashImmunity - - type: EyeProtection - protectionTime: 5 - - type: Tag - tags: - - HamsterWearable - - WhitelistChameleon - - type: ShowHealthIcons - damageContainers: - - Biological diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml index cea53320567..22172f8352b 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml @@ -39,19 +39,3 @@ Shock: 0.1 Cold: 0.2 Radiation: 0.2 - -#Blueshield Hardsuit -- type: entity - parent: ClothingHeadHelmetHardsuitSecurity - id: ClothingHeadHelmetHardsuitBlueshield - noSpawn: true - name: Blueshield's hardsuit helmet - description: Strong hardsuit helmet, made for the blueshield. - components: - - type: PointLight - color: "#daffad" - - type: BreathMask - - type: Sprite - sprite: Backmen/Clothing/Head/Hardsuits/blueshield.rsi - - type: Clothing - sprite: Backmen/Clothing/Head/Hardsuits/blueshield.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Masks/masks.yml deleted file mode 100644 index 19b392f5910..00000000000 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Masks/masks.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - parent: ClothingMaskGasExplorer - id: ClothingMaskGasBlueSwat - name: swat blue gas mask - description: A elite issue Security gas mask. - components: - - type: Sprite - sprite: Clothing/Mask/swat_blue.rsi - - type: Clothing - sprite: Clothing/Mask/swat_blue.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml index c899a1cd9fa..9eba9f5df70 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml @@ -30,29 +30,3 @@ damageCoefficient: 0.7 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetCBURNLeader - -#Blueshield Hardsuit -- type: entity - parent: ClothingOuterHardsuitCap - id: ClothingOuterHardsuitBlueshield - name: blueshield's armored spacesuit - description: Armored spacesuit, made for the blueshield. - components: - - type: Sprite - sprite: Backmen/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi - - type: Clothing - sprite: Backmen/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi - - type: ExplosionResistance - damageCoefficient: 0.4 - - type: Armor - modifiers: - coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.5 - Heat: 0.3 - Radiation: 0.4 - Caustic: 0.5 - Stun: 0.4 - - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitBlueshield diff --git a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml deleted file mode 100644 index bb7c9c1507f..00000000000 --- a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: entity - id: SpawnPointBlueshield - parent: SpawnPointJobBase - name: Blueshield - components: - - type: SpawnPoint - job_id: Blueshield - - type: Sprite - sprite: Backmen/Markers/jobs.rsi - layers: - - state: green - - state: blueshield - - state: jobicon \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml index dff8022d781..f72b10c0a43 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml @@ -11,22 +11,3 @@ borderColor: "#6f6192" - type: Icon state: pda-lawyer - -- type: entity - parent: CaptainPDA - id: BlueshieldPDA - name: blueshield PDA - components: - - type: Pda - id: BlueshieldIDCard - state: pda-captain - penSlot: - startingItem: Pen - priority: -1 - whitelist: - tags: - - Write - - type: PdaBorderColor - borderColor: "#7C5D00" - - type: Icon - state: pda-captain \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml index 684ff8fde44..cbdbc0e6227 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml @@ -9,15 +9,3 @@ - state: idiaa - type: PresetIdCard job: IAA - -- type: entity - parent: IDCardStandard - id: BlueshieldIDCard - name: Blueshield ID Card - components: - - type: Sprite - layers: - - state: silver - - state: idblueshield - - type: PresetIdCard - job: Blueshield \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml deleted file mode 100644 index 3bfbd060277..00000000000 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ /dev/null @@ -1,27 +0,0 @@ -- type: entity - id: LockerBlueShield - parent: LockerBaseSecure - name: blueshield's locker - components: - - type: Sprite - noRot: true - netsync: false - sprite: Backmen/Structures/Storage/closet.rsi - layers: - - state: bs - map: ["enum.StorageVisualLayers.Base"] - - state: bs_door - map: ["enum.StorageVisualLayers.Door"] - - state: locked - map: ["enum.StorageVisualLayers.Lock"] - shader: unshaded - - state: welded - visible: false - map: ["enum.WeldableLayers.BaseWelded"] - - type: Appearance - - type: EntityStorageVisuals - stateBaseClosed: bs - stateDoorOpen: bs_open - stateDoorClosed: bs_door - - type: AccessReader - access: [["Blueshield"]] \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Blueshield.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Blueshield.yml deleted file mode 100644 index ff712ca7be4..00000000000 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Blueshield.yml +++ /dev/null @@ -1,59 +0,0 @@ -- type: job - id: Blueshield - name: job-name-blueshield - description: job-description-blueshield - playTimeTracker: JobBlueshield - requirements: - - !type:DepartmentTimeRequirement - department: Security - time: 180000 #50 hrs - - !type:DepartmentTimeRequirement - department: Command - time: 180000 #50 hrs - - !type:OverallPlaytimeRequirement - time: 900000 #250 hrs - startingGear: BlueshieldGear - icon: "JobIconBlueshield" - supervisors: job-supervisors-service - canBeAntag: false - setPreference: true - access: - - Blueshield - - Maintenance - - Command - - Service - - External - - Brig - - Security - - Medical - extendedAccess: - - Hydroponics - minBankBalance: 300 - maxBankBalance: 500 - wageDepartment: Civilian - wage: 80 - special: - - !type:AddComponentSpecial - components: - - type: PsionicBonusChance - flatBonus: 0.025 - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - - !type:AddComponentSpecial - components: - - type: CommandStaff - -- type: startingGear - id: BlueshieldGear - equipment: - jumpsuit: BlueshieldUniformSuit - back: ClothingBackpackFilled - shoes: ClothingShoesBootsNedoSpetsnaz - eyes: ClothingEyesGlassesSunglassesMed - gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterArmorBlueshieldCarapace - id: BlueshieldPDA - ears: ClothingHeadsetAltCommand - innerClothingSkirt: BlueshieldUniformSuit - satchel: ClothingBackpackSatchelFilled - duffelbag: ClothingBackpackDuffelFilled \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml index 07e428e69db..a6fbbfbb1a8 100644 --- a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml @@ -1,5 +1,2 @@ - type: playTimeTracker id: JobIAA - -- type: playTimeTracker - id: JobBlueshield \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/StatusEffects/job.yml b/Resources/Prototypes/_Sunrise/StatusEffects/job.yml index ee03834b4de..db9c13c057f 100644 --- a/Resources/Prototypes/_Sunrise/StatusEffects/job.yml +++ b/Resources/Prototypes/_Sunrise/StatusEffects/job.yml @@ -4,10 +4,3 @@ icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: IAA - -- type: statusIcon - parent: JobIcon - id: JobIconBlueshield - icon: - sprite: Interface/Misc/job_icons.rsi - state: blueshield \ No newline at end of file diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/blueshield.png b/Resources/Textures/Interface/Misc/job_icons.rsi/blueshield.png deleted file mode 100644 index edc7da2352d665081b018d45e0ac9a95ca8a178f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|+C5zyLnNjq z|M~ylesM&==l%KN-wg^fcN-{Nj?a@zNqQ2t`M3Uq8RrfF!G{z#5oRE0_Bm$61_W*K z>)#m}bg-HIJYIPYwYzt3Sq+|b}DXo%=z%;;-WVP9Yxx-o;TTjjXMDxUnb(nj;~ pZ}(KpeEIiL&C7IWVVL0z)BUvH`TjU|wUQkq|d7eLnyI diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/icon.png deleted file mode 100644 index a4dac5bec1bd3dd70575c73c9db1521f9ea454b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*8>L*XlZFN?BDNK`j3I( z83V&?28Ij<1{(&3{T?13JCubbfhrkGg8YIR9G=}s19DtET^vI+CMG9H6gmVOEZ?Ln`LH zy=BOC*no#M;OTHMY_MlIE$=azaUVdB0d-vS$BL&M>ykGV{@mK9T`@9$LtDGhN8iMozf%mN4 q-5)si-*$~S@I&v=q!tE-3lEt#t+AQT>iy&fNP(xTpUXO@geCxy@lbaF diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/inhand-right.png deleted file mode 100644 index feaa25730ab3f10282cf63adc787e1eec3ad9bb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|nmt_{Ln`LH zy=5qLNI`%#;GIj~gpV3B+Sj+laGz0WwVLI~d!|~H_ssu*O`42A^$h(}cj#RIQQj4v zweOPJ<0-{!mcFjaEB|qQibrOj=JN>s#cBU9Y+KoW>HL)6i{Jj<^YB7%X~LB_kWL1M u1Lx<|=Pg)i_nb{iGCA*o!vEJm2kc~AdC+G1(wR){ASIrzelF{r5}E*;flqY+ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/meta.json deleted file mode 100644 index 541bdfbedca..00000000000 --- a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/sunglasseshudmed.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-EYES", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon-flash.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon-flash.png deleted file mode 100644 index 6248083a8f25ffb41aeca5e695129f5034d27445..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 577 zcmV-H0>1r;P)Px$`$(iYJY9oWs`uJLcPW|I9$OV#ejNfvOf~YC>4}eitBK zCXLJnbj^s%Wdi`;@6MPQiSz2k11@|c=GGk>pyM0@^OMMAK-Y{IAPBAiC=}$e;3PqC z#o*UA06%_q1i;?C^+sCng;6EqnpR3Z_x#yS{ppkYL{Y?J^C19Vn%~*0?buvjHefc1 z)C6?Rh)vVPaU4AFJk>xL$^b-BlzMKOR0D0#U1K!eiIL*%&und0shDjF+d2S2ug#~A zI)h;oc*(B13w#5>s%^aC`f~0JtS@pnGBIXrvx;UwKhz0&ZGv8#eyF1vH?>Ku`dxcb z|IA;3supRr6x^@`oR3W;crLhMiT58AgeY?1A7j<_8;kb9!UPg*`vf5@BuQZ~Y~s0a z+NyKfs^hsZ7&eh41tBbK`y^}I?5j8#NL4Lzbo6yBmYD1JLk6FMi=32kV P00000NkvXXu0mjf{(u0G diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon.png deleted file mode 100644 index 8f5ef2b43ba1e515b410939e5521c561ec228735..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#Q>iW*8>L*C@ZOj1P9pJ+DnK_ z>gyS6%HAg2)Xl+^mDvx|d~EnQU6Rb8drV1oqPY%XQZgoFYf lGf~HnGTq(WT}_Sb46Zz4ZZlUMoB(tRgQu&X%Q~loCIAh@QGx&f diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/meta.json deleted file mode 100644 index 154d0219e9f..00000000000 --- a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/meta.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "#Sunrise Rinary1(Github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-flash" - }, - { - "name": "off-equipped-HELMET", - "directions": 4 - }, - { - "name": "on-equipped-HELMET", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/off-equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/off-equipped-HELMET.png deleted file mode 100644 index 665a5194a7a2d4699c7b85b25d1132044a4d55f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 624 zcmV-$0+0QPP)Px%DoI2^RCt{2nlX#pFdW5SLbo)5EOs2zB>@?-dCKBX(zTzfYd=EQE?GKdJ2*kR z6rImr0&&G19K;=hTwQvhkpR`BT!=PJle5>ADuZ@{tsh0xZoIB{-uf4JfLZy?=IhxxMX?3~ zb%J?#DJ6susOue~Xxcrzl(L)WqVH7bEKb_dXpG757I6a1Q{YYkRSE158MJP2UzNc+ zz~}>j-HA$-0N|xRbeTLFjgjXo><<~L68QXO-aUMtuV9J`h0zC&Z`}Lm9UifKi5`SYx}*o{tB_)`{bJH(phD-ulk%I*XGQ0E7@2Pu`;0|LopE$o4Gs#c;B|_2e8@vc85=Ea=|MgVJ9`BXo~Ij29x0}_J<5WxWmvKen!i*zNtm2(%Gza z3P=D)kKXJ*rOM8iHwA^p1T;)mz^=t7AKh8A%qY@2qAdkYObepkt>10000< KMNUMnLSTY74k3a7 diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/on-equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/on-equipped-HELMET.png deleted file mode 100644 index dea2e50e3dfa1fde388b1e21c80d3b214f651a31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 704 zcmV;x0zdtUP)Px%dPzhOtA8$)&LC(n2BYA zR$EnzA%p+`IF74z9JD4{_x#*(TvRK&@O+@bfKddDV<4Hf@ap+GIyatKI|ltXck`Qf zdH?{%d^H|LF#sUTQv4XlTKQTpmb)Mfhp1L|5vL9K?g+`W1vzf>9w_E#S*pez$2HE^ zx&*T<#bmNS3wK)Rbgm!_TgS&OD&}}zLyeEeBjbGSPpj_vIRJ3Z;a1NhO@6BLr@Q@3 z$ozRs@{K1f?*o%_M+hN=5JCtcgb+dqA%u`KQCfchu)H3DGV_i417u;cR$B#tV!7IS zk3iY^M*RWB@Z#^LHF}f$CtDX0hC_tm@KpKQr*B_y|Ir6kn>5MS zUI5OyYD^G9px7_KE&wlHuUI_-w>R@V`VMS8xQC5f+W=;T+Txt7E`Z~>V9bXQLIuly zfn?eOVDB=N+goM@L0kRPoO47`tX-_tx&we&jb3(SL{Y5j@^V791wk9h^mk7}aV{qP z0a^ln`VqD(<0000Px%!AV3xRCt{2nz3%%Fc5}+7aizHE(%ae27+6%2pTo&jq(5n(yOVWTy#AHgb{XKERM5!S~-C>64*5fOy|5QomT1r4Q$A+a}xj*ZLn* z#jmfgad~-({eBMs{+vm8P5lok;>+a{!!TgK-(wgCESJlp6`7N=EPYWF01$#lQ54Dg z(K|qE4aOKA9v)z=9gohr6#Zzl*5mnVwZbqAP)Z$Lk0ELYge>>{E!y@5N-4DM4f_7} z=>A*;`_@`0rN-c`waNNX2?#=uVt1(P8fAI++xv51twmK;aL&P6i~IZgaraeKm82h4 zI5_8CN(rSDvMhtOc03kEfv)RdjG3(%a?X98=TClej4@bCDJ7~b!*;ukHTlPAtx;7KzFAvzU5BQwvDs|E7{hM2OX^TZ7p!R~ zm@x+D+_($EkVLR+jEQ#W1zi9b2Q&bT+S9;e2PC5B1B@|?@CgotN7CFABF30SD86-F zkHJrUnoIjxgb@DpPs#tROArJ>5ClOG1VIo4K@h~-<`)QbpZfE>lYjsK002ovPDHLk FV1oR{We@-W diff --git a/Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/equipped-MASK.png b/Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/equipped-MASK.png deleted file mode 100644 index f4d41e90070f301842f71b9a8b3084fb96133140..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 714 zcmV;*0yX`KP)Px%gh@m}RCt{2nz63hFcgM=st#rflZhBCZ?Hs+9`g*m$bA8H$G*UQD@K$l8)QHZ zlRe?h9l$Q6RaILz-1hc-OCkdP&pCD+l>Y$4|IH-#hgDViaNaac_BbD{|20>9wOV1Z zSm1Oz0f2vI5#Ce(OOE(-I)yO?r_%|>7)+)}n3Oxcb)Xb(Vh8#=$xFQc7s8 zQ4|HNweeV%B@TxJ&gb)Jn<3}i&*$@>ZaKynilRW@_sROn!3rUK5SLQoa5%&ux~?1j zNf7k!6Xl%yT>a#yfO8IYT?0T&zOL)1ZGv6bO@_04KA$JgD1L-u@SDvh+T+HU zZ2jZ{gye@tq*5w7h*bTMyfG%mahs52{iHA7Cm(FF0Amcm__sn>`a>&DN{ON<(6((- z49P1Xc=J+90Ju5A-v9udZ&Qa$=4y=o&-|Cx~^lPgDrj^Q>sau`4&nk?Du;B z!0~v@a;TH<*Lx?JF$U*cTm@q{N!&MR0EpW6iI3hOF${=C5ClOG1VIo4K@bE%5dSvc0fpm_&-N|ZPx$QAtEWR9J=Wl_77#FcgHpP6IEf%&`irGLx|a|G47)ox$-8Fdq9_>mqp4vS;(l%` zl4c-;KnMX5iGoE@FbqR{`w&73W%>|`2u)*v7hs1{d%S-IK7db*X_8FLo`LCb{fGmX zb$6-XyZ?72C!n9|d&&U;1|I4Iw6E$yYv%QO4LPa0(Bu6zCKdU@xbt68nfGUb9=W`<1I zY9{W=xK!lSrXw#)oO%SGf0n%c_S>`P5!ss!*-|6RuA9y7y-^vxKFIN2b;}1@wR-wd!z6_)hLE!o;k%D zT}=0?b;P(Wp0hn)n*H@x>jbrLLOhCR<`hThO@FaovBmNK?Qi?01bv^$vbOZy`v1E9 z9SD%I>0R!@?sM!tzDaV9d+ytby{v3Gx$_Ixb;*e5t5)s$yVmx|$uO_%xz9iUER|b$ zEN}bnbIMC*TV0x5$1ailVDIs|{q5i7j?GAy&y0zBeaFQ2-TL!(mtR=eJGgxR!T2&| W(XCC!M}Yy)z~JfX=d#Wzp$P!4&dA{a diff --git a/Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/inhand-right.png deleted file mode 100644 index c7a6d122cfe021c7fb5fe348f81081f4573c1fda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 456 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zn><|{Ln`LH zy=9o!Y#_nr&M6eU1n!}FN*d)LelRQGSHVP_CI z$~J#~J_CbdT)THQyJAb#!8yer?v>xW|C19aRXNXjrTCMd>`6TqTid*c@0oR(^N>%F`M z|F7Q+AAav~>bR0~JTI%VvjYw?l$LEtU*MaaxyHBng4fEE{)c=^H?MprDRE}!y=}e+ z%tT!S=lk#EE5E#oQ}I%b-TpU{0XN=%pKi;1^~LIAxq1KCJv1NgJ^rwu;k#VWsp=mdKI;Vst0L$0P^8f$< diff --git a/Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/meta.json deleted file mode 100644 index 867a1aa0a19..00000000000 --- a/Resources/Textures/_Sunrise/Clothing/Mask/swat_blue.rsi/meta.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/RemieRichards/-tg-station/blob/f8c05e21694cd3cb703e40edc5cfc375017944b1/icons/obj/clothing/masks.dmi, digi made by kuro(388673708753027083)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-MASK", - "directions": 4 - }, - { - "name": "equipped-MASK-digi", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index d33df7b2230b4cb0eeca43975a64021091d82d35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1522 zcmVPx)tVu*cRCt{2Tg^@@Hx&M8t5DrZ%8jm=$z)(rBAJ%E$|{=(v1E(HrVqkX@Cf$- zx~bGHON3^V71CYY3QJHH9YO|GXh;SHq$*v6<2aK)+mivccRpzZ<2e58MM?^G++w%CBk7-Il1u&mO= zI{;i>@udqR$#2_b@mUz&8}lnwtZlKu<@yD73wz+4!?H^7JQucIMi|~B2->1!XV0go z-EA*b2uXebNNNB8BmQqx$UV=+$IU*@o=*V)_4*EippEnMF9?D*>h&D}z}fRDK5q8m zd9IkTw4lKsZXAd*%POH>-w}^2jKhrsT&`az^DkTiaoj}^03P;Hx#n=3Dty0%$DjVh zLw^-NeE$UB{}GN;1+J_3P+&qMmVr3#qK0jR1s9wT`8%B(gyB6n=U|K>j=ON2>Wg+T z)b6&G`R8gt#c>Dr{;`;G0O)jX000mDRd^r%!9#y_teiB$-akggaZ_o*JpL%^!Lmw- zqFyTgg-hW5)hF=c;n+F@fZf6#g1^7TZeee%JdV5I#Y4Qm`lL5n1%Asaq1kKz7!Ej& zyJFzYW&>oDb@*o*ii+b77-Pcd+;-Y4R2D@&K@0$nQ^nd^5u9^T4;TuC%5(=lk3R_7 zC>BdtTPq@pdg%4K@I2Ruf1w7D#L1}8;2C4$>2z*{DpEcAURqE)vO3eubIye(5U8Fi z|3U%yeoJh7mQ_Nhb2Bt}638&g^?bjj)BzQKV6^R#A(SUzWB^C?RQYEL;I`9Vk*%z4 zm&H1y8K;K^FV{<>{z-mdwAat$m+PtWFWd%)CoU!=>Ul1rs5HX{bm99gaZ-DklvE&o zn&CzK0JQiQ&JL|9GA=aJ@-mP$KsG|lxF5{oPo4x#`L#Mo4bz$@HKTV`Qd7__06-kW z=`R4ICAZKBPD8IZI(a!x6}{eaPJODNL37T95KN>%~Cgn$3nF1~9Sb+IAVf-^xS_ zh(|Vd^0J^Z>X&M}S{e|B_hP?KB8qxK6|(|ef@rIyGS71-E=8&^vH?khL+?QLHeitk z=<;hhL}VWTZ8-p5d;>cO!+Tg(X^@peWIlh{h+kO%bS<8C)#aQc2*%gpvXK?PvH+4^ zATFIU$N&z#Ljcg$>cm^}D+z$q&nmt{{P;ArPW<=;tN0F{=K{b|mqAkfry;Q&D)TE< zn&nuKx4~(jskHrH;LnjGM~)mha^(15!Z<%bet)Y|*E0H{?Glsk-;6Odn~l^lKogLM zihP8YRWj;_wnK!xGV+Z~c97_HzywJr4BZCL&%bE*Lt6tb*DnAJa{);DF3Y5P&fb;`IF%f}oAV zjRV;G$J%Xb3m`l>n#dQRpa|s(WC`M+zzi_TNeEAlwA<4b0Amc{$sa|S3(MtJcFW&*iw z3dyC-N6;1k=Uiw2jHNXW_#$R|BH zPD%fhV08G6PJ(i_2H`DEf-<)Zoqi|>MyTP6gNYbD49p6b z>$YRG3nW9*uYDt=o8Yu?xh{+ZkVMvb0a^-Dm@2+BzQULcEz@H|XLi_I=!#sYYa zoPc?lmoK0LV*$uNTcMwna**8>L*NQg@+E2-Jp+B2B{ z4+##?4*9OHXUu2+Loa@bwAUX`PtSg>lX5`yj3q&S!3+-1ZlnP@+dW+zLo_CC?Kk8* zWWeM4dY(dGCzEvEgc-h^JU$$p8@J81aJ$l2tg!9?=Yys#&dx^4`?jb5KB?Db@5VcI zNlM~Mp$$UUKbHNJy&-#hm1VvXL;7=ZZ<&LOj@}ghYFhQuuSBWFhruQAK-@x~1KHkN zuc|Q>-no8oqf7h6Z_9XHS5CaxXvY-rxaH83G9IB#?+bD*SuZFCOm4Dmnwrz97_GUt x!GGU+6XguQUwIS61RASl@BI{XHu{ilw{Vt3w#2rTyg)B7c)I$ztaD0e0su^YaQOfL diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/inhand-left.png deleted file mode 100644 index 2975c479be7566a6c59a7aca4e20778aa850feb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)ID7sLn`LH rJ;=xlwOr9UK@K`#+rw1POb(`njxgN@xNA?@buF diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/inhand-right.png deleted file mode 100644 index 2975c479be7566a6c59a7aca4e20778aa850feb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)ID7sLn`LH rJ;=xlwOr9UK@K`#+rw1POb(`njxgN@xNA?@buF diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/meta.json deleted file mode 100644 index d231e0b8aa2..00000000000 --- a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield_hardsuit.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a ", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/blueshield.png b/Resources/Textures/_Sunrise/Markers/jobs.rsi/blueshield.png deleted file mode 100644 index 6d6aa9ab6510c7e9625b0863b38c4f792788575f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1053 zcmV+&1mgRNP)Px&*GWV{R9Jj8y4N%Wxu};LzY839e(nhMJ*n1awJ&qJW1YOa6g) z@X|jZd%I=Kl&NcmE?v_O>7qiZwxBU!!Ic)-hDw^XAm>cMRIdX;TB;36jQarsPj~O` zeSG)5yGKX>%d)g(Svu+1B-~0mA)C!6>i^$hS(Yvqi`sFVD{pF9mUbLR7mLNjQAj5- zZZsN5DFN8o+0jZV27>|hdL1bxjYfk?rIKXHWCWy?xUS3g_BORzE$**YtGKQklS_g` z8gN~gN~J=rR>Si=06foQZ*Py?-CbPQO-x{BL>dV9_$&SO59ivp?YM2-y{k*5Qeq9v z9D!Gl=lJdWPuZ+|4wU(M=Nsnd=i~O~XIs?1TjkZ`xkN8Evj!f%Y#G0Th7C%kU&v;& z93SknzHTrW41i6VwLf|IvSlP8kjNO|i|UtpaWT(9^N+Z1b#0Sg&*S%cE%ADZCTvw7 z>D!ArS_k`A#>%VrIPIO$sJ}_H=FD5LRehvOz;QAz=?BstxeS5^9~8KV>V2UfNk5_G)yy|<|8qfMc?AHa6sBon z+qUj>I#VMtm4NU2V^61hL}7V_#l?JV)9ZOS-6M+S^(*!_A|R#ILI`}{M=3?S)uOPx zg3~=3vx`WzTdg=!LI|Xk+I8KDQJAO!rBv*Eqw;|F@7~7FpWi>`r*BQ3-#?B?ynpwW zjmm?udDAeNz}ges?H^IqXPlmNF-?~8CXHQ>iE-o(U_xqTpNu&P8P}OJQ zytOA&2}}%6E|=2)>2z3Zq|*jM2t3atpTE?AHnJFcfbaVRK}akJ1^}F$oqhZkM9wpr zOuS%(NMzc`!iyK-6Y%{HWHOnU^wjky4F*9#5Cmj086ebz5Q5RP6au28AKi1`|1cAQ zsd*}d(BXo$jeR7Oa${3w;LRg$EEG&%8 zX}8-q)4(W%5V3RL_vv&xW9cS@Ae+s`zjQiHsZ^SHEGI6@f!L{1%81BZhg2#xmBdF8 zm<7Y(Fm6vGk*F$8>UcODl1in3Fr%(Rq6o|hGp>gJ3(xbI6K4EBO5ssL*CF9|K>;ZX zxUMsn^LK9Nk+J}Qd-4}S5X9=ACc>EsEajzcHp5bE^cap1jRBl^mp5R$-8LqXnCTo? z%1gbrb`Jp8b?`iob3e=i(=_#*Fv;gHqtI;bkCB*!nIjN61~~V}ui0~7;dxxSq-Mdt XPmt)EwcJmO00000NkvXXu0mjfX9)u1 diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/green.png b/Resources/Textures/_Sunrise/Markers/jobs.rsi/green.png deleted file mode 100644 index 0becfdb0c54a42a943da2d51056a0bc22c451f37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmV-50m}Y~P)h6Uc+1&8LKWkAox;{xRy4*DB2-C)TMDJVqc7zy8u)O;^v^-f|X$gP>woL%N zk1*Rih5*BBnCu;009zr-H82&xT3)jaOa$=O_6&qNlzPi+6ha+JBjq&$(H}|!70wHx z4yBp$>VY^#zagUL*RW`A+J>yTRr4l(ZkS*m)?E2>`tx`LmfB@-I0Zg>00000NkvXX Hu0mjfW+Qp! diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/jobicon.png b/Resources/Textures/_Sunrise/Markers/jobs.rsi/jobicon.png deleted file mode 100644 index 4cc9627e719610327d550f31b3951fb1ddb4537a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbUCt5N5&tmxg|Nqlypb&$f@e@uU#aa^N7yKUx7=CZ#3kC{s7I;J! zGcfQS0%1l`4X*~Eptq-sV~B@?x$gWw6J}T#C^5(9kGB4@z?%7I{xGmK z7){7|eIP`awT8*O;W$%IFXsc7yfbDqKGv~3bzf`OVb>wY@Q&BOf$xbyP`wS%SO!m5 KKbLh*2~7a2AVz5b diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json b/Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json deleted file mode 100644 index 297daed2fd9..00000000000 --- a/Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "taken from the game", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "jobicon" - }, - { - "name": "green" - }, - { - "name": "blueshield" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs.png deleted file mode 100644 index 5f28ca635882051fbb676d3ff11dd08ed683bcb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|5(0ceTn`*L z5LG>WR-Z@x+?}WQCRq6=D(IMn`e`^v7dVFJ=-c~MOxLZ(6OfYp7jNs)>8JbwHA|ijKKgjCEkLU0||(Xr_rzO1$)1;)mk4V)Rw%~(G< z9N)azvC)PxKI!Z7mKGbC9ud|*Eg~BdLl3aBTdY~o%*1G+5YBk;i^ByLIg14|nV9;f hxKBGi?M)#AgY8E79iL{EoCaFP;OXk;vd$@?2>>W{eSZJ| diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs_door.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs_door.png deleted file mode 100644 index a4de81278f2feef4666aeba0f384d0cd0baf7678..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|oC178Tn`*L z5LGoTvuDley$KmTYeI^8{4$$n^?CSZHH8#*yTufmxP|HJ_^@$sDJYpahUZ8rX=nDX zG4+Tv^N7ssU0YvfQ*!CVe4uG!B|(0{4F9o#kjCD{Kov!vE{-7Bl#ayKaOv?UtP zop?m+_5c4@pNTZhu;#c|#Xe7NU-Pj)wX@dDUHf?Kxjrp!`p7+p z>xZ(-gZr!k2fY#)JEUXn7krh7X5hY2%w?hBz&b}$RWxSGJ_p{o2T}|lkImw+s%Ef_ W=h$4o;a4}%b_P#ZKbLh*2~7ZP!g#L$ diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs_open.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bs_open.png deleted file mode 100644 index eec99eb8745f75acba69fecb0bf1111a173c4d20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|R04cLTn`*L zprB)x*|WwirZB2%n!dfCw5qOSc#gV>qpZ4tsEo3ef1=8RDGfmNJS9PX!3_Tqfb&Rz z8c;ma)5S5wqW9^ggIo;;Jj@pqql2&g{~vGseCtb3ku#?K4hz@*)i}1|9G@ENY8C~C zb$hsevHiV#z}$gr4b#&@cip*~)@B>jWF>t5$QsY>tf%0l^Wog5x0@$fGERENy8OG3 RUc{f0#Jy# zB*-tA!Nz9UtAopcTp3Rn#}JM4$q5pyM;P54OBkI^7}eBE7?&!(&t{lx!>~3iF>NAH O9fPN@jRu?6^qxB}@PKW5l4zD@zM7)yfu zf*Bm1-ADs+{5)M8Lp07OCrFemVC<4)X}H07q=MlH*NICBiR?2t_5*ph#_&!%v3oMt;US#13y~q-w%fThFV0PoW zMG-=G^~G9b!ZJJ64yPX> From 227fcadaa52ca51b279f1119dfa1adfe16e6fc89 Mon Sep 17 00:00:00 2001 From: Rinary Date: Fri, 7 Jun 2024 23:33:33 +0300 Subject: [PATCH 04/11] Magistrat Job --- .../Locale/ru-RU/_sunrise/job/job-desc.ftl | 1 + .../Locale/ru-RU/_sunrise/job/job-names.ftl | 1 + .../entities/markers/spawners/jobs.ftl | 2 + .../_sunrise/entities/objects/devices/pda.ftl | 2 + .../objects/misc/identification_cards.ftl | 2 + Resources/Prototypes/Access/command.yml | 4 ++ .../Prototypes/Roles/Jobs/departments.yml | 1 + .../Entities/Markers/Spawners/jobs.yml | 13 ++++ .../_Sunrise/Entities/Objects/Devices/pda.yml | 19 +++++ .../Objects/Misc/identification_cards.yml | 12 ++++ .../Roles/Jobs/Civilian/Magistrat.yml | 65 ++++++++++++++++++ .../Roles/Jobs/play_time_trackers.yml | 2 + .../_Sunrise/Markers/jobs.rsi/green.png | Bin 0 -> 309 bytes .../_Sunrise/Markers/jobs.rsi/jobicon.png | Bin 0 -> 226 bytes .../_Sunrise/Markers/jobs.rsi/magistrat.png | Bin 0 -> 989 bytes .../_Sunrise/Markers/jobs.rsi/meta.json | 20 ++++++ 16 files changed, 144 insertions(+) create mode 100644 Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl create mode 100644 Resources/Locale/ru-RU/_sunrise/job/job-names.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl create mode 100644 Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml create mode 100644 Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Magistrat.yml create mode 100644 Resources/Prototypes/_Sunrise/Roles/Jobs/play_time_trackers.yml create mode 100644 Resources/Textures/_Sunrise/Markers/jobs.rsi/green.png create mode 100644 Resources/Textures/_Sunrise/Markers/jobs.rsi/jobicon.png create mode 100644 Resources/Textures/_Sunrise/Markers/jobs.rsi/magistrat.png create mode 100644 Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json diff --git a/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl b/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl new file mode 100644 index 00000000000..6e6507106e6 --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl @@ -0,0 +1 @@ +job-description-magistrat = Вы само правосудие станции, ваша задача судить всех крупных нарушителей порядка. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl b/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl new file mode 100644 index 00000000000..08b4ca453e3 --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl @@ -0,0 +1 @@ +job-name-magistrat = Магистрат \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl new file mode 100644 index 00000000000..5917c4fa041 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl @@ -0,0 +1,2 @@ +ent-SpawnPointMagistrat = Магистрат + .desc = { ent-SpawnPointJobBase.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl new file mode 100644 index 00000000000..b82c53524b5 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl @@ -0,0 +1,2 @@ +ent-MagistratPDA = КПК Магистрата + .desc = { ent-CaptainPDA.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl new file mode 100644 index 00000000000..71e5a9d2d4f --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl @@ -0,0 +1,2 @@ +ent-MagistratIDCard = ID карта Магистрата + .desc = { ent-IDCardStandard.desc } \ No newline at end of file diff --git a/Resources/Prototypes/Access/command.yml b/Resources/Prototypes/Access/command.yml index 62193d5ffee..fbd0c9e1b06 100644 --- a/Resources/Prototypes/Access/command.yml +++ b/Resources/Prototypes/Access/command.yml @@ -9,6 +9,10 @@ - type: accessLevel id: HeadOfPersonnel name: id-card-access-level-head-of-personnel + +- type: accessLevel + id: Magistrat + name: id-card-access-level-magistrat - type: accessGroup id: Command diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 8ea3e363a6e..993eb61fa1a 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -13,6 +13,7 @@ color: "#9FED58" weight: -10 roles: + - Magistrat - Bartender - Borg - Botanist diff --git a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml new file mode 100644 index 00000000000..39159972363 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml @@ -0,0 +1,13 @@ +- type: entity + id: SpawnPointMagistrat + parent: SpawnPointJobBase + name: Magistrat + components: + - type: SpawnPoint + job_id: Magistrat + - type: Sprite + sprite: _Sunrise/Markers/jobs.rsi + layers: + - state: green + - state: magistrat + - state: jobicon \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml index f72b10c0a43..3972e0bfab4 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml @@ -11,3 +11,22 @@ borderColor: "#6f6192" - type: Icon state: pda-lawyer + +- type: entity + parent: CaptainPDA + id: MagistratPDA + name: magistrat PDA + components: + - type: Pda + id: MagistratIDCard + state: pda-captain + penSlot: + startingItem: Pen + priority: -1 + whitelist: + tags: + - Write + - type: PdaBorderColor + borderColor: "#7C5D00" + - type: Icon + state: pda-captain diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml index cbdbc0e6227..782d4a07013 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml @@ -9,3 +9,15 @@ - state: idiaa - type: PresetIdCard job: IAA + +- type: entity + parent: IDCardStandard + id: MagistratIDCard + name: Magistrate ID Card + components: + - type: Sprite + layers: + - state: silver + - state: idiaa + - type: PresetIdCard + job: Magistrat \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Magistrat.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Magistrat.yml new file mode 100644 index 00000000000..ae78de0db03 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Magistrat.yml @@ -0,0 +1,65 @@ +- type: job + id: Magistrat + name: job-name-magistrat + description: job-description-magistrat + playTimeTracker: JobMagistrat + requirements: + - !type:DepartmentTimeRequirement + department: Command + time: 180000 #50 hrs + startingGear: MagistratGear + icon: "JobIconIAA" + supervisors: job-supervisors-service + canBeAntag: false + setPreference: true + access: + - Magistrat + - Bar + - Kitchen + - Hydroponics + - Janitor + - Theatre + - Chapel + - Lawyer + - Brig + - Security + - Medical + - Research + - Engineering + - Cargo + - Salvage + - Command + extendedAccess: + - Hydroponics + minBankBalance: 200 + maxBankBalance: 300 + wageDepartment: Civilian + wage: 80 + special: + - !type:AddComponentSpecial + components: + - type: PsionicBonusChance + flatBonus: 0.025 + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + - !type:AddComponentSpecial + components: + - type: CommandStaff + +- type: startingGear + id: MagistratGear + equipment: + jumpsuit: MagistratUniformSuit + back: ClothingBackpackFilled + shoes: ClothingShoesBootsLaceup + eyes: ClothingEyesGlassesSecurity + gloves: ClothingHandsGlovesColorWhite + outerClothing: ClothingMagistrateroba + id: MagistratPDA + ears: ClothingHeadsetAltCommand + head: ClothingHeadHatPwig + pocket1: Flash + pocket2: ClothingNeckLawyerbadge + innerClothingSkirt: MagistratUniformSuit + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/play_time_trackers.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/play_time_trackers.yml new file mode 100644 index 00000000000..fbaa38d06f3 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/play_time_trackers.yml @@ -0,0 +1,2 @@ +- type: playTimeTracker + id: JobMagistrat \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/green.png b/Resources/Textures/_Sunrise/Markers/jobs.rsi/green.png new file mode 100644 index 0000000000000000000000000000000000000000..0becfdb0c54a42a943da2d51056a0bc22c451f37 GIT binary patch literal 309 zcmV-50m}Y~P)h6Uc+1&8LKWkAox;{xRy4*DB2-C)TMDJVqc7zy8u)O;^v^-f|X$gP>woL%N zk1*Rih5*BBnCu;009zr-H82&xT3)jaOa$=O_6&qNlzPi+6ha+JBjq&$(H}|!70wHx z4yBp$>VY^#zagUL*RW`A+J>yTRr4l(ZkS*m)?E2>`tx`LmfB@-I0Zg>00000NkvXX Hu0mjfW+Qp! literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/jobicon.png b/Resources/Textures/_Sunrise/Markers/jobs.rsi/jobicon.png new file mode 100644 index 0000000000000000000000000000000000000000..4cc9627e719610327d550f31b3951fb1ddb4537a GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbUCt5N5&tmxg|Nqlypb&$f@e@uU#aa^N7yKUx7=CZ#3kC{s7I;J! zGcfQS0%1l`4X*~Eptq-sV~B@?x$gWw6J}T#C^5(9kGB4@z?%7I{xGmK z7){7|eIP`awT8*O;W$%IFXsc7yfbDqKGv~3bzf`OVb>wY@Q&BOf$xbyP`wS%SO!m5 KKbLh*2~7a2AVz5b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/magistrat.png b/Resources/Textures/_Sunrise/Markers/jobs.rsi/magistrat.png new file mode 100644 index 0000000000000000000000000000000000000000..5b6404e3c9a8513f5f61397906291c6c45e53305 GIT binary patch literal 989 zcmV<310wv1P)Px&mq|oHR9J-oRm_^Fbo4wLI_^9o`3N${@kYRc`OnfAhBZ{wrwlhwgE_| z(*PVFA1^gm;z8>7Z`Ia*2e0`aAp|!!H`=zcvO*996ib`@_H!QN=`V@rO_YSgw=dMz zeutv#QY>u}1Oc^LjiaL@YPFgUUUXfy_B#yUzDQgP66JvV@*P45imuD$;2a?YUvGT_ zK>o`w5JGS{I0x6Idv=QZGDsSKz5y2x|1ZKYD7dv>amG_KSv%w%Vpri#mNnr8H8 znpiwP27|$buapug(LVDqw`3k39x8yny*&V?Yr^>IR=;0gT>@}$Z~(yW?(W?A6W8qjD@fCO zUP_4&Vq#pg+5EU|7-4$iS$@%zN~I{3N;50sLN}u63Kt#4_t{ga)Laq^U&)dp48sW` z_mN0UAYR?3t6aQ43_~3}3`4ELeMod1PX~>v+;kfRfnJtr1wNWUM8W{BgMhJ=3kO13`3p$50->Ed!3xUPCA_dU@h|qDW$QNc?3W@ogrtha~<4FY`tc)X~fl-Mxr`U zEVwF@S<~Oc;U%Nd5dY%Bcx+iJoz5_A_u8$8yOsw*pwIbb?6dGM-go&S&#%7`00000 LNkvXXu0mjf&&$eM literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json b/Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json new file mode 100644 index 00000000000..d5cd9d8326b --- /dev/null +++ b/Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from the game", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "jobicon" + }, + { + "name": "green" + }, + { + "name": "magistrat" + } + ] +} \ No newline at end of file From afcd9b19ddbdae34df0dc06a475ac3b2681d1913 Mon Sep 17 00:00:00 2001 From: Rinary Date: Sat, 8 Jun 2024 00:27:30 +0300 Subject: [PATCH 05/11] Magistrat Icons, IAA Icons Change --- .../Prototypes/Roles/Jobs/departments.yml | 4 +-- .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 +++++++ .../Objects/Misc/identification_cards.yml | 2 +- .../Roles/Jobs/Civilian/Magistrat.yml | 18 +++-------- .../Prototypes/_Sunrise/StatusEffects/job.yml | 7 ++++ .../Interface/Misc/job_icons.rsi/IAA.png | Bin 196 -> 183 bytes .../Misc/job_icons.rsi/Magistrat.png | Bin 0 -> 196 bytes .../Interface/Misc/job_icons.rsi/meta.json | 3 ++ .../Objects/Misc/id_cards.rsi/idiaa.png | Bin 242 -> 220 bytes .../Objects/Misc/id_cards.rsi/idmagistrat.png | Bin 0 -> 242 bytes .../Objects/Misc/id_cards.rsi/meta.json | 3 ++ .../equipped-INNERCLOTHING-digi.png | Bin 0 -> 1336 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1225 bytes .../Jumpsuit/magistratebel.rsi/icon.png | Bin 0 -> 489 bytes .../magistratebel.rsi/inhand-left.png | Bin 0 -> 571 bytes .../magistratebel.rsi/inhand-right.png | Bin 0 -> 555 bytes .../Jumpsuit/magistratebel.rsi/meta.json | 30 ++++++++++++++++++ 17 files changed, 62 insertions(+), 16 deletions(-) create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/Magistrat.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idmagistrat.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/equipped-INNERCLOTHING-digi.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/meta.json diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 993eb61fa1a..8c318e34e3a 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -13,7 +13,7 @@ color: "#9FED58" weight: -10 roles: - - Magistrat + - IAA # Sunrise-Edit - Bartender - Borg - Botanist @@ -38,8 +38,8 @@ description: department-Command-description color: "#052EED" # Sunrise-Edit roles: + - Magistrat # Sunrise-Edit - Captain - - IAA # Sunrise-Edit - CentralCommandOfficial - ChiefEngineer - ChiefMedicalOfficer diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml index d67e4e89e4e..819aefab7b3 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml @@ -41,3 +41,14 @@ sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi - type: Clothing sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi + +- type: entity + parent: ClothingUniformBase + id: MagistratUniformSuit + name: Костюм магистрата + description: Увольте пару срочников! + components: + - type: Sprite + sprite: _Sunrise/Clothing/Uniforms/jumpsuit/magistratebel.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Uniforms/jumpsuit/magistratebel.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml index 782d4a07013..0111113d12e 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml @@ -18,6 +18,6 @@ - type: Sprite layers: - state: silver - - state: idiaa + - state: idmagistrat - type: PresetIdCard job: Magistrat \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Magistrat.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Magistrat.yml index ae78de0db03..066615bfe4f 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Magistrat.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Magistrat.yml @@ -8,7 +8,7 @@ department: Command time: 180000 #50 hrs startingGear: MagistratGear - icon: "JobIconIAA" + icon: "JobIconMagistrat" supervisors: job-supervisors-service canBeAntag: false setPreference: true @@ -31,15 +31,7 @@ - Command extendedAccess: - Hydroponics - minBankBalance: 200 - maxBankBalance: 300 - wageDepartment: Civilian - wage: 80 special: - - !type:AddComponentSpecial - components: - - type: PsionicBonusChance - flatBonus: 0.025 - !type:AddImplantSpecial implants: [ MindShieldImplant ] - !type:AddComponentSpecial @@ -50,16 +42,16 @@ id: MagistratGear equipment: jumpsuit: MagistratUniformSuit - back: ClothingBackpackFilled + back: ClothingBackpackIAAFilled shoes: ClothingShoesBootsLaceup eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesColorWhite - outerClothing: ClothingMagistrateroba + outerClothing: ClothingOuterRobesJudge id: MagistratPDA ears: ClothingHeadsetAltCommand head: ClothingHeadHatPwig pocket1: Flash pocket2: ClothingNeckLawyerbadge innerClothingSkirt: MagistratUniformSuit - satchel: ClothingBackpackSatchelFilled - duffelbag: ClothingBackpackDuffelFilled \ No newline at end of file + satchel: ClothingBackpackSatchelIAAFilled + duffelbag: ClothingBackpackDuffelIAAFilled \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/StatusEffects/job.yml b/Resources/Prototypes/_Sunrise/StatusEffects/job.yml index db9c13c057f..9367978c0a7 100644 --- a/Resources/Prototypes/_Sunrise/StatusEffects/job.yml +++ b/Resources/Prototypes/_Sunrise/StatusEffects/job.yml @@ -4,3 +4,10 @@ icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: IAA + +- type: statusIcon + parent: JobIcon + id: JobIconMagistrat + icon: + sprite: /Textures/Interface/Misc/job_icons.rsi + state: Magistrat diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/IAA.png b/Resources/Textures/Interface/Misc/job_icons.rsi/IAA.png index 2795c24307d928f7614e5cab5cfe6e8b5817bdca..5f70a07dbfce8d24dc132911b5a3513609a76a47 100644 GIT binary patch delta 166 zcmV;X09pUU0k;8=8Gi-<006`fzKZ|=00DDSM?wIu&K&6g0041GL_t&-m2J-<62d?b zMA0`9>z8YA0B#V4!bNkgXdDW~4RR6e8q}IaEhH)0wCF#-Y68x8trk*d-OsCtan=q; z-`q~kv;=s+7*gJj>#l{NmLJeBJCyPtLx-j%wub$PtzoV2sUL-aan|-Prp)6aJ~!<# UD)mGf+W-In07*qoM6N<$g8yMf>Hq)$ delta 179 zcmdnac!Y6+WIZzj1HNS%G~10G|+7 z(ZD8dH9P6_rT_o`2Z~u;Ju?$Xv6ck+1p`I?GyLAh7Yr2OEbxddW?5=5UuVS^9fwN{r>9I&@piZsmeTvzXT`}!`Lhz=&$i|N Wz>xp!Na-Pk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}ziUu}utJz7XFa7`jKTyo->Y159inS!jFBmBDpW*j5zF?pLXMsm# zF#`kNVGw3Kp1&dmD5&e{;us*cf~A$m`>*Gdi}$c+75e1meWv2lZ?c($6$zSvU9!IO&`J z?{_+UB=a3Z#02+wE-gQbKL0N$oMp{$GiZkL1X<@|7xoRDN!#bF3v4)h{7Od?BLjonOM~~%zn7ZgTe~DWM4f Da}!az delta 225 zcmcb^_=$0XWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKP}k zx0)TFL#A~4(*OVe1I40_PTdcrSWANZf`KCc8Gdi$3kC{s7I;J!GcfQS24TkI`72U@ zg3+EXjv*HQZ~Fte4j6Dan|}P4J}<{8%Gzt{p?}-HhgYhsj5w?x^M*r7Yx8_@Mh+i0 zIT4kGA9q!%O>k|hU_Q+i->~eErqHc?y&D2w?g%`&rs&B2=*ga)i3inLHZzyz@>{p{ S-2__0z~JfX=d#Wzp$PzihEXyA diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmagistrat.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmagistrat.png new file mode 100644 index 0000000000000000000000000000000000000000..227b197d74a360907d056431c3247ad492e87a82 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbUxz+6W95SWTm;V3%A1D@ebn1Q}#aa^N7Yr2n&+vO2UocRBv%n*= zn1O-sFbFdq&tH)O6pZ$CaSXBWf7>6(b-;kb+4SST^m#c()?QN&{oD3Eyi#Rl#9{rI zHylb@o9Bx&a`?E(iKs06xT{iaf@@O+^J%X5hGmB|g>L2R-4OV4N8rgdMMw5WPxkCg dJgCmHnYlEV-@2{uCeRiJ22WQ%mvv4FO#p;UQ3U`1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index d56e7a87c4d..5bc567fa876 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -106,6 +106,9 @@ { "name": "idiaa" }, + { + "name": "idmagistrat" + }, { "name": "idmedicaldoctor" }, diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/equipped-INNERCLOTHING-digi.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/equipped-INNERCLOTHING-digi.png new file mode 100644 index 0000000000000000000000000000000000000000..afeba21924505fb51872a16fce40db1d72c157ff GIT binary patch literal 1336 zcmV-81;_e{P)pi5n0Mt7wx>A;p3sqG%BiEUeN6(*;skieMvxjbJCFHKY;J zEJC^j%fL1kx`^nqMgA-+243!O*za*N-am70?z>rG2Hrb!=g;}R`R2^r_vYRZN-7Ez z1&RVifucZBpeRrjC<=5cF#F|`*-x*&G27bOn%Tx&Q%=1tA3AUG?>)Fb(`OX?yVpLP zeShY)*>pOMz~tYXuE#QnP)-@`h8{TnEdJWs+ARI_#Xpuq7U#>$%VB?iKgjOw?S)Iv zPr^5U{SjSMZ62%N+1bhR?ZvHr%|4bKwbnvui@DFZ& z6n=Pk5bf&fYIGxTEd9EC=hUb8XD{CgU%vlrV8CCWUx}7$%KPAV&Jv-9%BW2QFw>Q~ z(WV2S91?23ySv-zKlPDb*Ws&;B2w3V@LMAw1!r(dx4+tmSy?VL0}4(0t9>6^htHsu zEFX!1_23_uvpOp~i+SW+~FMewTSb#LoV4qe}#HF?mpVmDfbqF9kJToA0-G}Q!GwuJR z*A|n!orJ#lE&&*TfOI?5phQmBi?S9+w_C7mxd%IY56~@5Yac*Gg4QH^1IfD%a|jDx z5lA0#P+k$?!FNS~!X041__--!h+tUH1|IhtDj8#_`6p7=EcuG5Wz9v8}I%b-u&WpxNzcRJQ&^F+zh8*S`VN7_G@_kxa)Yq%QdzK z11vDX=8OO?aDp2gJ&s+Wi_$un6RJTzgvUA=K5D8UOwIxv=uqkMR*b zhcSr2alP`MQz2IbG?A+gCBiEo-)gEJyc{erhe(4601^A1z!1dRd<==@5`YjR$y$7}-~=~sa&3YfK-OvS^sRjO%?&od})h0Mf|q}s#+ zn@H2_r(D|l*41T)3Y}R3gdc-evIIQ$U-j=}?Ni{C3*szn3E&t2B`bz4SN)=_u=GPr zIFwf(*QC1l00vEx6*wVjXGY~iTQC&<@+~g1D$lWQ0dNYCW8;&{PecISr7dBj! z_xf}RP=W9ua*n~RXspd|4r(%B!$Ij#2-lw>mjD29zb64+0meN+A!#?n*k}P?7J~u9 zL6abE9$43HkT3%j5&#ns44yL57s!7(~JyT9-I&FswX&MyZX4p#thI9vh1;cx{2hr<;B91d3ina0}ti`t8p58&;) z1+}%c9;zQ18PSq$9dLZ08axLcct8<|f6vp$;186h>SNJam^yRL6o1A7{1|N1?ln(9 zcVZqs9zFzjE2_0;i3BwHd{CqRU-|tTbnC~l-PXoI%SGV%lcCT*$Gu*!DgKNE2m}IJ zP3I&mEiFM_ULI7IS3o=-hbtw1XrGya_Tmz3!-DJ8+hO}?G-{a$JpW{04OF#_vHD~( z$r49Uy)6HR0^r3kX-Xb}$uEvJ!Ol~!QYC_KXO#$e9ZZz2k3#gE+ybZT_rvqy@l=WR z#EMBF7RF$DT%%UwF$1sYK|6slVyGY(c%u^IwnT>OUM2%d7;*UBgf9GeKGb zii(Ofx)?tK5M#YnOm!*|)B^}S56_>Qn=?HMjQIID_;~o^GW=-;po?Lt|L{T@9iybF z#NH9x(fMW}^6Lp|8=NA|pH_f7my6+2>rq&kSplMI2@(~KtBMMe!rjX(--9Xlz9TuVPP?$ zp*J8Fi?RQC&qAh<7N9G*mzg12zRt2&&`2c00(o@s2%ukJC_1fFjD|o^Lr=o_cdwZ- zqOPuvy#^0#FJ-ayOn*{ikRbA^6Tcu-Uk0rmi_o8#PX&Olqv#hH0=3welfyg-S9b?f z-vC;D+aPqK4CaQ%p&=a9WI91gfH%nmOoY8`OFFJ6&wr%keF7>m@H@%4a9f^$9r2`d zWxHJVqlhJwAo&FBf|XpBtpey1AnS^1@ScQhVQO#C=<}0R0c8RsF5XKZ1L+ZfW+d9P zCtm=P-aMP1+A3EK@+J_FoBRMfnqNv?OIiSNn3Liw0ok)bO34#9c0^a$+yrdd9Dpmq zX88rOf$6E_j7(h3H+j nb$cAiH>1~8#No~X;Bfo_c-IwRcl-j>00000NkvXXu0mjfampN#!8Y-6gx|a zR-%OvuuElOsg+n8u(6RtNM{fP(au6r#-I|zDd>7{&BP$kUM$fa|(~%^k;~Mx#M*wIWR}UiKo!p>CdNHk(RaPy#?vtk|~go>6M) zN`7;MI-L&rzAy6w0F}~e05C^!h|TJiY07Qg^&$jw&Qp~V0NNQCi*Ru^G)<0YRUEA$v5*^UT*-+%eFeRC3fs8Q2(-{mJ$5|XK z)fi40GJ>TdSm%5@zxkv^=c?M0HQ&siUWpB!eqYRt@$NQF@8a1P%$C1@NAVS7$-c~Qt1L@u zmsii8E7Q|dqpZ)lhexLcytiSq}s}pK@r`^6fle?0)=*f>m zJ6Xiu=S8i*Qug}V-1{kg`g6P$X4%-J&F~d}TO<5?-r2W*7rmWp?03rl;4aI!5APT^ zXOB=XdnWrL-assr+mf?=@%R+^;`QZr)}ZEzrl+P!Ph<3I+~$RtF0$ zhC_jjV5vDwznVWcO`H7j#FgvUuRm?k-oLDPV-80IpVR5yxzk^7o|5pn?BVI#(Mw~G8#yu3Voj@+H(n%@k?92dUbS=Ur` zPsDy7|LH%@mF8y|pE`Vb`K9gYB({ZLzd2Z5QhRU8m~z}t%Kf-{MRo1L?=N=Av?MLM z{WfXRO_>k#_n5D1c$IME!Lyu?wo$kHcrs^~f3Q4oO~5?qbJ;z%)rEIc>>uAwFzq{g zJCtd4I>RdYu3XuhZ!IsG<%e_5IC?I0cADYJKgVwWPVKQVoV@%w)90I7eJ6Kk@)?}_ zk^jMF=J`pVuT57(3kZ}jQuk!IzHVcG24l?bV~SBz8IG?j6b@wCQP!L6F_$@_thd&M z^T93CKE+>LK#K3;FUyAP>pT1|Vd7 Date: Sat, 8 Jun 2024 00:46:24 +0300 Subject: [PATCH 06/11] Changelog --- Resources/Changelog/ChangelogSunrise.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index b4903880834..bf62e04c03c 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -311,3 +311,10 @@ Entries: type: Add id: 27 time: '2024-06-07T17:08:00.724523+00:00' +- author: Rinary + changes: + - message: "\u0431\u044B\u043B\u0430\u0020\ \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430\u0020\ \u0440\u043E\u043B\u044C\u000D\u000A\ \u043C\u0430\u0433\u0438\u0441\u0442\u0440\u0430\u0442\u0430." + type: Add + id: 27 + time: '2024-06-08T00:34:38.724523+00:00' + From c95268df9762011ffddfb804ffab8c5ad6c89a59 Mon Sep 17 00:00:00 2001 From: Rinary Date: Sat, 8 Jun 2024 22:29:35 +0300 Subject: [PATCH 07/11] Law department, Some Fixes, Add Magistrate, Lawyer to all Maps --- Resources/Locale/ru-RU/_sunrise/job/department-desc.ftl | 1 + Resources/Locale/ru-RU/_sunrise/job/department.ftl | 1 + 2 files changed, 2 insertions(+) create mode 100644 Resources/Locale/ru-RU/_sunrise/job/department-desc.ftl create mode 100644 Resources/Locale/ru-RU/_sunrise/job/department.ftl diff --git a/Resources/Locale/ru-RU/_sunrise/job/department-desc.ftl b/Resources/Locale/ru-RU/_sunrise/job/department-desc.ftl new file mode 100644 index 00000000000..1d6966be468 --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/job/department-desc.ftl @@ -0,0 +1 @@ +department-Law-description = Защищяйте, судите или накажите преступников. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_sunrise/job/department.ftl b/Resources/Locale/ru-RU/_sunrise/job/department.ftl new file mode 100644 index 00000000000..d3c033f1665 --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/job/department.ftl @@ -0,0 +1 @@ +department-Law = Юридический отдел \ No newline at end of file From f1aa6fa5f0bd22a0abf49365b706ac98b7048e9c Mon Sep 17 00:00:00 2001 From: Rinary Date: Sat, 8 Jun 2024 22:31:06 +0300 Subject: [PATCH 08/11] )) --- Resources/Prototypes/Maps/bagel.yml | 4 +++- Resources/Prototypes/Maps/box.yml | 5 +++-- Resources/Prototypes/Maps/cluster.yml | 5 +++-- Resources/Prototypes/Maps/core.yml | 4 +++- Resources/Prototypes/Maps/europa.yml | 4 +++- Resources/Prototypes/Maps/fland.yml | 4 +++- Resources/Prototypes/Maps/marathon.yml | 4 +++- Resources/Prototypes/Maps/meta.yml | 4 +++- Resources/Prototypes/Maps/oasis.yml | 4 +++- Resources/Prototypes/Maps/omega.yml | 4 +++- Resources/Prototypes/Maps/origin.yml | 5 +++-- Resources/Prototypes/Maps/packed.yml | 4 +++- Resources/Prototypes/Maps/train.yml | 4 +++- Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml | 1 - Resources/Prototypes/Roles/Jobs/departments.yml | 2 -- .../Prototypes/_Sunrise/Roles/Jobs/departments.yml | 10 ++++++++++ .../_Sunrise/Roles/Jobs/play_time_trackers.yml | 2 -- .../Prototypes/_Sunrise/Roles/play_time_trackers.yml | 3 +++ 18 files changed, 52 insertions(+), 21 deletions(-) create mode 100644 Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml delete mode 100644 Resources/Prototypes/_Sunrise/Roles/Jobs/play_time_trackers.yml diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index c8992de5075..eddd112e465 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -60,5 +60,7 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Reporter: [ 2, 2 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml index bf54483058a..eddbc8e0767 100644 --- a/Resources/Prototypes/Maps/box.yml +++ b/Resources/Prototypes/Maps/box.yml @@ -59,6 +59,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] - + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index f69a3916d96..5e46880e719 100644 --- a/Resources/Prototypes/Maps/cluster.yml +++ b/Resources/Prototypes/Maps/cluster.yml @@ -58,6 +58,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] - + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml index f249a930010..1e006983e8b 100644 --- a/Resources/Prototypes/Maps/core.yml +++ b/Resources/Prototypes/Maps/core.yml @@ -63,5 +63,7 @@ Musician: [ 1, 1 ] Boxer: [ 2, 2 ] Reporter: [ 2, 2 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml index 1395457e359..401372e651c 100644 --- a/Resources/Prototypes/Maps/europa.yml +++ b/Resources/Prototypes/Maps/europa.yml @@ -64,5 +64,7 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Reporter: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml index 58063c25171..11e8ef52f28 100644 --- a/Resources/Prototypes/Maps/fland.yml +++ b/Resources/Prototypes/Maps/fland.yml @@ -60,5 +60,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index 4072914cf13..b04d965d077 100644 --- a/Resources/Prototypes/Maps/marathon.yml +++ b/Resources/Prototypes/Maps/marathon.yml @@ -60,5 +60,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml index 7ca5f8cb794..ba92d81ca05 100644 --- a/Resources/Prototypes/Maps/meta.yml +++ b/Resources/Prototypes/Maps/meta.yml @@ -58,5 +58,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml index cb407424100..86e62e1f4b1 100644 --- a/Resources/Prototypes/Maps/oasis.yml +++ b/Resources/Prototypes/Maps/oasis.yml @@ -61,5 +61,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml index d298c35657b..1c0bd134b8e 100644 --- a/Resources/Prototypes/Maps/omega.yml +++ b/Resources/Prototypes/Maps/omega.yml @@ -58,5 +58,7 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 2, 2 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml index 7f47a5841c3..09a998a6453 100644 --- a/Resources/Prototypes/Maps/origin.yml +++ b/Resources/Prototypes/Maps/origin.yml @@ -61,6 +61,7 @@ Musician: [ 2, 2 ] Boxer: [ 1, 1 ] Reporter: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] - + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml index 2750dafa010..fdfe48687c6 100644 --- a/Resources/Prototypes/Maps/packed.yml +++ b/Resources/Prototypes/Maps/packed.yml @@ -57,5 +57,7 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 1 , 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/train.yml b/Resources/Prototypes/Maps/train.yml index 844fe87a2bc..f35bccdd72d 100644 --- a/Resources/Prototypes/Maps/train.yml +++ b/Resources/Prototypes/Maps/train.yml @@ -60,5 +60,7 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 2, 2 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 92ed0935508..3ec0eba51ca 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -7,7 +7,6 @@ - !type:OverallPlaytimeRequirement time: 36000 # 10 hrs startingGear: LawyerGear - setPreference: false # Replaced on the IAA icon: "JobIconLawyer" supervisors: job-supervisors-hop access: diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 8c318e34e3a..400b8948e43 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -13,7 +13,6 @@ color: "#9FED58" weight: -10 roles: - - IAA # Sunrise-Edit - Bartender - Borg - Botanist @@ -38,7 +37,6 @@ description: department-Command-description color: "#052EED" # Sunrise-Edit roles: - - Magistrat # Sunrise-Edit - Captain - CentralCommandOfficial - ChiefEngineer diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml new file mode 100644 index 00000000000..cded07650bc --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml @@ -0,0 +1,10 @@ +- type: department + id: Law + description: department-Law-description + color: "#FF5297" + weight: -10 + roles: + - Magistrat + - IAA + - Lawyer + \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/play_time_trackers.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/play_time_trackers.yml deleted file mode 100644 index fbaa38d06f3..00000000000 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/play_time_trackers.yml +++ /dev/null @@ -1,2 +0,0 @@ -- type: playTimeTracker - id: JobMagistrat \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml index a6fbbfbb1a8..5c7ad1ecf62 100644 --- a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml @@ -1,2 +1,5 @@ - type: playTimeTracker id: JobIAA + +- type: playTimeTracker + id: JobMagistrat \ No newline at end of file From 922dcb371db36d6f77bef932d15656f5ab977f3e Mon Sep 17 00:00:00 2001 From: Rinary Date: Sat, 8 Jun 2024 22:38:23 +0300 Subject: [PATCH 09/11] Magistrat Loadout --- Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml index 2532ae50364..ebb67c6bcc7 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml @@ -8,3 +8,12 @@ - Bra - Pants - Socks + +- type: roleLoadout + id: JobMagistrat + groups: + - CommonBackpack + - Trinkets + - Bra + - Pants + - Socks From a5e41d8691cea63111622f1a948dd5124cdae748 Mon Sep 17 00:00:00 2001 From: Rinary Date: Sun, 9 Jun 2024 00:27:45 +0300 Subject: [PATCH 10/11] Lawyer, Remove Comments from Maps, Adds More Lawyers(from 1 to 3, copyed from comments) --- Resources/Prototypes/Maps/bagel.yml | 3 +-- Resources/Prototypes/Maps/box.yml | 3 +-- Resources/Prototypes/Maps/cluster.yml | 1 - Resources/Prototypes/Maps/core.yml | 1 - Resources/Prototypes/Maps/europa.yml | 1 - Resources/Prototypes/Maps/fland.yml | 3 +-- Resources/Prototypes/Maps/marathon.yml | 3 +-- Resources/Prototypes/Maps/meta.yml | 3 +-- Resources/Prototypes/Maps/oasis.yml | 3 +-- Resources/Prototypes/Maps/omega.yml | 1 - Resources/Prototypes/Maps/origin.yml | 3 +-- Resources/Prototypes/Maps/packed.yml | 1 - Resources/Prototypes/Maps/train.yml | 3 +-- 13 files changed, 8 insertions(+), 21 deletions(-) diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index eddd112e465..493971b9a3b 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -49,7 +49,6 @@ SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - #Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -62,5 +61,5 @@ Reporter: [ 2, 2 ] # Sunrise-Law IAA: [ 1, 1 ] - Lawyer: [ 1, 1 ] + Lawyer: [ 2, 2 ] Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml index eddbc8e0767..529a91011a7 100644 --- a/Resources/Prototypes/Maps/box.yml +++ b/Resources/Prototypes/Maps/box.yml @@ -49,7 +49,6 @@ SecurityOfficer: [ 5, 5 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - #Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -61,5 +60,5 @@ Musician: [ 1, 1 ] # Sunrise-Law IAA: [ 1, 1 ] - Lawyer: [ 1, 1 ] + Lawyer: [ 2, 2 ] Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index 5e46880e719..a1664084570 100644 --- a/Resources/Prototypes/Maps/cluster.yml +++ b/Resources/Prototypes/Maps/cluster.yml @@ -26,7 +26,6 @@ Janitor: [ 1, 1 ] Chaplain: [ 1, 1 ] Librarian: [ 1, 1 ] - #Lawyer: [ 1, 1 ] ServiceWorker: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml index 1e006983e8b..aa49a2d8226 100644 --- a/Resources/Prototypes/Maps/core.yml +++ b/Resources/Prototypes/Maps/core.yml @@ -49,7 +49,6 @@ HeadOfSecurity: [ 1, 1 ] SecurityOfficer: [ 4, 4 ] Warden: [ 1, 1 ] - #Lawyer: [ 1, 1 ] SecurityCadet: [ 1, 1 ] Detective: [ 1, 1 ] #supply diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml index 401372e651c..70c72221e74 100644 --- a/Resources/Prototypes/Maps/europa.yml +++ b/Resources/Prototypes/Maps/europa.yml @@ -51,7 +51,6 @@ HeadOfSecurity: [ 1, 1 ] SecurityOfficer: [ 3, 3 ] Warden: [ 1, 1 ] - #Lawyer: [ 1, 1 ] SecurityCadet: [ 3, 3 ] Detective: [ 1, 1 ] #supply diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml index 11e8ef52f28..eb1152687ad 100644 --- a/Resources/Prototypes/Maps/fland.yml +++ b/Resources/Prototypes/Maps/fland.yml @@ -50,7 +50,6 @@ SecurityOfficer: [ 8, 8 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - #Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -62,5 +61,5 @@ Musician: [ 1, 1 ] # Sunrise-Law IAA: [ 1, 1 ] - Lawyer: [ 1, 1 ] + Lawyer: [ 2, 2 ] Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index b04d965d077..40cdfa7d22b 100644 --- a/Resources/Prototypes/Maps/marathon.yml +++ b/Resources/Prototypes/Maps/marathon.yml @@ -50,7 +50,6 @@ SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - #Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -62,5 +61,5 @@ Musician: [ 1, 1 ] # Sunrise-Law IAA: [ 1, 1 ] - Lawyer: [ 1, 1 ] + Lawyer: [ 2, 2 ] Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml index ba92d81ca05..841d6176728 100644 --- a/Resources/Prototypes/Maps/meta.yml +++ b/Resources/Prototypes/Maps/meta.yml @@ -48,7 +48,6 @@ SecurityOfficer: [ 5, 7 ] Detective: [ 1, 1 ] SecurityCadet: [ 3, 6 ] - #Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -60,5 +59,5 @@ Musician: [ 1, 1 ] # Sunrise-Law IAA: [ 1, 1 ] - Lawyer: [ 1, 1 ] + Lawyer: [ 2, 2 ] Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml index 86e62e1f4b1..fb33ed5de0f 100644 --- a/Resources/Prototypes/Maps/oasis.yml +++ b/Resources/Prototypes/Maps/oasis.yml @@ -51,7 +51,6 @@ SecurityOfficer: [ 8, 8 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - # Lawyer: [ 3, 3 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -63,5 +62,5 @@ Musician: [ 1, 1 ] # Sunrise-Law IAA: [ 1, 1 ] - Lawyer: [ 1, 1 ] + Lawyer: [ 3, 3 ] Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml index 1c0bd134b8e..96284d1cb06 100644 --- a/Resources/Prototypes/Maps/omega.yml +++ b/Resources/Prototypes/Maps/omega.yml @@ -47,7 +47,6 @@ SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 2, 2 ] - #Lawyer: [ 1, 1 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml index 09a998a6453..19567228baf 100644 --- a/Resources/Prototypes/Maps/origin.yml +++ b/Resources/Prototypes/Maps/origin.yml @@ -25,7 +25,6 @@ Janitor: [ 3, 3 ] Chaplain: [ 2, 2 ] Librarian: [ 2, 2 ] - #Lawyer: [ 2, 2 ] ServiceWorker: [ 3, 4 ] #engineering ChiefEngineer: [ 1, 1 ] @@ -63,5 +62,5 @@ Reporter: [ 1, 1 ] # Sunrise-Law IAA: [ 1, 1 ] - Lawyer: [ 1, 1 ] + Lawyer: [ 2, 2 ] Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml index fdfe48687c6..98823aec3e4 100644 --- a/Resources/Prototypes/Maps/packed.yml +++ b/Resources/Prototypes/Maps/packed.yml @@ -46,7 +46,6 @@ SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 2, 2 ] - #Lawyer: [ 1, 1 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/train.yml b/Resources/Prototypes/Maps/train.yml index f35bccdd72d..f38fb923c6f 100644 --- a/Resources/Prototypes/Maps/train.yml +++ b/Resources/Prototypes/Maps/train.yml @@ -49,7 +49,6 @@ Warden: [ 1, 1 ] SecurityOfficer: [ 6, 6 ] SecurityCadet: [ 3, 3 ] - #Lawyer: [ 1, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 2, 2 ] @@ -62,5 +61,5 @@ Borg: [ 2, 2 ] # Sunrise-Law IAA: [ 1, 1 ] - Lawyer: [ 1, 1 ] + Lawyer: [ 1, 2 ] Magistrate: [ 1, 1 ] From d3e64bcdf71104ba29c46b9b40c3671201ad14c0 Mon Sep 17 00:00:00 2001 From: Rinary Date: Sun, 9 Jun 2024 00:53:37 +0300 Subject: [PATCH 11/11] Law department in Sunrise Maps --- Resources/Prototypes/_Sunrise/Maps/box.yml | 5 +++-- Resources/Prototypes/_Sunrise/Maps/cluster.yml | 5 +++-- Resources/Prototypes/_Sunrise/Maps/delta.yml | 2 ++ Resources/Prototypes/_Sunrise/Maps/fland.yml | 5 +++-- Resources/Prototypes/_Sunrise/Maps/marathon.yml | 5 +++-- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/_Sunrise/Maps/box.yml b/Resources/Prototypes/_Sunrise/Maps/box.yml index 99547edc13b..e7f387b52db 100644 --- a/Resources/Prototypes/_Sunrise/Maps/box.yml +++ b/Resources/Prototypes/_Sunrise/Maps/box.yml @@ -51,7 +51,6 @@ SecurityOfficer: [ 5, 5 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - #Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -61,6 +60,8 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 2, 2 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/cluster.yml b/Resources/Prototypes/_Sunrise/Maps/cluster.yml index 87398495cca..f08bec737b1 100644 --- a/Resources/Prototypes/_Sunrise/Maps/cluster.yml +++ b/Resources/Prototypes/_Sunrise/Maps/cluster.yml @@ -28,7 +28,6 @@ Janitor: [ 1, 1 ] Chaplain: [ 1, 1 ] Librarian: [ 1, 1 ] - #Lawyer: [ 1, 1 ] ServiceWorker: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] @@ -60,6 +59,8 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/delta.yml b/Resources/Prototypes/_Sunrise/Maps/delta.yml index 25754b020df..e87ef2aae74 100644 --- a/Resources/Prototypes/_Sunrise/Maps/delta.yml +++ b/Resources/Prototypes/_Sunrise/Maps/delta.yml @@ -29,6 +29,8 @@ Zookeeper: [ 1, 1 ] Captain: [ 1, 1 ] IAA: [ 1, 1 ] + Lawyer: [ 2, 2 ] + Magistrate: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] ChiefEngineer: [ 1, 1 ] StationEngineer: [ 5, 5 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/fland.yml b/Resources/Prototypes/_Sunrise/Maps/fland.yml index bdf007e6fe7..49ab92e43be 100644 --- a/Resources/Prototypes/_Sunrise/Maps/fland.yml +++ b/Resources/Prototypes/_Sunrise/Maps/fland.yml @@ -52,7 +52,6 @@ SecurityOfficer: [ 8, 8 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - #Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -62,5 +61,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 2, 2 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/marathon.yml b/Resources/Prototypes/_Sunrise/Maps/marathon.yml index 594e1b707d0..876fb4bd886 100644 --- a/Resources/Prototypes/_Sunrise/Maps/marathon.yml +++ b/Resources/Prototypes/_Sunrise/Maps/marathon.yml @@ -51,7 +51,6 @@ SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - #Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -61,5 +60,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 2, 2 ] + Magistrate: [ 1, 1 ]