From 795fe5c244a54034d1fe74ccc910813a597e9b20 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Tue, 19 Sep 2023 16:22:56 +0200 Subject: [PATCH 1/2] Martial Artist, Prison Guard, Prisoner and Gladiator (#21) * Martial, Guard, Prisoner, Gladiator Prisoner is like halfway in wizden so that's a bit funky * Boxing for Boxer, add jobicons to agent ID * DataDefinition partial * change geta equiped textures * Fixes * Fix copyrights * New prisonguard icon * Preference, martial civilian colors * add ref to boxer nyano component * comment out whitelistrequired and spawner * Remove prisoner and guard from specific Not that specific * Fix prisonguard id card For some reason the security officer id card icon is not at the correct place. * Update comments --------- Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --- .../Abilities/Boxer/Boxer/BoxerComponent.cs | 22 +++++ .../Boxer/Boxer/BoxingGlovesComponent.cs | 10 +++ .../Abilities/Boxer/BoxingSystem.cs | 38 +++++++++ .../en-US/nyanotrasen/job/job-description.ftl | 4 + .../en-US/nyanotrasen/job/job-names.ftl | 4 + .../Entities/Mobs/Corpses/corpses.yml | 2 + .../Objects/Misc/identification_cards.yml | 3 + .../Nyanotrasen/Clothing/Shoes/misc.yml | 10 +++ .../Entities/Markers/Spawners/jobs.yml | 51 ++++++++++++ .../Devices/Misc/identification_cards.yml | 51 ++++++++++++ .../Entities/Objects/Devices/pda.yml | 43 ++++++++++ .../Nyanotrasen/Recipes/Lathes/clothing.yml | 9 ++ .../Roles/Jobs/Security/prisonguard.yml | 34 ++++++++ .../Roles/Jobs/Wildcards/gladiator.yml | 34 ++++++++ .../Roles/Jobs/Wildcards/martialartist.yml | 36 ++++++++ .../Roles/Jobs/Wildcards/prisoner.yml | 23 ++++++ .../Nyanotrasen/Roles/play_time_trackers.yml | 2 + .../Nyanotrasen/StatusEffects/job.yml | 20 +++++ .../Prototypes/Roles/Jobs/Wildcards/boxer.yml | 9 ++ .../Prototypes/Roles/Jobs/departments.yml | 6 ++ .../Interface/Misc/job_icons.rsi/meta.json | 20 +++++ .../Misc/job_icons.rsi/nyanoGladiator.png | Bin 0 -> 172 bytes .../Misc/job_icons.rsi/nyanoMartialArtist.png | Bin 0 -> 167 bytes .../Misc/job_icons.rsi/nyanoPrisonGuard.png | Bin 0 -> 163 bytes .../DeltaV/Markers/jobs.rsi/green.png | Bin 0 -> 309 bytes .../DeltaV/Markers/jobs.rsi/meta.json | 26 ++++++ .../Markers/jobs.rsi/nyanogladiator.png | Bin 0 -> 567 bytes .../Markers/jobs.rsi/nyanomartialartist.png | Bin 0 -> 921 bytes .../DeltaV/Markers/jobs.rsi/nyanoprisoner.png | Bin 0 -> 828 bytes .../Markers/jobs.rsi/nyanoprisonguard.png | Bin 0 -> 913 bytes .../Misc/id_cards.rsi/blue-inhand-left.png | Bin 0 -> 256 bytes .../Misc/id_cards.rsi/blue-inhand-right.png | Bin 0 -> 356 bytes .../Objects/Misc/id_cards.rsi/centcom.png | Bin 0 -> 409 bytes .../Misc/id_cards.rsi/default-inhand-left.png | Bin 0 -> 177 bytes .../id_cards.rsi/default-inhand-right.png | Bin 0 -> 179 bytes .../Objects/Misc/id_cards.rsi/default.png | Bin 0 -> 355 bytes .../Misc/id_cards.rsi/gold-inhand-left.png | Bin 0 -> 177 bytes .../Misc/id_cards.rsi/gold-inhand-right.png | Bin 0 -> 180 bytes .../DeltaV/Objects/Misc/id_cards.rsi/gold.png | Bin 0 -> 473 bytes .../Objects/Misc/id_cards.rsi/meta.json | 78 ++++++++++++++++++ .../Misc/id_cards.rsi/nyanogladiator.png | Bin 0 -> 217 bytes .../Misc/id_cards.rsi/nyanomartialartist.png | Bin 0 -> 225 bytes .../Misc/id_cards.rsi/nyanoprisoner.png | Bin 0 -> 211 bytes .../Misc/id_cards.rsi/nyanoprisonguard.png | Bin 0 -> 1502 bytes .../Misc/id_cards.rsi/orange-inhand-left.png | Bin 0 -> 283 bytes .../Misc/id_cards.rsi/orange-inhand-right.png | Bin 0 -> 284 bytes .../Objects/Misc/id_cards.rsi/orange.png | Bin 0 -> 375 bytes .../Misc/id_cards.rsi/silver-inhand-left.png | Bin 0 -> 173 bytes .../Misc/id_cards.rsi/silver-inhand-right.png | Bin 0 -> 175 bytes .../Objects/Misc/id_cards.rsi/silver.png | Bin 0 -> 462 bytes .../Shoes/Misc/geta.rsi/equipped-FEET.png | Bin 0 -> 389 bytes .../Clothing/Shoes/Misc/geta.rsi/icon.png | Bin 0 -> 304 bytes .../Shoes/Misc/geta.rsi/inhand-left.png | Bin 0 -> 421 bytes .../Shoes/Misc/geta.rsi/inhand-right.png | Bin 0 -> 414 bytes .../Clothing/Shoes/Misc/geta.rsi/meta.json | 26 ++++++ 55 files changed, 561 insertions(+) create mode 100644 Content.Server/Nyanotrasen/Abilities/Boxer/Boxer/BoxerComponent.cs create mode 100644 Content.Server/Nyanotrasen/Abilities/Boxer/Boxer/BoxingGlovesComponent.cs create mode 100644 Content.Server/Nyanotrasen/Abilities/Boxer/BoxingSystem.cs create mode 100644 Resources/Locale/en-US/nyanotrasen/job/job-description.ftl create mode 100644 Resources/Locale/en-US/nyanotrasen/job/job-names.ftl create mode 100644 Resources/Prototypes/Nyanotrasen/Clothing/Shoes/misc.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Recipes/Lathes/clothing.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Roles/play_time_trackers.yml create mode 100644 Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoGladiator.png create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMartialArtist.png create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png create mode 100644 Resources/Textures/DeltaV/Markers/jobs.rsi/green.png create mode 100644 Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Markers/jobs.rsi/nyanogladiator.png create mode 100644 Resources/Textures/DeltaV/Markers/jobs.rsi/nyanomartialartist.png create mode 100644 Resources/Textures/DeltaV/Markers/jobs.rsi/nyanoprisoner.png create mode 100644 Resources/Textures/DeltaV/Markers/jobs.rsi/nyanoprisonguard.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/blue-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/blue-inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/centcom.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default-inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold-inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanogladiator.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomartialartist.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanoprisoner.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange-inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver-inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver.png create mode 100644 Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/icon.png create mode 100644 Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/inhand-left.png create mode 100644 Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/inhand-right.png create mode 100644 Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/meta.json diff --git a/Content.Server/Nyanotrasen/Abilities/Boxer/Boxer/BoxerComponent.cs b/Content.Server/Nyanotrasen/Abilities/Boxer/Boxer/BoxerComponent.cs new file mode 100644 index 00000000000..b844e5e8f5a --- /dev/null +++ b/Content.Server/Nyanotrasen/Abilities/Boxer/Boxer/BoxerComponent.cs @@ -0,0 +1,22 @@ +using Content.Shared.Damage; + +namespace Content.Server.Abilities.Boxer; + +/// +/// Added to the boxer on spawn. +/// +[RegisterComponent] +public sealed partial class BoxerComponent : Component +{ + [DataField("modifiers", required: true)] + public DamageModifierSet UnarmedModifiers = default!; + + [DataField("rangeBonus")] + public float RangeBonus = 1.5f; + + /// + /// Damage modifier with boxing glove stam damage. + /// + [DataField("boxingGlovesModifier")] + public float BoxingGlovesModifier = 1.75f; +} diff --git a/Content.Server/Nyanotrasen/Abilities/Boxer/Boxer/BoxingGlovesComponent.cs b/Content.Server/Nyanotrasen/Abilities/Boxer/Boxer/BoxingGlovesComponent.cs new file mode 100644 index 00000000000..cb7c57f6aac --- /dev/null +++ b/Content.Server/Nyanotrasen/Abilities/Boxer/Boxer/BoxingGlovesComponent.cs @@ -0,0 +1,10 @@ +using Content.Shared.Damage; + +namespace Content.Server.Abilities.Boxer; + +/// +/// Boxer gets a bonus for these, and their fists, but not other unarmed weapons. +/// +[RegisterComponent] +public sealed partial class BoxingGlovesComponent : Component +{} diff --git a/Content.Server/Nyanotrasen/Abilities/Boxer/BoxingSystem.cs b/Content.Server/Nyanotrasen/Abilities/Boxer/BoxingSystem.cs new file mode 100644 index 00000000000..8bb68cb6f55 --- /dev/null +++ b/Content.Server/Nyanotrasen/Abilities/Boxer/BoxingSystem.cs @@ -0,0 +1,38 @@ +using Content.Shared.Damage.Events; +using Content.Shared.Weapons.Melee; +using Content.Shared.Weapons.Melee.Events; +using Robust.Shared.Containers; + +namespace Content.Server.Abilities.Boxer; + +public sealed partial class BoxingSystem : EntitySystem +{ + [Dependency] private readonly SharedContainerSystem _containerSystem = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnInit); + SubscribeLocalEvent(OnMeleeHit); + SubscribeLocalEvent(OnStamHit); + } + + private void OnInit(EntityUid uid, BoxerComponent component, ComponentInit args) + { + if (TryComp(uid, out var meleeComp)) + meleeComp.Range *= component.RangeBonus; + } + private void OnMeleeHit(EntityUid uid, BoxerComponent component, MeleeHitEvent args) + { + args.ModifiersList.Add(component.UnarmedModifiers); + } + + private void OnStamHit(EntityUid uid, BoxingGlovesComponent component, StaminaMeleeHitEvent args) + { + if (!_containerSystem.TryGetContainingContainer(uid, out var equipee)) + return; + + if (TryComp(equipee.Owner, out var boxer)) + args.Multiplier *= boxer.BoxingGlovesModifier; + } +} diff --git a/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl new file mode 100644 index 00000000000..dba1922e8d3 --- /dev/null +++ b/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl @@ -0,0 +1,4 @@ +job-description-gladiator = Put on a combat spectacle for the crew. Fight for your freedom, glory, and honor. +job-description-guard = Keep track of prisoners and make sure they have their basic needs. +job-description-martialartist = Be honorable and disciplined, spar in the dojo, challenge security to CQC. +job-description-prisoner = Sit in prison. Gamble with your cellmates. Talk to the warden. Write your memoirs. diff --git a/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl new file mode 100644 index 00000000000..b32b70f8511 --- /dev/null +++ b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl @@ -0,0 +1,4 @@ +job-name-gladiator = Gladiator +job-name-guard = Prison Guard +job-name-martialartist = Martial Artist +job-name-prisoner = Prisoner diff --git a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml index c8d2f236fa1..6adee8f1df4 100644 --- a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml +++ b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml @@ -15,6 +15,7 @@ - ChefGear - ChaplainGear - PassengerGear + - MartialArtistGear # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml - type: entity parent: SalvageHumanCorpse @@ -70,6 +71,7 @@ - SecurityOfficerGear - DetectiveGear - WardenGear + - PrisonGuardGear # Nyanotrasen - PrisonGuard, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml - type: entity parent: SalvageHumanCorpse diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index cca026f7d8a..67d9826e220 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -562,6 +562,9 @@ - JobIconSeniorOfficer - JobIconSeniorEngineer - JobIconSeniorResearcher + - JobIconPrisonGuard # Nyanotrasen - PrisonGuard, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml + - JobIconMartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml + - JobIconGladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml - type: ActivatableUI key: enum.AgentIDCardUiKey.Key inHandsOnly: true diff --git a/Resources/Prototypes/Nyanotrasen/Clothing/Shoes/misc.yml b/Resources/Prototypes/Nyanotrasen/Clothing/Shoes/misc.yml new file mode 100644 index 00000000000..279ee88250a --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Clothing/Shoes/misc.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingShoesBaseButcherable + id: ClothingShoesGeta + name: geta sandals + description: A pair of traditional japanese sandals. + components: + - type: Sprite + sprite: Nyanotrasen/Clothing/Shoes/Misc/geta.rsi + - type: Clothing + sprite: Nyanotrasen/Clothing/Shoes/Misc/geta.rsi diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml new file mode 100644 index 00000000000..0b387eaadbc --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml @@ -0,0 +1,51 @@ +- type: entity + id: SpawnPointGladiator + parent: SpawnPointJobBase + name: gladiator + components: + - type: SpawnPoint + job_id: Gladiator + - type: Sprite + sprite: DeltaV/Markers/jobs.rsi + layers: + - state: green + - state: nyanogladiator + +- type: entity + id: SpawnPointPrisoner + parent: SpawnPointJobBase + name: prisoner + components: + - type: SpawnPoint + job_id: Prisoner + - type: Sprite + sprite: DeltaV/Markers/jobs.rsi + layers: + - state: green + - state: nyanoprisoner + +- type: entity + id: SpawnPointPrisonGuard + parent: SpawnPointJobBase + name: prison guard + components: + - type: SpawnPoint + job_id: PrisonGuard + - type: Sprite + sprite: DeltaV/Markers/jobs.rsi + layers: + - state: green + - state: nyanoprisonguard + +- type: entity + id: SpawnPointMartialArtist + parent: SpawnPointJobBase + name: martial artist + components: + - type: SpawnPoint + job_id: MartialArtist + - type: Sprite + sprite: DeltaV/Markers/jobs.rsi + layers: + - state: green + - state: nyanomartialartist diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml new file mode 100644 index 00000000000..47047af2f43 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml @@ -0,0 +1,51 @@ +- type: entity + parent: IDCardStandard + id: PrisonerIDCard + name: prisoner ID card + components: + - type: Sprite + sprite: DeltaV/Objects/Misc/id_cards.rsi + layers: + - state: orange + - state: nyanoprisoner + - type: PresetIdCard + job: Prisoner + +- type: entity + parent: IDCardStandard + id: GladiatorIDCard + name: gladiator ID card + components: + - type: Sprite + sprite: DeltaV/Objects/Misc/id_cards.rsi + layers: + - state: orange + - state: nyanogladiator + - type: PresetIdCard + job: Gladiator + +- type: entity + parent: IDCardStandard + id: PrisonGuardIDCard + name: prison guard ID card + components: + - type: Sprite + sprite: DeltaV/Objects/Misc/id_cards.rsi + layers: + - state: default + - state: nyanoprisonguard + - type: PresetIdCard + job: PrisonGuard + +- type: entity + parent: IDCardStandard + id: MartialArtistIDCard + name: martial artist ID card + components: + - type: Sprite + sprite: DeltaV/Objects/Misc/id_cards.rsi + layers: + - state: default + - state: nyanomartialartist + - type: PresetIdCard + job: MartialArtist diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml new file mode 100644 index 00000000000..d83f03d2ea4 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml @@ -0,0 +1,43 @@ +- type: entity + parent: BasePDA + id: PrisonerPDA + name: prisoner PDA + description: Clear, so you can make sure there's nothing being smuggled inside. + components: + - type: Pda + id: PrisonerIDCard + state: pda-clear + - type: Icon + state: pda-clear + +- type: entity + parent: PrisonerPDA + id: GladiatorPDA + name: gladiator PDA + components: + - type: Pda + id: GladiatorIDCard + +- type: entity + parent: BasePDA + id: PrisonGuardPDA + name: prison guard PDA + description: Red to hide the stains of prisoner blood. + components: + - type: Pda + id: PrisonGuardIDCard + state: pda-security + - type: PdaBorderColor + borderColor: "#A32D26" + accentVColor: "#DFDFDF" + - type: Icon + state: pda-security + +- type: entity + parent: BoxerPDA + id: MartialArtistPDA + name: martial artist PDA + components: + - type: Pda + id: MartialArtistIDCard + state: pda-boxer diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/clothing.yml new file mode 100644 index 00000000000..d498a4ee5f5 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/clothing.yml @@ -0,0 +1,9 @@ +- type: latheRecipe + id: ClothingUniformJumpsuitPrisonGuard + icon: + sprite: Nyanotrasen/Clothing/Uniforms/Jumpsuit/prisonguard.rsi + state: icon + result: ClothingUniformJumpsuitPrisonGuard + completetime: 4 + materials: + Cloth: 300 diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml new file mode 100644 index 00000000000..2d91ac9a645 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml @@ -0,0 +1,34 @@ +- type: job + id: PrisonGuard + name: job-name-guard + description: job-description-guard + playTimeTracker: JobSecurityOfficer + requirements: + - !type:OverallPlaytimeRequirement + time: 18000 + startingGear: PrisonGuardGear +# alwaysUseSpawner: true + canBeAntag: false + icon: "JobIconPrisonGuard" + supervisors: job-supervisors-warden + setPreference: true +# whitelistRequired: true + access: + - Security + - Brig + - Maintenance + +- type: startingGear + id: PrisonGuardGear + equipment: + jumpsuit: ClothingUniformJumpsuitPrisonGuard + back: ClothingBackpackSecurityFilled + shoes: ClothingShoesBootsJack + eyes: ClothingEyesGlassesSecurity + head: ClothingHeadPrisonGuard + id: PrisonGuardPDA + ears: ClothingHeadsetSecurity + belt: ClothingBeltSecurityFilled + innerclothingskirt: ClothingUniformJumpsuitPrisonGuard + satchel: ClothingBackpackSatchelSecurityFilled + duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml new file mode 100644 index 00000000000..123a4234f33 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml @@ -0,0 +1,34 @@ +- type: job + id: Gladiator + name: job-name-gladiator + description: job-description-gladiator + playTimeTracker: JobPrisoner + startingGear: GladiatorGear +# alwaysUseSpawner: true + canBeAntag: false + icon: "JobIconGladiator" + supervisors: job-supervisors-security + setPreference: true +# whitelistRequired: true + requirements: + - !type:OverallPlaytimeRequirement + time: 3600 + special: + - !type:AddComponentSpecial + components: + - type: Boxer + modifiers: + coefficients: # These only apply to unarmed + Blunt: 1.5 + Slash: 1.5 + Piercing: 1.5 + +- type: startingGear + id: GladiatorGear + equipment: + jumpsuit: UniformShortsRed + outerClothing: ClothingOuterArmorGladiator + id: GladiatorPDA + ears: ClothingHeadsetGrey + innerclothingskirt: UniformShortsRedWithTop + #any other possessions, spawn in cell diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml new file mode 100644 index 00000000000..11df4b2ae04 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml @@ -0,0 +1,36 @@ +- type: job + id: MartialArtist + name: job-name-martialartist + description: job-description-martialartist + playTimeTracker: JobBoxer + startingGear: MartialArtistGear + icon: "JobIconMartialArtist" + supervisors: job-supervisors-hop + setPreference: true +# whitelistRequired: true + access: + - Service + extendedAccess: + - Maintenance + special: + - !type:AddComponentSpecial + components: + - type: Boxer + modifiers: + coefficients: # These only apply to unarmed + Blunt: 1.5 + Slash: 1.5 + Piercing: 1.5 + +- type: startingGear + id: MartialArtistGear + equipment: + jumpsuit: ClothingUniformMartialGi + belt: ClothingBeltMartialBlack + back: ClothingBackpackFilled + id: MartialArtistPDA + ears: ClothingHeadsetService + shoes: ClothingShoesGeta + gloves: ClothingHandsGlovesBoxingRed + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml new file mode 100644 index 00000000000..340e980d0ba --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml @@ -0,0 +1,23 @@ +- type: job + id: Prisoner + name: job-name-prisoner + description: job-description-prisoner + playTimeTracker: JobPrisoner + startingGear: PrisonerGear +# alwaysUseSpawner: true + canBeAntag: false +# whitelistRequired: true + icon: "JobIconPrisoner" + supervisors: job-supervisors-security + requirements: + - !type:OverallPlaytimeRequirement + time: 3600 + +- type: startingGear + id: PrisonerGear + equipment: + jumpsuit: ClothingUniformJumpsuitPrisoner + shoes: ClothingShoesColorBlack + id: PrisonerPDA + ears: ClothingHeadsetGrey + innerclothingskirt: ClothingUniformJumpsuitPrisoner diff --git a/Resources/Prototypes/Nyanotrasen/Roles/play_time_trackers.yml b/Resources/Prototypes/Nyanotrasen/Roles/play_time_trackers.yml new file mode 100644 index 00000000000..a3b43b47169 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Roles/play_time_trackers.yml @@ -0,0 +1,2 @@ +- type: playTimeTracker + id: JobPrisoner diff --git a/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml b/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml new file mode 100644 index 00000000000..610346d73d5 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml @@ -0,0 +1,20 @@ +- type: statusIcon + parent: JobIcon + id: JobIconGladiator + icon: + sprite: DeltaV/Interface/Misc/job_icons.rsi + state: nyanoGladiator + +- type: statusIcon + parent: JobIcon + id: JobIconPrisonGuard + icon: + sprite: DeltaV/Interface/Misc/job_icons.rsi + state: nyanoPrisonGuard + +- type: statusIcon + parent: JobIcon + id: JobIconMartialArtist + icon: + sprite: DeltaV/Interface/Misc/job_icons.rsi + state: nyanoMartialArtist diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml index 1be182f1f72..ea214f528de 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml @@ -9,6 +9,15 @@ access: - Service - Maintenance + special: # Nyanotrasen - BoxerComponent, see Content.Server/Nyanotrasen/Abilities/Boxer/Boxer/BoxerComponent.cs + - !type:AddComponentSpecial + components: + - type: Boxer + modifiers: + coefficients: # These only apply to unarmed + Blunt: 1.5 + Slash: 1.5 + Piercing: 1.5 - type: startingGear id: BoxerGear diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index be61540c395..a4db7a9b425 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -29,6 +29,9 @@ - Reporter - Zookeeper - ServiceWorker + - MartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml + - Prisoner # Nyanotrasen - Prisoner, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml + - Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml - type: department id: Command @@ -79,6 +82,7 @@ - SeniorOfficer - Detective - Warden + - PrisonGuard # Nyanotrasen - PrisonGuard, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml - type: department id: Science @@ -99,3 +103,5 @@ - Reporter - Zookeeper - Psychologist + - MartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml + - Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json new file mode 100644 index 00000000000..84367d87754 --- /dev/null +++ b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers", + "size": { + "x": 8, + "y": 8 + }, + "states": [ + { + "name": "nyanoPrisonGuard" + }, + { + "name": "nyanoGladiator" + }, + { + "name": "nyanoMartialArtist" + } + ] +} diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoGladiator.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoGladiator.png new file mode 100644 index 0000000000000000000000000000000000000000..e5ec3b32c2047f38324e42619486a8cac8f5d7d0 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X{5)M8Ln>}1{rUgjzPX{{Ks}qzgTw9oJvs`Wnwpv-o!Qsd zHD*qb5#FUYLxsoS;iM~}1@$m7bF*N<>xxuK+?GY3eCAIp^<>mhWjSpG~ ztNXDe^Du0AWUt3CDLF}jp+M`z`Sa|Tbxz3SFf3^hd=eFNkA=g4;h>1lVJLn>}1{rUgj-kDqZaXp*Pf@lBh-NYs=VP`I5n3UXD z=<{!}R8iYRK_6p70fr;m4U(Pb(hjES8zmfh?z`Z<1S1m<1An&2OwCiJbASdic)I$z JtaD0e0s#7^G+Y1x literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/green.png b/Resources/Textures/DeltaV/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/DeltaV/Markers/jobs.rsi/meta.json b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json new file mode 100644 index 00000000000..19ff5440e10 --- /dev/null +++ b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "green" + }, + { + "name": "nyanoprisonguard" + }, + { + "name": "nyanoprisoner" + }, + { + "name": "nyanomartialartist" + }, + { + "name": "nyanogladiator" + } + ] +} diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/nyanogladiator.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/nyanogladiator.png new file mode 100644 index 0000000000000000000000000000000000000000..d08fb136e36a91bc886c75c57ef7be44c45f008e GIT binary patch literal 567 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X>H>U1Ts5_wbS*XDeA{ZD- ztYoL`-&S7Rn83g=ciGttpmG?f3r-9P{BUo<64 zvxnJp%#_*8&z&P=`uF0M{^h~fOVuT}94?UH`(3Nu`1SO*+hvb`C^nv*mDF=(zxRX0 z%QBBYZhf!%;mYyqcgmg%I1RtMF_imCm-X+y;HA(#;nDeRYzz?=&mZW9nJ!3No1Ut( zAu5ESFs3>;@9ZQ=t^=k`kAB?L(3yVimXN>{vwS!054DD@uE!fbXP-Y1dsOs7i_CK# z;j4@XHP%}=%6<^ZoNCi-;94MMzB5}qhLh=i(!*LS2gQI$_D4}o$C<5cuf&NR-}8O5 zme_&MTB7q^7Z?R7DX_@NDbyA133a-4ES|0UR#XCOB7*DwU{plq;RtW~1 Xy%Wlr^>+UR1}%f9tDnm{r-UW|C#UP! literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/nyanomartialartist.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/nyanomartialartist.png new file mode 100644 index 0000000000000000000000000000000000000000..ba9c5ab1fe223c6e881359bd2a626b521374c34c GIT binary patch literal 921 zcmV;K17`e*P))Ezo)jq=bbK4dzR|IASnd1zedo{joqHw57#(Dj>3~~JwF75;vurcJ$>shF z{Zh5_NR=J|fWfymw`hHRof?}OIYkyD)YsJ~>3ReJX9Y&tbe5KvmKE@HDy<4mw*UaX z7F#1*=pD5=+7$43JWkn6mc)_h7Ck8-4Vb}E%4h#%PB8ZhQ-$*tY z=vdQn&Y@QWUhxrlJRX{xn`2FFCn%lFCPG8Lv+MqQV2Ti z=&v-0vI6k?{cLn}l*`@S-PF?3LI(GBGMJ2nv^kLkd1He{xc6L%M7NbBQpzMGE z600w@!w>!#SI$xFx&xRj5{b~@;GiT{ipy5Idgx*Y;0J$<+w*e_kYF�k9&`5{ZOr z^{uU~s&Uwb(g3S|j$aO4W_H&}N~|U*`6Eit7YjTXS(a&GVS)QNoledRg#r)chFvC0 zLp@m=t+e>*GhH2jBklQv1i4OBPhsCjN+y%4K713D9);!9Y3`4pHOT_hdE`5GU}9o| zIyySYVzE$fZ!c|ZY$&?R<>LMD`yF&SZ+!6x{zWhDTw)-|KA(>j0h!%yXGWuuMWa#9 zp~H^;onv+*D#uCCg(OouQd0&>_00000NkvXXu0mjfXhN?0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/nyanoprisoner.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/nyanoprisoner.png new file mode 100644 index 0000000000000000000000000000000000000000..35383af8cb4b8fdf7e86a45af8deb5ef0ec3c6be GIT binary patch literal 828 zcmV-C1H=4@P)_-;&_f`k z_2h#gvZM(^uVM;;hMSnN98L{HQO4=vdN;33@9tFyzc9`@zrWw}KQ!N(|E#nCtBnIc23fSx#9g zR!Nv5us^x$)vj)|O2Tvnb~ZKv7^~mWjhfsnO!x0xZ>PwTT}1zGu@?SATKYB4Ub?`d zGC^)_lj(StE)b1`2CK=z?>Ix{4aGVF3A8t%r|zDbyhK*NV=JWmTKl)zmS*L#MOCt+xGF!@0e z2a}s6k#rk+hSj7R+(oec;EgW1Z&I~0gCiMgyVrttEIV|1S(Z^0MJH>?3<99}8CAis z3r6>LJ(~H17W&ASpk!~?_2CKvHNlwO_lRm&vfLN*Gs2Msyw|JfP!#g=@<@qB)e0;F zGpfF#0-Wz1I-mUX9ll7Fbj-{k%Q7%voxtmRrQ~$95)Le}9#~)~^pSiCR=43{G1P}4 zP!r_y7+gKC9?J6j&0Kb7lkU99{K!`Z297~MgI$sU;uQdz=Mz`pu`?UHBoPiQB@^11 zz|O`d=j<0*S0;Gr4C<9Xx+!+*MeBhD?2?3Cl2{Kc7!ok-Q|%L*TiayoawBf#9Bw;1 zub%q-K1T5kD{wH#ovirWyQp8!&L{Rc7J)?YE<)-m%tq94_lll~8CZIhrmm_dzR`zm zYLA3f{P$P!=_BAfP6NL|d3hQ-iCE~-JIauBIaEdnVbq95Gk!ljFWS`^H}r3+gm{SXm_ z(4sbl$XF0E)xv0Eupy0^g&K@A;>b8!(|p(N^D(CHz6o7*HurJgz2|)QJLi7qJqwDk zD{kbtt*v2g^XT;I^MeR1W?Y(DOvm?q$TcONTpJE)Dg$Sv29?00J;yXrhxW3(~Oh0s7A-YXZ6!_Q&9{!ozC3t<~W!NX{7!} z)QNaJZpx>r#WL8$z5ZPL%|6&{HVr@~lflTXUhKQpW6Gzg#f-+_d)wPY;B#GP@oez9 zHgfLk$fzk0MFH4-=rFAI3S?91b>sJsAGQ{NWPu zG=drWV!o(Nr+_zrcmK%GFcx;K-Ga(r!26vZp$TSgf++wDPQjrHQuQc21i|1GCOJ=m zQU#$5fD+v50mi}rM;bwNz1fGs6BC*=%l8~rBv}anPtH4k_gGY%TAr35&c8i~r^i2O zfb{QGKqvu_4M?gTYk)T73**eIX1q8RMQ3o87S@1NNtMQA2tZFgTki0JQwzYHO9o^o zq#Sot#zm`^DcdX+N&t8=2KV+1)Q0-I6Vf^7B?EjW<%R1w|4#rs9*^jJq}K2EuLGd3 z0X={~Adrx$3WviR9@LNlsr^4DV@OVZ8xQpLv=}kq@9iIVH0^2G)#Nhl4axwh`>8|% zz1L5R{K~JQ!Wv)-`tH1hy|z}Y&x78yHz)y+&F4?2LrqN$>g(%KS62t0&xc?zh}qd$ z%*@PSZf=ep6Wl{H>JNqh=!9wD$X-uPC@n2r)8K-q<>h6eg8DrhF3!JD0-$#wMX9W; zOiV8>E~31=Ts$u=ErA~8l<(CmbZD})NK-mrTr`5CaAHcRSAagDY zPNqQC#FiFeb#=A&Q^J7r^YfO!&24t|^zTgFg1i9bR#sNTeuu*$##k(7ak*RqR5F-FaHR3n?sA`*!R)guTAfWfJbZnqm&tCd=SP$*>R-*ADXi+L`j nHJwh2lU7w#i4WC6Q>lgD4S(1$^dm+V00000NkvXXu0mjfC~L3E literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/blue-inhand-left.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/blue-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9adcd4b6a3c02f8ac0b92c94b19bf4054a69e1f9 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=$30yfLn`LHy|t0I*@34uG5*vW z2jNp1xoHXfUTLRTbP9|o%rcTxe(TzIgvG`^;@5t*i#9*!m6+TB>IH!}W<1Wp+g6<8 z7B$TYdFLtl%z544jJqb<$@Mnoi&!EVZ$Gque>8q}R>b+2%XU`gxo~b`%3AyMSJjQ5 zMdtPE{zml8**!6iQT|+e&9vDiCsy1MsQa(Hk1=p3#B?BeLgnhehFkXzd)N2aSW-L^Y)fu-ys8m*2LLG z{Ei!^WJI5v@THnLs&BKd`GWJZ)2viQWSXvJaCs}NeKN7ogTe~DWM4fzs`^A literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/centcom.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/centcom.png new file mode 100644 index 0000000000000000000000000000000000000000..ff1e293183ccdff0b1765165f8ee810017345b1b GIT binary patch literal 409 zcmV;K0cQS*P)Px$Q%OWYR9J;$U>F6XU=)mWz=%tNOU?E_H7)vf>o8WkSa4bHUpa?rmTzoN!6}E; zRa|Pe|Ak%iP{iKuo`j(eT@5y1W1IMv^1$g+(whFfcHz;{D4I-GM2OHw5rG0vXtt=)n^kj1L2ZLVzR( zAX|*gh9xv)i(!CJ8XzhPgkAH9%7#bIT*7dK(yA2<3=FVrjOhrX(*QAf9@!B#CVC7< z&Rimx2JjX{Fhi&T-tL}6dO-xU{KL^j3~Z7bBw6_D`3(jE>p03n02zEZx`-qP2w2CV z@NtCzP6uEsddUUf@17v7HiRmsYIQscM!_f;1-JkJK)s5YY?9$Q00000NkvXXu0mjf DNqDA$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default-inhand-left.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f7848f63f6a3f7bd57aa4fd8430f34fe515f8f04 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=6`n4RAr*7p-ZJDpV8Fw2z(}(} z$nbp5(;%OhA}nvcJB!#4{Q5pY)s7FSmf^wbRj-WCcYC$QCUJ&dy?s~7@%G(cSG*;j zu7CcfzRmY+uSBA7{(&z~+t=O)DF=cRw|?Eu`Tc2Sb<0cLQu7I$uH1Dvb?qtRgW2MO Wy`l3x=dP{=sq%F7b6Mw<&;$UHibqTU literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default-inhand-right.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..82b5598806de72b5cd2ed0cb65cee99adbb58df8 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Rh}-6Ar*7p-rC69V8Fw2AmW3y++4=+d%hUb*TI&yrtXKQRQ{ YXFb^-I$!GNix(h8p00i_>zopr0QOu&O#lD@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default.png new file mode 100644 index 0000000000000000000000000000000000000000..95b3d54c270091387e888743faf2d53d147acbfd GIT binary patch literal 355 zcmV-p0i6DcP)Px$9Z5t%R9J=Wm9cGvFcgOWL>VNqSimg{q+x_BXhf<0) z@xnDt({wkl>w0q!5d|60T0SielL0c$O?EDNy6^ZxpI6?(hi zW7yW8_nOPHWEW2;%~+usE1X*Ctp|OABRonViUA=60Khr-JzvJnSOEae?HRz!sahymb5?>HQjdrpfuUY^A002ovPDHLkV1hb- Bj{X1u literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold-inhand-left.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..65957acdfbb523756cec56aa66ec24a8b978a6d8 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=6`n4RAr*7p-ZJDpV8Fw2z(BJ> z$neM{t@(K`MOfZ?cNVc9`1O5)Y9238EyIshtA3sNyeKGfdW2Kx*XLOi7o5NP>x#F; z)APSy)VKMb?UhIr&Oh+wY5UsyAmu=C;?}R*Iln)xtZsR!TWUUG)0Mjpr>;F^d@x&F Wl_OAIA@SEkkSb4CKbLh*2~7YahDeM6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold-inhand-right.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..96cdf6d4251b28a129cdf4d9e55b4154a4c92b0b GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=)t)YnAr*7p-rC69;=se=Q0~NN z@<=H2)o(@XMcyYS+|26BwG0Ph)B3g>+XPP9?#-EMd0zS0E7g=|7X3f+ zk6D)d&rN9Q=ojwWAh%6B2QO8mvv4FO#ovCLIwZ; literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold.png new file mode 100644 index 0000000000000000000000000000000000000000..bb20387315c97603a5faa585abfdaecbf3d727a0 GIT binary patch literal 473 zcmV;~0Ve*5P)Px$lSxEDR9J=Wm9cBWKorJ5L)H#K9J+VN;35u%fJ;}w{YnQX!3q_L;NKus#DW!^ z9ExrogiHY!A<&@&ibDo>hawJLC3dhU#@wAIxb=Qha`$rImv`^p0TPMizmwoikZfvu zNulxQH&aXHiI1$t#l-LPP3|1i008)&6L{}*-B3)enmH-1=mths1IRbGtSoR19E;!H zTrtN*CKTO(?>SI(gC8RjcC5uY{)FP|^Z+Zhh(i4(x`EvDS3>0elsEt+H$x;hLrhvv z(GA4mP+ZXstkhz>4A4J6E=Creu8U6B-HX#_0MOa5WJt5TdzoR^(Wt1XFK1a#hy|T4 znk2)(#h4Yv!`ySk%p+qeucUjl3*1zLR}F&i85$Uv878_by=pAHPz`hjgQu&X%Q~lo FCIH;!NqztT literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomartialartist.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomartialartist.png new file mode 100644 index 0000000000000000000000000000000000000000..1f7862d092276bd7192aaa49113bac42db0bc810 GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1G&7LlfAr-gYTubC?P~c%r5WjmU`K4`{*!zcDZH{L>n(v`; zY03**i9;NJ4unnWm@zZ*%oCt428K1|a-Z(K4*H!E)bp{nAun&Ot!c1V*P=vs0jCpJ zO@A5h(t1AUO3<%mOZQo`p0UZ}s>=Hz;_$TBK4m^n7OOy>3)m2bKXMy54H)X;sxR!{ Ro;w{R=IQF^vd$@?2>=wOR22XK literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanoprisoner.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanoprisoner.png new file mode 100644 index 0000000000000000000000000000000000000000..96c8f4d98256ce8784f67055fdfa004b2aa89c47 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GrJgR1Ar-fh{`~)Mf7pRZt&NdwF`q=~ffdYdvIm^jI59FZ z_9%Tm+|J)q!pS({sl#cBB}!!S&ow)?)00vK2KbLh* G2~7ZG2uZ#G literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png new file mode 100644 index 0000000000000000000000000000000000000000..0539dd50da616bd3aaa00fcb53a792fcda4c9052 GIT binary patch literal 1502 zcmbVMTZr6L7*3gGsk^Q|_+U{V4p}LdZtlA~lf%YkyBXatUlNWA6gYf5JCMjm(Xgp*pQQR$#=g0 z{_m`<-a9pM+XTmPQMzD$BkX`YW1{k z-H#m>h{R_o)bqA9Xz(+ds$hxb3?k>?ux#+)Tv(K2m$E4`Sm_f~68 zZ_CkLe(`R!(7`|u(3GG~;D-tB7<``>!#X>bc+`iaTL!jx5Wl zsEedj)D&BvL8`1OlB~lk$THT7SSz97!-KfkZQ!bT&rlfb48E175tgKOyDhdgk;P3( z(RCnDB~=vwAtc=}B^@D5rbi4WO`O<^QjdiwV{RAG9IwX=5 zQO<1Y16?P_Mcc987w$R|^=UxEGy$xVW1|*JS<+(vLY@Dqbv)R%JqLt)U5aiD*Je zo3#bo)#qWW&g!N4qF!?H`zCX?v&fF_yZ`h41F;9CMf~gL$qFt@3B2MZ5UlR7BG&2g z;mY?=KMOE%vg|f^Ckrce`Qfp5-5wawwp$cP|0CQ3Si%}-J2hqM9+PA__ufW9DA|wRHJ4)rN^J%`QVtd z@AK2|=+%vHch1+%2Zi5{-*@zj!U6r_*S{W|2kMjG6ny{G%<0=de)eeAfh*-z^X)^M GPy7XUo!)2w literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange-inhand-left.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5937b9cd210ed553f914c758cacc0e35c3a32b01 GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSJOMr-u0Yzu!{cVH!!ZVRrvj-@ zKt5whkY6x^!?PP{Ku%s&NJNQCYH@N=WKhlO#F@nvH#g*lHV9hnrO5Ujah!%*Kg)ZEy$v)fp8 z^9qS26T6MqY8aY}9x;0o6jt!Hm{FRSVY9n*%Tld?M?jmMJzX3_EP9g@Bv?ZjnF^S= zWE@zyo6g^0P_h(c%JFwdnaAvOltnD^&r9Atdi*h^u~qe(|5g(w7T?$(=#l>UH a1~kO4gk_z>m$_?!Oa@O^KbLh*2~7Y>Q((IQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange.png new file mode 100644 index 0000000000000000000000000000000000000000..1641a8d0622650443725063db4240fa3a79b42d5 GIT binary patch literal 375 zcmV--0f_#IP)2AOZTBTc zO5^|SF>NrOF^`N8pa!5Q1c4 z8Xz{$qlX4XA@Ki2&wo;)0htZsQxpO(=P$xr5a9!`C?XUBSStuSamN3v3-t&V#l%J# zs6eY)c!}ZA%m2g|#UM?{z{f$4BnKet2U!lP4T%l`dRE7bqy2(W2aGyk#5({WzyO_; Vllsg6tu_Dv002ovPDHLkV1m2PjpzUX literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver-inhand-left.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8197fa122f95cbb42ab79beb779adc493b31ad4a GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=C7v#hAr*7p-rC5^qR7MIaH_cT zdbjlNp6(S7>Qn`cStEAyd3=xnDr7hi9%@=XPkbs@^%0>}S!Lxa8Rh5KPTz3q|2)J0 zl4hpnNv*zn7;jIHUsuNrQqI7j@cLE$=GUi}zZ2Y6e&w#islak(&G6~$4f%23Dx$=W SzW??Pq{`FP&t;ucLK6Vkia%=r literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver-inhand-right.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..430322e892c2973bae407383ab33ad4b91dc1aa7 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Wu7jMAr*7p-rC4}z<`6rq5pWt z&DNurET_&cnb?#xWjEu6&$>N~K!prPx$h)G02R9J=Wm9c8VKp4mWDcya5lCuxs12_wUhzJ!rlrF)L;^0^)-TMd*K~b_u z2f>1f2!gZF)xm7_Vi!C41lPfy#CVr@!L9e3E_dJY|KIoBmjg5!&40&`EmW#Cc1fY} zXeiXWmWg}4_Qk}l`jd1`XaE2LN{_y$v-wF(saQx9Hwl5)Ys0F8iLxLy5EZ{AH^TWi z6DA=i2Z?f(B%Bs5o?{K zW?fd#06%$B4S{{BrnC7$oR0xuX}DM#Zu$(IQv!YwJ6-Q+{+v6I*oFb6C>0B_ZOBcA z@h0DRGJIJUL#0;I@57@k%Y9NR)bDFVaA%JWYwYpiUP&;H{`)}fHT(;{=yR;mXf!f@0WgiXOq!Q^WdHyG07*qoM6N<$ Ef_D4NUH||9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/equipped-FEET.png b/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..cc39a01cd146cfd427ec11dea698956476b67409 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7}Y&p978H@y}7-S^N@qcv5z(pZ@rQQgz@y%e7fXa^GJk{HxiRr8db#e5?BdZ)2lFi?wQfvz~m`#cMHGlI40; zxxr~)%Uk<5}1{rUgj{;&g+S{ozVVm^t|11p%_WDQ<5FqSiL z+j+XVxv^<#Y6^VbKVybO1V`k*tE7il3UL3s+>@i>z|^U{1?>$T+pmBBzyHe{@xybRLJ9@`{(2`Fa{uqIGYmo9az!rf z2X-IcY*52ybm8JnS!Z3d)18bxKOV79VawC=Xx0w!pTYW_)2?vFQ-$Mf=4*~-vp>|R z_%KcDQA+E93`dh!4T0=ERtZ-a7xOJ(XW%ek5SSA&J?>C_2hev6p00i_>zopr0H&yR AQ~&?~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/inhand-left.png b/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0bcdb207e75d7f6f193f67bbfbead49a96b6d835 GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7~MTx978H@y}513b;v-Z;h~F7V?z5nKE1wmdU1!YdOCjK zlXDc1nN#vbNH6cvg@djKw>q<~7pOei(AB)HGvb&13x%(&_oiPDo3*0XaMhW>KvjOA z&DelK{G2f7#aqMH_4^+?D-iS!y+N&|IdA6+HsP}yDbiNDg;=51#$V_Jr&fjwR z{Mvgitd0}r{YsLUtkP+*W=189EJk-l{$@;kwB9hYy>Rki-tup6Du>wkPW%_xauR z3s%S~xXwQQX!hUMf2a8-h{njTK3w+MqHL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/inhand-right.png b/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6bf36222197f71a2871e149449397ad7bff11f9c GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7#%!a978H@y}513b;v=$;iBwEmZqHzYkeKw_C=c1C3Tp1Ei=ksW9; z7H~xDSJ0Q*)!nDdq>kJUzF&Fm>B{Keml@x;`<5QK{Z-`5qFu%BdX{~9xjkt6qs&>i z7HOQRoGv;2PfF#K0EV*eg>S#HU9GF1G*iXXXWsKm90~hph5mm0Gs5FaH7#SEEIvy(?V7U0Z V^Q+7ANq!)MJzf1=);T3K0RZ(cpE>{l literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/meta.json b/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/meta.json new file mode 100644 index 00000000000..fa455600b2e --- /dev/null +++ b/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Mimi (justanorang) on Discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 303884d60f10eaab4aca5a8955b34fbaa4300fce Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 19 Sep 2023 14:23:22 +0000 Subject: [PATCH 2/2] Automatic Changelog Update (#21) --- Resources/Changelog/DeltaVChangelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index e4584f8ab73..a1b68042d1f 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -49,3 +49,9 @@ Entries: message: Added various posters, signs and paintings. id: 8 time: '2023-09-18T13:49:03.0000000+00:00' +- author: FluffiestFloof + changes: + - type: Add + message: Martial Artists, Prison Guards, Prisoners and Gladiators are back. + id: 9 + time: '2023-09-19T14:22:56.0000000+00:00'