From 890160037fa23a67a547d9c58b9e18440a6287e7 Mon Sep 17 00:00:00 2001 From: keslik Date: Sat, 1 Feb 2025 09:37:22 +0300 Subject: [PATCH] Add: Merc access, ID and door --- .../entities/objects/devices/electronics/door.ftl | 2 ++ .../entities/structures/doors/airlocks/access.ftl | 3 +++ .../objects/misc/identification_cards.ftl | 3 +++ Resources/Prototypes/Access/nonfaction.yml | 3 +++ .../Objects/Devices/Electronics/door_access.yml | 8 ++++++++ .../Objects/Misc/identification_cards.yml | 13 +++++++++++++ .../Entities/Structures/Doors/Airlocks/access.yml | 13 +++++++++++++ .../Roles/Jobs/Fun/misc_startinggear.yml | 1 + .../Textures/Objects/Misc/id_cards.rsi/meta.json | 5 ++++- .../Objects/Misc/id_cards.rsi/non_faction.png | Bin 0 -> 433 bytes 10 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Access/nonfaction.yml create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/non_faction.png diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door.ftl index 3f4ad9693d..b43561b045 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door.ftl @@ -76,3 +76,5 @@ ent-DoorElectronicsTheatre = { ent-DoorElectronics } .desc = { ent-DoorElectronics.desc } ent-DoorElectronicsVault = { ent-DoorElectronics } .desc = { ent-DoorElectronics.desc } +ent-DoorElectronicsMercenary = { ent-DoorElectronics } + .desc = { ent-DoorElectronics.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl index dbd1984b7b..055d1af2b4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl @@ -311,3 +311,6 @@ ent-AirlockSecurityLawyerLocked = { ent-Airlock } .desc = { ent-Airlock.desc } ent-AirlockSyndicateLocked = { ent-Airlock } .desc = { ent-Airlock.desc } +ent-AirlockMercenaryLocked = { ent-Airlock } + .suffix = Наёмник, Закрыт + .desc = { ent-Airlock.desc } В углу имеется небольшой символ Администрации сектора. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/misc/identification_cards.ftl index 658ed8ff0c..da1b875c47 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/misc/identification_cards.ftl @@ -1,2 +1,5 @@ ent-IAAIDCard = ID карта агента внутренних дел .desc = { ent-IDCardStandard.desc } + +ent-MercenaryIDCard = ID карта резидента + .desc = Карта резидента выдаётся Администрацией сектора. Позволяет записывать данные для временного оформления и имеет доступ к личному судну владельца. diff --git a/Resources/Prototypes/Access/nonfaction.yml b/Resources/Prototypes/Access/nonfaction.yml new file mode 100644 index 0000000000..d81cfcb02b --- /dev/null +++ b/Resources/Prototypes/Access/nonfaction.yml @@ -0,0 +1,3 @@ +- type: accessLevel # WD + id: Mercenary + name: id-card-access-level-mercenary diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml index f75fa2584e..5b1f33cf5c 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml @@ -310,3 +310,11 @@ components: - type: AccessReader access: [["Security"], ["Command"]] + +- type: entity # WD + parent: DoorElectronics + id: DoorElectronicsMercenary + suffix: Mercenary, Locked + components: + - type: AccessReader + access: [["Mercenary"]] diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 1b767f5765..0ea10a2cf6 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -950,3 +950,16 @@ - state: idseniorofficer - type: PresetIdCard job: SeniorOfficer + +- type: entity # WD + parent: IDCardStandard + id: MercenaryIDCard + name: mercenary ID card + suffix: Merc + components: + - type: Sprite + layers: + - state: non_faction + - type: Access + tags: + - Mercenary diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index a10b5b5adb..4007307c18 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -1227,3 +1227,16 @@ - type: ContainerFill containers: board: [ DoorElectronicsSyndicateAgent ] + +# WD + +- type: entity + parent: Airlock + id: AirlockMercenaryLocked + suffix: Mercenary, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsMercenary ] + - type: Wires + layoutId: AirlockArmory diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index c472110f14..0257b5d1ce 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -456,6 +456,7 @@ - type: startingGear id: MercenaryStandardGear equipment: + id: MercenaryIDCard jumpsuit: ClothingUniformJumpsuitMercenary back: ClothingBackpackMercFilledStandard head: ClothingHeadBandMerc diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index 404d79385d..708be9dfce 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), non_faction made by keslik", "size": { "x": 32, "y": 32 @@ -226,6 +226,9 @@ { "name": "idmaid" }, + { + "name": "non_faction" + }, { "name": "gold-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/non_faction.png b/Resources/Textures/Objects/Misc/id_cards.rsi/non_faction.png new file mode 100644 index 0000000000000000000000000000000000000000..698018375c2bd77770cdba67c452008636885421 GIT binary patch literal 433 zcmV;i0Z#sjP)&PU=hA{T|pHz@2ey_D=!G)usSK zh@{x&0QQ6|odUOyucT98kJ((@ZJz`1`>p~A4UpQtq+d-!t@R}Kql+jc|Mt^bqwo9t z=NMSdf!H@Oa{wqpf5n6l)3z(8V6*7+k