From d2e09c89578c00c164759465f1f39d0ce6ca15bd Mon Sep 17 00:00:00 2001 From: Surani1 Date: Sat, 21 Sep 2024 17:26:21 +0500 Subject: [PATCH 1/2] tester --- .../Prototypes/Roles/Jobs/departments.yml | 1 + .../Roles/Jobs/Security/security_clown.yml | 44 +++++++++++++++++++ .../Jobs/{ => Security}/security_pilot.yml | 0 .../Roles/Jobs/{ => Security}/senior_sec.yml | 0 .../SS220/Roles/play_time_trackers.yml | 3 ++ 5 files changed, 48 insertions(+) create mode 100644 Resources/Prototypes/SS220/Roles/Jobs/Security/security_clown.yml rename Resources/Prototypes/SS220/Roles/Jobs/{ => Security}/security_pilot.yml (100%) rename Resources/Prototypes/SS220/Roles/Jobs/{ => Security}/senior_sec.yml (100%) diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index d55a677d958eb9..f8433ac775a341 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -127,6 +127,7 @@ - SecurityOfficer - Warden - SecurityPilot + - SecurityClown #ss220 - type: department id: Science diff --git a/Resources/Prototypes/SS220/Roles/Jobs/Security/security_clown.yml b/Resources/Prototypes/SS220/Roles/Jobs/Security/security_clown.yml new file mode 100644 index 00000000000000..91fc74d7c07cea --- /dev/null +++ b/Resources/Prototypes/SS220/Roles/Jobs/Security/security_clown.yml @@ -0,0 +1,44 @@ +- type: job + id: SecurityClown + name: клоун СБ + description: Устройте смешной арест. Покажите экипажу настояющую шутку правосудия! + playTimeTracker: JobSecurityClown + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 300000 # SS220-RoleTime 2 + - !type:SpeciesRequirement #SS220-jobbans begin + inverted: true + species: + - Felinid #SS220-jobbans end + startingGear: SecurityClownGear + icon: "JobIconSecurityPilot" + supervisors: job-supervisors-hos + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + - Clown + - External + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + +- type: startingGear + id: SecurityClownGear + equipment: + eyes: ClothingEyesGlassesSecurity + ears: ClothingHeadsetSecurity + belt: ClothingBeltSecurityFilled + gloves: ClothingHandsGlovesCombat #SS220 PilotsGloves + pocket1: WeaponPistolMk58Nonlethal + storage: + back: + - BoxSurvivalSecurity + - Flash + - MagazinePistolRubber + - MagazinePistolRubber + - FlashlightSeclite + - DrinkRelaxingPeachCan diff --git a/Resources/Prototypes/SS220/Roles/Jobs/security_pilot.yml b/Resources/Prototypes/SS220/Roles/Jobs/Security/security_pilot.yml similarity index 100% rename from Resources/Prototypes/SS220/Roles/Jobs/security_pilot.yml rename to Resources/Prototypes/SS220/Roles/Jobs/Security/security_pilot.yml diff --git a/Resources/Prototypes/SS220/Roles/Jobs/senior_sec.yml b/Resources/Prototypes/SS220/Roles/Jobs/Security/senior_sec.yml similarity index 100% rename from Resources/Prototypes/SS220/Roles/Jobs/senior_sec.yml rename to Resources/Prototypes/SS220/Roles/Jobs/Security/senior_sec.yml diff --git a/Resources/Prototypes/SS220/Roles/play_time_trackers.yml b/Resources/Prototypes/SS220/Roles/play_time_trackers.yml index 9b6e98532ec3b9..bec8d7172a881a 100644 --- a/Resources/Prototypes/SS220/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/SS220/Roles/play_time_trackers.yml @@ -22,6 +22,9 @@ - type: playTimeTracker id: JobSeniorOfficer +- type: playTimeTracker + id: JobSecurityClown + - type: playTimeTracker id: JobSeniorPhysician From fa15ef4548a4c108aa93270fbd5fefa59fda0008 Mon Sep 17 00:00:00 2001 From: Surani1 Date: Sat, 21 Sep 2024 18:35:41 +0500 Subject: [PATCH 2/2] add loadouts, roles, spawn job for clown sec --- .../ss220/loadout-groups/security-clown.ftl | 2 ++ .../SS220/Entities/Objects/Devices/pda.yml | 29 +++++++++++++++++- .../Objects/Misc/identification_cards.yml | 12 ++++++++ .../SS220/Entities/markers/Spawners/jobs.yml | 12 ++++++++ .../Loadouts/Jobs/Security/security_clown.yml | 4 +++ .../SS220/Loadouts/loadout_groups.yml | 21 +++++++++++++ .../SS220/Loadouts/role_loadouts.yml | 12 ++++++++ .../Roles/Jobs/Security/security_clown.yml | 8 +++-- .../Prototypes/SS220/StatusEffects/job.yml | 7 +++++ .../Objects/Devices/pda.rsi/meta.json | 3 ++ .../Devices/pda.rsi/pda-security-clown.png | Bin 0 -> 583 bytes .../Misc/id_cards.rsi/idsecurityclown.png | Bin 0 -> 325 bytes .../Objects/Misc/id_cards.rsi/meta.json | 3 ++ .../Misc/job_icons.rsi/SecurityClown.png | Bin 0 -> 159 bytes .../Interface/Misc/job_icons.rsi/meta.json | 3 ++ 15 files changed, 112 insertions(+), 4 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss220/loadout-groups/security-clown.ftl create mode 100644 Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_clown.yml create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-security-clown.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityclown.png create mode 100644 Resources/Textures/SS220/Interface/Misc/job_icons.rsi/SecurityClown.png diff --git a/Resources/Locale/ru-RU/ss220/loadout-groups/security-clown.ftl b/Resources/Locale/ru-RU/ss220/loadout-groups/security-clown.ftl new file mode 100644 index 00000000000000..9904ab98aaac05 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/loadout-groups/security-clown.ftl @@ -0,0 +1,2 @@ +loadout-group-security-clown-mask = Клоун СБ, маска +loadout-group-security-clown-jumpsuit = Клоун СБ, комбинезон diff --git a/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml index 5761f2887c1025..c69adf37d3e4e6 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml @@ -26,7 +26,7 @@ - type: Icon sprite: Objects/Devices/pda.rsi state: pda-ce_dark - + - type: entity parent: BasePDA id: SeniorServicePDA @@ -84,3 +84,30 @@ - type: Icon sprite: Objects/Devices/pda.rsi state: pda-magistrate + +- type: entity + parent: BasePDA + id: SecurityClownPDA + name: КПК клоуна СБ + description: Красный, потому что СБ. Белый, потому что клоун. + components: + - type: Pda + id: SecurityClownIDCard + state: pda-security-clown + - type: PdaBorderColor + borderColor: "#731611" #SS220 PDA-Resprite + - type: Sprite #SS220 PDA-Resprite-Start + sprite: Objects/Devices/pda.rsi + layers: + - map: [ "enum.PdaVisualLayers.Base" ] + - state: "screen-clown" + shader: "unshaded" + - state: "light_overlay" + map: [ "enum.PdaVisualLayers.Flashlight" ] + shader: "unshaded" + visible: false + - state: "id_overlay" + map: [ "enum.PdaVisualLayers.IdLight" ] + visible: false #SS220 PDA-Resprite-End + - type: Icon + state: pda-security diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml index e386a1a58553c2..fb25e0f07e9018 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml @@ -97,6 +97,18 @@ job: SecurityOfficer name: Рокси +- type: entity + parent: IDCardStandard + id: SecurityClownIDCard + name: ID карта (клоун СБ) + components: + - type: Sprite + layers: + - state: default + - state: idsecurityclown + - type: PresetIdCard + job: SecurityClown + - type: entity parent: PassengerIDCard diff --git a/Resources/Prototypes/SS220/Entities/markers/Spawners/jobs.yml b/Resources/Prototypes/SS220/Entities/markers/Spawners/jobs.yml index 8e3a57a16799e2..2603b697a30089 100644 --- a/Resources/Prototypes/SS220/Entities/markers/Spawners/jobs.yml +++ b/Resources/Prototypes/SS220/Entities/markers/Spawners/jobs.yml @@ -9,3 +9,15 @@ layers: - state: green - state: lawyer + +- type: entity + id: SpawnPointClownSecurity + parent: SpawnPointJobBase + name: Клоун СБ + components: + - type: SpawnPoint + job_id: SecurityClown + - type: Sprite + layers: + - state: green + - state: security_officer diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_clown.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_clown.yml new file mode 100644 index 00000000000000..499ac0ce9f1662 --- /dev/null +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_clown.yml @@ -0,0 +1,4 @@ +- type: loadout + id: ClownSecurityMask + equipment: + mask: ClothingMaskClownSecurity diff --git a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml index 1879db8bf208d5..5f36a9f6127b95 100644 --- a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml @@ -123,6 +123,27 @@ - SecurityHat - PilotCapCap # Пилот (Конец) + + # Клоун СБ (Начало) + +- type: loadoutGroup + id: SecurityClownMask + name: loadout-group-security-clown-mask + loadouts: + - ClownSecurityMask + - ClownPennywiseMask + +- type: loadoutGroup + id: SecurityClownJumpsuit + name: loadout-group-security-clown-jumpsuit + loadouts: + - SecurityGrayJumpsuit + - SecurityGrayJumpskirt + - ClownJumpsuit + - ClownJumpskirt + + # Клоун СБ (Конец) + #! Служба безопасности (Конец) #! Медицинский отдел (Начало) diff --git a/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml b/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml index f56c5473296e06..83b7765f4be90f 100644 --- a/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml @@ -39,6 +39,18 @@ - SecurityBelt - Trinkets + # Клоун СБ + +- type: roleLoadout + id: JobSecurityClown + groups: + - SecurityClownMask + - SecurityNeck #holster loadout + - SecurityClownJumpsuit + - SecurityBackpack + - ClownShoes + - Trinkets + # Пилот - type: roleLoadout id: JobSecurityPilot diff --git a/Resources/Prototypes/SS220/Roles/Jobs/Security/security_clown.yml b/Resources/Prototypes/SS220/Roles/Jobs/Security/security_clown.yml index 91fc74d7c07cea..e1362dc3f01f1b 100644 --- a/Resources/Prototypes/SS220/Roles/Jobs/Security/security_clown.yml +++ b/Resources/Prototypes/SS220/Roles/Jobs/Security/security_clown.yml @@ -12,15 +12,14 @@ species: - Felinid #SS220-jobbans end startingGear: SecurityClownGear - icon: "JobIconSecurityPilot" - supervisors: job-supervisors-hos + icon: "JobIconSecurityClown" + supervisors: job-supervisors-security canBeAntag: false access: - Security - Brig - Maintenance - Service - - Clown - External special: - !type:AddImplantSpecial @@ -29,8 +28,11 @@ - type: startingGear id: SecurityClownGear equipment: + head: ClothingHeadHelmetBasic + id: SecurityClownPDA eyes: ClothingEyesGlassesSecurity ears: ClothingHeadsetSecurity + outerClothing: ClothingOuterArmorBasic belt: ClothingBeltSecurityFilled gloves: ClothingHandsGlovesCombat #SS220 PilotsGloves pocket1: WeaponPistolMk58Nonlethal diff --git a/Resources/Prototypes/SS220/StatusEffects/job.yml b/Resources/Prototypes/SS220/StatusEffects/job.yml index 363b34a89079bf..f2be343727e250 100644 --- a/Resources/Prototypes/SS220/StatusEffects/job.yml +++ b/Resources/Prototypes/SS220/StatusEffects/job.yml @@ -4,3 +4,10 @@ icon: sprite: /Textures/SS220/Interface/Misc/job_icons.rsi state: SecurityPilot + +- type: jobIcon + parent: JobIcon + id: JobIconSecurityClown + icon: + sprite: /Textures/SS220/Interface/Misc/job_icons.rsi + state: SecurityClown diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 584da4c4cf515d..6dcd36b19bf608 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -217,6 +217,9 @@ }, { "name": "pda-seniorofficer" + }, + { + "name": "pda-security-clown" }, { "name": "pda-seniorservice" diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-security-clown.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-security-clown.png new file mode 100644 index 0000000000000000000000000000000000000000..5c966a1fc3dcf9a288a157bad5d193a90de2fbb8 GIT binary patch literal 583 zcmV-N0=WH&P)F6XAutj`Ku_EFKQ4bV(IWt4Wn^$#!$Qabk%GK9 zT~A0aNPhYI&y0_sJR#2kAj^4~nHYGP$O|ZAE)I~z|M$FlPM!mhb)Eh8lNb*(7;~{> zRR>B3m#&^=M3=-H1zfFvt3!!bS~FkezqlHvJth_Bwie-Ag)n;8;Y&wl>_ z)5cI4Gb2-mQ|C@&br{~TJ@DllhKpgAgDgh29NBa!Ru%>jh5?Y}uU|jIFbgD4Qsg3A zjxRny(S;mkxGV>mK`<8}TLcPrT)swDhbtXmb2MHDEM2+nznY3PSl_KXPZ^GtW#aQV zgU^hW3?TI@muv*9^Qg^X_`mxE!}4%1occ%#0b+a)vMD^qAFo4^B}qyH_)Puu=@VQU z6auhNAmkFPDHEm%R1m>ZGbn3q{fk{W%yOW5l++I@h&F%x0xk`4IfUX6K=wHy-;$gN z(KSS{VeyCvKU~@8zyBEOgZUX6*M0=kTecG}J&8_)$OQ|?M%CsFU}^Y<;mfo&a0h@& zOpxW(H|{btYA6GXWpG`97mytVAj>5sMX(y)3bdS9fHx5?Q;_^mj4$w6cJ|v3hNuV6 zaoU473TD0e2&{y@5bGJN>R=TbE<^B!07#Pq4;MuZ5^NP3MLrtUJQ@O{AwcaA007i! VqD(%QGkE|2002ovPDHLkV1izd<-`C0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityclown.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityclown.png new file mode 100644 index 0000000000000000000000000000000000000000..4df7ae94093c9508a8b46461fe6897cdd0f0e711 GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQse z#W5tpJvl*wb+Mv>6cd+of{tg!Pq|9ipLYp>(A! z#U(%aKUto+ZqOX2Gw(dZlw^yV1pUC3?@bJNXZ-o!AFO-Ngke+0t0i?J{tZVQ6dAZJ zopwG@2-wa!FF`?DT59Gj<0c_BjTR2eh5(VCQ~hlRGB|o51Or2ed96fpFKak32pBwF L{an^LB{Ts5LQrw( 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 eab9d73e8ff11e..97ab6d599b526a 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -145,6 +145,9 @@ { "name": "idsecurityofficer" }, + { + "name": "idsecurityclown" + }, { "name": "idshaftminer" }, diff --git a/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/SecurityClown.png b/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/SecurityClown.png new file mode 100644 index 0000000000000000000000000000000000000000..54363bc35e61093b19177b20cf6013fea7bc5350 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqoCO|{#S9GGLLkg|>2BR0pkSb< zi(`mHc&oo77lQ)F?2D7DT;{*J^8MFjQ$-2Et=+44u54@Nvv}Rf7O^a1de9xiGmG4J zET0|x|5M!sU-gZXPweNsxWMmjb5zfT3RzFN?EUBFbf!vG@%YTV4>X*?)78&qol`;+ E06{c2