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 00000000000..e5ec3b32c20
Binary files /dev/null and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoGladiator.png differ
diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMartialArtist.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMartialArtist.png
new file mode 100644
index 00000000000..cd0620657da
Binary files /dev/null and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMartialArtist.png differ
diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png
new file mode 100644
index 00000000000..c4233ff7aa0
Binary files /dev/null and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png differ
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 00000000000..0becfdb0c54
Binary files /dev/null and b/Resources/Textures/DeltaV/Markers/jobs.rsi/green.png differ
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 00000000000..d08fb136e36
Binary files /dev/null and b/Resources/Textures/DeltaV/Markers/jobs.rsi/nyanogladiator.png differ
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 00000000000..ba9c5ab1fe2
Binary files /dev/null and b/Resources/Textures/DeltaV/Markers/jobs.rsi/nyanomartialartist.png differ
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 00000000000..35383af8cb4
Binary files /dev/null and b/Resources/Textures/DeltaV/Markers/jobs.rsi/nyanoprisoner.png differ
diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/nyanoprisonguard.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/nyanoprisonguard.png
new file mode 100644
index 00000000000..be36a0a7140
Binary files /dev/null and b/Resources/Textures/DeltaV/Markers/jobs.rsi/nyanoprisonguard.png differ
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 00000000000..9adcd4b6a3c
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/blue-inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/blue-inhand-right.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/blue-inhand-right.png
new file mode 100644
index 00000000000..394cc79b274
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/blue-inhand-right.png differ
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 00000000000..ff1e293183c
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/centcom.png differ
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 00000000000..f7848f63f6a
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default-inhand-left.png differ
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 00000000000..82b5598806d
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default-inhand-right.png differ
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 00000000000..95b3d54c270
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default.png differ
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 00000000000..65957acdfbb
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold-inhand-left.png differ
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 00000000000..96cdf6d4251
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold-inhand-right.png differ
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 00000000000..bb20387315c
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json
new file mode 100644
index 00000000000..54bc8ab7fe4
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json
@@ -0,0 +1,78 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "centcom"
+ },
+ {
+ "name": "default"
+ },
+ {
+ "name": "gold"
+ },
+ {
+ "name": "orange"
+ },
+ {
+ "name": "silver"
+ },
+ {
+ "name": "nyanoprisoner"
+ },
+ {
+ "name": "nyanogladiator"
+ },
+ {
+ "name": "nyanoprisonguard"
+ },
+ {
+ "name": "nyanomartialartist"
+ },
+ {
+ "name": "gold-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "gold-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "default-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "default-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "silver-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "silver-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "orange-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "orange-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "blue-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "blue-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanogladiator.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanogladiator.png
new file mode 100644
index 00000000000..17f3ea2aae1
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanogladiator.png differ
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 00000000000..1f7862d0922
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomartialartist.png differ
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 00000000000..96c8f4d9825
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanoprisoner.png differ
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 00000000000..0539dd50da6
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png differ
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 00000000000..5937b9cd210
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange-inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange-inhand-right.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange-inhand-right.png
new file mode 100644
index 00000000000..027f8aea2a3
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange-inhand-right.png differ
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 00000000000..1641a8d0622
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange.png differ
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 00000000000..8197fa122f9
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver-inhand-left.png differ
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 00000000000..430322e892c
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver-inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver.png
new file mode 100644
index 00000000000..b13153a246e
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver.png differ
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 00000000000..cc39a01cd14
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/icon.png b/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/icon.png
new file mode 100644
index 00000000000..1647a055b24
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/icon.png differ
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 00000000000..0bcdb207e75
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/inhand-left.png differ
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 00000000000..6bf36222197
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi/inhand-right.png differ
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
+ }
+ ]
+}