diff --git a/Resources/Locale/en-US/prototypes/roles/antags.ftl b/Resources/Locale/en-US/prototypes/roles/antags.ftl index ba43d4ff85..c0c0e5e14b 100644 --- a/Resources/Locale/en-US/prototypes/roles/antags.ftl +++ b/Resources/Locale/en-US/prototypes/roles/antags.ftl @@ -1,4 +1,4 @@ -roles-antag-syndicate-agent-name = Syndicate agent +roles-antag-syndicate-agent-name = Syndicate agent roles-antag-syndicate-agent-objective = Complete your objectives without being caught. roles-antag-syndicate-agent-sleeper-name = Syndicate sleeper agent @@ -36,3 +36,12 @@ roles-antag-thief-objective = Add some NT property to your personal collection w roles-antag-dragon-name = Space Dragon roles-antag-dragon-objective = Create a carp army to take over this quadrant. + +roles-antag-liberator-commander-name = Liberator commander +roles-antag-liberator-commander-objective = Lead your team to free as many prisoners as you can. + +roles-antag-liberator-medic-name = Liberator medic +roles-antag-liberator-medic-objective = Like default Liberator, the team's treatment will have priority. + +roles-antag-liberator-name = Nuclear operative +roles-antag-liberator-objective = Free as many prisoners as you can and convert them to your side. diff --git a/Resources/Prototypes/Catalog/Fills/sp14/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/sp14/Lockers/heads.yml new file mode 100644 index 0000000000..5837989061 --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/sp14/Lockers/heads.yml @@ -0,0 +1,52 @@ +type: entity + id: LockerSP14WardenFilled + suffix: Filled + parent: LockerSPWarden + components: + - type: StorageFill + contents: + - id: ClothingOuterArmorSP14WardenCarapace + - id: NukeDisk + - id: PinpointerNuclear + - id: CaptainIDCard + - id: ClothingMaskGasCaptain + - id: WeaponTaser + - id: CommsComputerCircuitboard + - id: ClothingHeadsetAltCommand + - id: SpaceCash1000 + - id: PlushieNuke + prob: 0.1 + - id: CigarGoldCase + - id: ClothingBeltSheathFilled + - id: DoorRemoteCommand + - id: RubberStampCaptain + - id: WeaponAntiqueLaser + - id: JetpackFilled + - id: MedalCase + + +# TD: FILL WITH NEW ENERGY WEAPON +type: entity + id: LockerSP14ChiefCustodialOfficerFilled + suffix: Filled + parent: LockerSPChiefCustodial + components: + - type: StorageFill + contents: + - id: DoorRemoteSecurity + - id: FlashlightSeclite + - id: WeaponDisabler + - id: ClothingBeltSecurityFilled + - id: Flash + - id: ClothingEyesGlassesSecurity + - id: ClothingHeadsetAltSecurity + - id: ClothingHandsGlovesCombat + - id: ClothingShoesBootsJack + - id: ClothingOuterCoatWarden + - id: ClothingOuterWinterWarden + - id: DoorRemoteArmory + - id: HoloprojectorSecurity + - id: ClothingNeckShockCollar + amount: 3 + - id: RemoteSignaller + amount: 3 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 0e84fca06d..0e84dc5e64 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -274,7 +274,6 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitWarden - #Captain's Hardsuit - type: entity parent: [ClothingOuterHardsuitBase, BaseCommandContraband] diff --git a/Resources/Prototypes/Entities/Clothing/SP14/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/SP14/Head/hardsuit-helmets.yml new file mode 100644 index 0000000000..d649806d43 --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/SP14/Head/hardsuit-helmets.yml @@ -0,0 +1,71 @@ +#SP14 Warden's Hardsuit +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitSP14Warden + name: warden's hardsuit helmet + description: A specially tailored and armoured helmet. Oddly comfortable. + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/sp14warden.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/sp14warden.rsi + - type: PointLight + color: "#ffeead" + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + +#SP14 Liberator Hardsuit +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitSP14Liberator + name: liberator hardsuit helmet + description: A helmet to welcome the trapped and intimidate the tyrants. For Freedom! + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/sp14liberator.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/sp14liberator.rsi + - type: PointLight + color: "#771718" + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.85 + Heat: 0.9 + +#SP14 Liberator Commander's Hardsuit +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitSP14LiberatorCommander + name: liberator hardsuit helmet + description: A helmet to welcome the trapped and intimidate the tyrants. For Freedom! + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/sp14liberatorcommander.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/sp14liberatorcommander.rsi + - type: PointLight + color: "#771718" + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 diff --git a/Resources/Prototypes/Entities/Clothing/SP14/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/SP14/Head/hats.yml new file mode 100644 index 0000000000..38d2c91acf --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/SP14/Head/hats.yml @@ -0,0 +1,15 @@ +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatSP14Wardencap + name: warden's cap + description: A grand, stylish warden cap. + components: + - type: Sprite + sprite: Clothing/Head/Hats/sp14wardencap.rsi + - type: Clothing + sprite: Clothing/Head/Hats/sp14wardencap.rsi + - type: Tag + tags: + - ClothMade + - WhitelistChameleon + - HamsterWearable diff --git a/Resources/Prototypes/Entities/Clothing/SP14/Neck/Cloaks/cloaks.yml b/Resources/Prototypes/Entities/Clothing/SP14/Neck/Cloaks/cloaks.yml new file mode 100644 index 0000000000..50008e623d --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/SP14/Neck/Cloaks/cloaks.yml @@ -0,0 +1,19 @@ +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakSP14Warden + name: warden's cloak + description: A formal and gilded cloak for intimidating prisoners. + components: + - type: Sprite + sprite: Clothing/Neck/Cloaks/sp14warden.rsi + - type: StealTarget + stealGroup: HeadCloak + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakSP14LiberatorCommander + name: liberator commander's cloak + description: A magnanimous and gilded cloak for tackling tyrants. + components: + - type: Sprite + sprite: Clothing/Neck/Cloaks/sp14liberatorcommander.rsi diff --git a/Resources/Prototypes/Entities/Clothing/SP14/Outerclothing/armor.yml b/Resources/Prototypes/Entities/Clothing/SP14/Outerclothing/armor.yml new file mode 100644 index 0000000000..4375d1a182 --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/SP14/Outerclothing/armor.yml @@ -0,0 +1,26 @@ + +- type: entity + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] + id: ClothingOuterArmorSP14WardenCarapace + name: "warden's carapace" + description: "An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest." + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/sp14warden_carapace.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Armor/sp14warden_carapace.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.6 + Heat: 0.5 + Caustic: 0.9 + - type: ClothingSpeedModifier + walkModifier: 1.0 + sprintModifier: 1.0 + - type: HeldSpeedModifier + - type: ExplosionResistance + damageCoefficient: 0.65 + - type: GroupExamine diff --git a/Resources/Prototypes/Entities/Clothing/SP14/Outerclothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/SP14/Outerclothing/hardsuits.yml new file mode 100644 index 0000000000..47cd7587bf --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/SP14/Outerclothing/hardsuits.yml @@ -0,0 +1,95 @@ +#SP14 Warden's Hardsuit +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitSP14Warden + name: warden's hardsuit + description: A specialized riot suit geared to combat low pressure environments. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/sp14warden.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/sp14warden.rsi + - type: PressureProtection + highPressureMultiplier: 0.5 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.5 + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.6 + Piercing: 0.5 + Caustic: 0.7 + Heat: 0.35 + Radiation: 0.35 + - type: ClothingSpeedModifier + walkModifier: 0.7 + sprintModifier: 0.7 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitSP14Warden + +#SP14 Liberator Hardsuit +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitSP14Liberator + name: liberator hardsuit + description: A specialized hardsuit to welcome the trapped and fight the tyrants. For Freedom! + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/sp14liberator.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/sp14liberator.rsi + - type: PressureProtection + highPressureMultiplier: 0.5 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.5 + - type: Armor + modifiers: + coefficients: + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.65 + Caustic: 0.7 + Heat: 0.65 + Radiation: 0.6 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.85 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitSP14Liberator + +#SP14 Liberator Commander's Hardsuit +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitSP14LiberatorCommander + name: liberator commander hardsuit + description: A gilded, magnanimous hardsuit to welcome the trapped and fight the tyrants. For Freedom! + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi + - type: PressureProtection + highPressureMultiplier: 0.5 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.6 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.5 + Caustic: 0.6 + Heat: 0.6 + Radiation: 0.6 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.85 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitSP14LiberatorCommander diff --git a/Resources/Prototypes/Entities/Clothing/SP14/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/SP14/Uniforms/jumpsuits.yml new file mode 100644 index 0000000000..d0c2995cbb --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/SP14/Uniforms/jumpsuits.yml @@ -0,0 +1,67 @@ + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSP14Warden + name: warden's jumpsuit + description: A red and black jumpsuit with gold engravings showing the status of the Warden. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/sp14warden.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/sp14warden.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSP14Liberator + name: liberator jumpsuit + description: A sleek and comfortable jumpsuit for tackling tyrants. For Freedom! + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/sp14liberator.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/sp14liberator.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtSP14Warden + name: warden's jumpskirt + description: A red and black jumpskirt with gold engravings showing the status of the Warden + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/sp14wardens.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/sp14wardens.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSP14MaintenanceTech + name: maintenance jumpsuit + description: A professional and slightly sweaty jumpsuit belonging to a (hopefully) hardworking Maintenance worker. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi + +type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSP14ChiefCustodialOfficer + name: chief custodial officer's uniform + description: A formal security suit for officers complete with Nanotrasen belt buckle. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/warden.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/warden.rsi + - type: Item + inhandVisuals: + left: + - state: inhand-left + color: "#C12D30" + sprite: Clothing/Uniforms/Jumpsuit/color.rsi + - state: overlay-inhand-left + right: + - state: inhand-right + color: "#C12D30" + sprite: Clothing/Uniforms/Jumpsuit/color.rsi + - state: overlay-inhand-right diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index c4850954cd..52e92fceba 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -410,8 +410,8 @@ - type: entity parent: [ClothingUniformSkirtBase, BaseRestrictedContraband] id: ClothingUniformJumpskirtWarden - name: warden's uniform - description: A formal security suit for officers complete with Nanotrasen belt buckle. + name: chief custodial officer's uniform + description: A formal security skirt for officers complete with Nanotrasen belt buckle. components: - type: Sprite sprite: Clothing/Uniforms/Jumpskirt/warden.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index ef5c1164cf..3ccf6050ca 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -648,7 +648,8 @@ - type: entity parent: [ClothingUniformBase, BaseRestrictedContraband] id: ClothingUniformJumpsuitWarden - name: warden's uniform + name: + 's uniform description: A formal security suit for officers complete with Nanotrasen belt buckle. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/SP14/nukies.yml b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/SP14/nukies.yml new file mode 100644 index 0000000000..2ab0106335 --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/SP14/nukies.yml @@ -0,0 +1,11 @@ +- type: entity + id: SpawnPointSP14Liberators + parent: MarkerBase + name: nukies + components: + - type: SpawnPoint + - type: Sprite + layers: + - state: green + - sprite: Objects/Fun/toys.rsi + state: synb diff --git a/Resources/Prototypes/Entities/Markers/Spawners/sp14_jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/sp14_jobs.yml new file mode 100644 index 0000000000..dad1b00962 --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/sp14_jobs.yml @@ -0,0 +1,287 @@ +# SP14 Cargo +- type: entity + id: SpawnPointSPQuartermaster + parent: SpawnPointJobBase + name: sp quartermaster + components: + - type: SpawnPoint + job_id: SPQuartermaster + - type: Sprite + layers: + - state: green + - state: qm + +- type: entity + id: SpawnPointSPCargoTechnician + parent: SpawnPointJobBase + name: sp cargotechnician + components: + - type: SpawnPoint + job_id: SPCargoTechnician + - type: Sprite + layers: + - state: green + - state: cargo_tech + +# SP14 Civilian +- type: entity + id: SpawnPointSPChaplain + parent: SpawnPointJobBase + name: sp chaplain + components: + - type: SpawnPoint + job_id: SPChaplain + - type: Sprite + layers: + - state: green + - state: chaplain + +- type: entity + id: SpawnPointSPClown + parent: SpawnPointJobBase + name: sp clown + components: + - type: SpawnPoint + job_id: SPClown + - type: Sprite + layers: + - state: green + - state: clown + +- type: entity + id: SpawnPointSPReporter + parent: SpawnPointJobBase + name: sp reporter + components: + - type: SpawnPoint + job_id: SPReporter + - type: Sprite + layers: + - state: green + - state: reporter + +# SP14 Command +- type: entity + id: SpawnPointSPWarden + parent: SpawnPointJobBase + name: sp warden + components: + - type: SpawnPoint + job_id: SPWarden + - type: Sprite + layers: + - state: green + - state: sp14warden + +- type: entity + id: SpawnPointWelfareOfficer + parent: SpawnPointJobBase + name: welfare officer + components: + - type: SpawnPoint + job_id: WelfareOfficer + - type: Sprite + layers: + - state: green + - state: hop + +# SP14 Inmate +- type: entity + id: SpawnPointGardener + parent: SpawnPointJobBase + name: gardener + components: + - type: SpawnPoint + job_id: Gardener + - type: Sprite + layers: + - state: green + - state: botanist + +- type: entity + id: SpawnPointPrisonChef + parent: SpawnPointJobBase + name: prison chef + components: + - type: SpawnPoint + job_id: PrisonChef + - type: Sprite + layers: + - state: green + - state: chef + +- type: entity + id: SpawnPointPrisoner + parent: SpawnPointJobBase + name: prisoner + components: + - type: SpawnPoint + job_id: Prisoner + - type: Sprite + layers: + - state: green + - state: prisoner + +# SP14 Maintenance +- type: entity + id: SpawnPointHeadOfMaintenance + parent: SpawnPointJobBase + name: headofmaintenance + components: + - type: SpawnPoint + job_id: HeadOfMaintenance + - type: Sprite + layers: + - state: green + - state: ce + +- type: entity + id: SpawnPointMaintenanceEngineer + parent: SpawnPointJobBase + name: maintenance engineer + components: + - type: SpawnPoint + job_id: MaintenanceEngineer + - type: Sprite + layers: + - state: green + - state: engineer + +- type: entity + id: SpawnPointAtmospec + parent: SpawnPointJobBase + name: atmospheric specialist + components: + - type: SpawnPoint + job_id: AtmosphericSpecialist + - type: Sprite + layers: + - state: green + - state: atmospherics + +- type: entity + id: SpawnPointMaintenanceWorker + parent: SpawnPointJobBase + name: maintenance worker + components: + - type: SpawnPoint + job_id: MaintenanceWorker + - type: Sprite + layers: + - state: green + - state: janitor + +- type: entity + id: SpawnPointSPBorg + parent: SpawnPointJobBase + name: sp cyborg + components: + - type: SpawnPoint + job_id: SPBorg + - type: Sprite + layers: + - state: green + - sprite: Mobs/Silicon/chassis.rsi + state: robot + - sprite: Mobs/Silicon/chassis.rsi + state: robot_e + +# SP14 Medical + +- type: entity + id: SpawnPointMedicalDirector + parent: SpawnPointJobBase + name: medical director + components: + - type: SpawnPoint + job_id: MedicalDirector + - type: Sprite + layers: + - state: green + - state: cmo + +- type: entity + id: SpawnPointInfirmaryDoctor + parent: SpawnPointJobBase + name: infirmary doctor + components: + - type: SpawnPoint + job_id: InfirmaryDoctor + - type: Sprite + layers: + - state: green + - state: doctor + +- type: entity + id: SpawnPointSPChemist + parent: SpawnPointJobBase + name: sp chemist + components: + - type: SpawnPoint + job_id: SPChemist + - type: Sprite + layers: + - state: green + - state: chemist + +- type: entity + id: SpawnPointSPPsychologist + parent: SpawnPointJobBase + name: sp psychologist + components: + - type: SpawnPoint + job_id: SPPsychologist + - type: Sprite + layers: + - state: green + - state: psychologist + +# SP14 Security + +- type: entity + id: SpawnPointChiefCustodialOfficer + parent: SpawnPointJobBase + name: chiefcustodialofficer + components: + - type: SpawnPoint + job_id: ChiefCustodialOfficer + - type: Sprite + layers: + - state: green + - state: hos + +- type: entity + id: SpawnPointPrisonOfficer + parent: SpawnPointJobBase + name: prison officer + components: + - type: SpawnPoint + job_id: PrisonOfficer + - type: Sprite + layers: + - state: green + - state: security_officer + +- type: entity + id: SpawnPointRookieOfficer + parent: SpawnPointJobBase + name: rookie officer + components: + - type: SpawnPoint + job_id: RookieOfficer + - type: Sprite + layers: + - state: green + - state: security_cadet + +- type: entity + id: SpawnPointInspector + parent: SpawnPointJobBase + name: inspector + components: + - type: SpawnPoint + job_id: Inspector + - type: Sprite + layers: + - state: green + - state: detective diff --git a/Resources/Prototypes/Entities/Structures/sp14/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/sp14/Storage/Closets/Lockers/lockers.yml new file mode 100644 index 0000000000..49bad8b410 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/sp14/Storage/Closets/Lockers/lockers.yml @@ -0,0 +1,27 @@ +# Warden +- type: entity + id: LockerSPWarden + parent: LockerBaseSecure + name: warden's locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: cap + stateDoorOpen: sp14warden_open + stateDoorClosed: sp14warden_door + - type: AccessReader + access: [["Warden"]] + +# CCO +- type: entity + id: LockerSPChiefCustodial + parent: LockerBaseSecure + name: chief custodial officer's locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: warden + stateDoorOpen: warden_open + stateDoorClosed: warden_door + - type: AccessReader + access: [["Armory"]] diff --git a/Resources/Prototypes/Loadouts/Jobs/SP14/Command/sp14warden.yml b/Resources/Prototypes/Loadouts/Jobs/SP14/Command/sp14warden.yml new file mode 100644 index 0000000000..961f7dd0e0 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/SP14/Command/sp14warden.yml @@ -0,0 +1,49 @@ +# Jumpsuit +- type: loadout + id: SP14WardenJumpsuit + equipment: SP14WardenJumpsuit + +- type: startingGear + id: SP14WardenJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitSP14Warden + + type: loadout + id: SP14WardenJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtSP14Warden + +- type: startingGear + id: SP14WardenJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtSP14Warden + +# Head +- type: loadout + id: WardenCap + equipment: WardenCap + +- type: startingGear + id: SP14WardenCap + equipment: + head: ClothingHeadHatSP14Wardencap + +# Neck +- type: loadout + id: SP14WardenCloak + equipment: WardenCloak + +- type: startingGear + id: SP14WardenCloak + equipment: + neck: ClothingNeckCloakSP14Warden + +# Hands +- type: loadout + id: SP14WardenCombatGloves + equipment: WardenCombatGloves + +- type: startingGear + id: SP14WardenCombatGloves + equipment: + hands: ClothingHandsGlovesCombat diff --git a/Resources/Prototypes/Loadouts/Jobs/SP14/Maintenance/maintenance_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/SP14/Maintenance/maintenance_engineer.yml index e69de29bb2..789909368d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/SP14/Maintenance/maintenance_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/SP14/Maintenance/maintenance_engineer.yml @@ -0,0 +1,7 @@ +- type: loadout + id: SP14MaintenanceJumpsuit + equipment: SP14MaintenanceJumpsuit + +- type: starterGear + id: SP14MaintenanceJumpsuit + equipment: ClothingUniformJumpsuitSP14MaintenanceTech diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index d0a6a22641..89bf38fef5 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -169,14 +169,6 @@ loadouts: - HoPWintercoat -# Inmate -- type: loadoutGroup - id: PrisonerJumpsuit - name: loadout-group-prison-jumpsuit - loadouts: - - PrisonJumpsuit - - PrisonJumpskirt - # Civilian - type: loadoutGroup id: PassengerJumpsuit diff --git a/Resources/Prototypes/Loadouts/sp14_loadout_groups.yml b/Resources/Prototypes/Loadouts/sp14_loadout_groups.yml new file mode 100644 index 0000000000..82cdd3d830 --- /dev/null +++ b/Resources/Prototypes/Loadouts/sp14_loadout_groups.yml @@ -0,0 +1,40 @@ +# Warden +- type: loadoutGroup + id: SP14WardenHead + name: loadout-group-sp14warden-head + loadouts: + - WardenCap + +- type: loadoutGroup + id: SP14WardenNeck + name: loadout-group-sp14warden-head + loadouts: + - WardenCloak + +- type: loadoutGroup + id: SP14WardenJumpsuit + name: loadout-group-sp14warden-jumpsuit + loadouts: + - SP14WardenJumpsuit + - SP14WardenJumpskirt + +- type: loadoutGroup + id: SP14WardenGloves + name: loadout-group-sp14warden-gloves + loadouts: + - WardenCombatGloves + +# Inmate +- type: loadoutGroup + id: PrisonerJumpsuit + name: loadout-group-prison-jumpsuit + loadouts: + - PrisonJumpsuit + - PrisonJumpskirt + +# Maintenance +- type: loadoutGroup + id: SP14MaintenanceJumpsuit + name: loadout-group-sp14maintenance-jumpsuit + loadouts: + - SP14MaintenanceJumpsuit diff --git a/Resources/Prototypes/Loadouts/sp14_role_loadouts.yml b/Resources/Prototypes/Loadouts/sp14_role_loadouts.yml index 69f57894ac..f73421a2f7 100644 --- a/Resources/Prototypes/Loadouts/sp14_role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/sp14_role_loadouts.yml @@ -2,12 +2,14 @@ - type: roleLoadout id: JobSPWarden groups: - - HeadofSecurityHead - - HeadofSecurityNeck - - HeadofSecurityJumpsuit + - GroupTankHarness + - SP14WardenHead + - SP14WardenNeck + - SP14WardenJumpsuit + - SP14WardenGloves - SecurityBackpack - SecurityBelt - - HeadofSecurityOuterClothing + - HeadofSecurityOuterClothing # tbd: warden winter coat - SecurityShoes - SurvivalSecurity - Trinkets @@ -173,7 +175,7 @@ groups: - GroupTankHarness - StationEngineerHead - - StationEngineerJumpsuit + - SP14MaintenanceJumpsuit - StationEngineerBackpack - StationEngineerOuterClothing - StationEngineerShoes @@ -187,7 +189,7 @@ groups: - GroupTankHarness - JanitorHead - - JanitorJumpsuit + - SP14MaintenanceJumpsuit - JanitorGloves - CommonBackpack - JanitorOuterClothing diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml index dcff7d6f5e..2e87875dab 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml @@ -1,4 +1,4 @@ -- type: constructionGraph +- type: constructionGraph id: Girder start: start graph: diff --git a/Resources/Prototypes/Roles/Antags/SP14/liberators.yml b/Resources/Prototypes/Roles/Antags/SP14/liberators.yml new file mode 100644 index 0000000000..cc37c6d3fd --- /dev/null +++ b/Resources/Prototypes/Roles/Antags/SP14/liberators.yml @@ -0,0 +1,93 @@ +- type: antag + id: Liberator + name: roles-antag-liberator-name + antagonist: true + setPreference: true + objective: roles-antag-liberator-objective + requirements: + - !type:OverallPlaytimeRequirement + time: 18000 # 5h + guides: [ NuclearOperatives ] #td: make liberator guide + +- type: antag + id: LiberatorMedic + name: roles-antag-liberator-medic-name + antagonist: true + setPreference: true + objective: roles-antag-liberator-medic-objective + requirements: + - !type:OverallPlaytimeRequirement + time: 18000 # 5h + - !type:RoleTimeRequirement + role: JobChemist + time: 10800 # 3h + guides: [ NuclearOperatives ] + +- type: antag + id: LiberatorCommander + name: roles-antag-liberator-commander-name + antagonist: true + setPreference: true + objective: roles-antag-liberator-commander-objective + requirements: + - !type:OverallPlaytimeRequirement + time: 18000 # 5h + - !type:DepartmentTimeRequirement + department: Security + time: 18000 # 5h + guides: [ NuclearOperatives ] + +#Liberator Gear +- type: startingGear + id: LiberatorGearFull + equipment: + jumpsuit: ClothingUniformJumpsuitSP14Liberator + back: ClothingBackpackDuffelSyndicate + mask: ClothingMaskGasSyndicate + eyes: ClothingEyesHudSyndicate + ears: ClothingHeadsetAltSyndicate + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitSP14Liberator + shoes: ClothingShoesBootsCombatFilled + id: SyndiPDA + pocket1: DoubleEmergencyOxygenTankFilled + pocket2: BaseUplinkRadio40TC + belt: ClothingBeltMilitaryWebbing + storage: + back: + - BoxSurvivalSyndicate + - WeaponPistolViper + - PinpointerStation + - DeathAcidifierImplanter + + #Liberator Convert Gear +- type: startingGear + id: LiberatorGearConverted + equipment: + jumpsuit: ClothingUniformJumpsuitSP14Liberator + back: ClothingBackpackDuffelSyndicate + mask: ClothingMaskGasSyndicate + eyes: ClothingEyesHudSyndicate + ears: ClothingHeadsetAltSyndicate + gloves: ClothingHandsGlovesCombat + # outerClothing: ClothingOuterClothingSP14LiberatorEVA + shoes: ClothingShoesBootsCombatFilled + id: SyndiPDA + pocket1: DoubleEmergencyOxygenTankFilled + pocket2: BaseUplinkRadio40TC + belt: ClothingBeltMilitaryWebbing + storage: + back: + - BoxSurvivalSyndicate + - WeaponPistolViper + - PinpointerStation + - DeathAcidifierImplanter + +#Liberator Commander Gear +- type: startingGear + id: LiberatorCommanderGearFull + parent: SyndicateOperativeGearFull + equipment: + neck: ClothingNeckCloakSP14LiberatorCommander + outerClothing: ClothingOuterHardsuitSP14LiberatorCommander + diff --git a/Resources/Prototypes/Roles/Jobs/SP14/Guards/inspector.yml b/Resources/Prototypes/Roles/Jobs/SP14/Guards/inspector.yml index e5da61d66a..ff506595af 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/Guards/inspector.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/Guards/inspector.yml @@ -34,3 +34,5 @@ - Flash - ForensicPad - ForensicScanner + - FlippoLighter + - CigarCase diff --git a/Resources/Prototypes/Roles/Jobs/SP14/Guards/sp-warden.yml b/Resources/Prototypes/Roles/Jobs/SP14/Guards/sp-warden.yml index e01d0bf9ad..21a688d3b4 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/Guards/sp-warden.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/Guards/sp-warden.yml @@ -44,4 +44,5 @@ back: - Flash - MagazinePistol + - FlippoEngravedLighter diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/icon-flash.png new file mode 100644 index 0000000000..d9208f14bf Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/icon.png new file mode 100644 index 0000000000..6c7fc5252e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/meta.json new file mode 100644 index 0000000000..a3823eadeb --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite made by RynKatze for SP14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..8003dc7ec6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..8003dc7ec6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..1e863020dd Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..1e863020dd Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/icon-flash.png new file mode 100644 index 0000000000..e2459f94fe Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/icon.png new file mode 100644 index 0000000000..3025337a6f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/meta.json new file mode 100644 index 0000000000..a3823eadeb --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite made by RynKatze for SP14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..61e789b551 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..61e789b551 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..79b5a53271 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..79b5a53271 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/icon-flash.png new file mode 100644 index 0000000000..2fd472dc28 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/icon.png new file mode 100644 index 0000000000..06311e4e05 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/meta.json new file mode 100644 index 0000000000..a3823eadeb --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite made by RynKatze for SP14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..3be13ec4ad Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..3be13ec4ad Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..1f8ea64276 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..1f8ea64276 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/sp14wardencap.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/sp14wardencap.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..0452904da8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/sp14wardencap.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/sp14wardencap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/sp14wardencap.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..911c9cd273 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/sp14wardencap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/sp14wardencap.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/sp14wardencap.rsi/icon.png new file mode 100644 index 0000000000..ef6df037d1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/sp14wardencap.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/sp14wardencap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/sp14wardencap.rsi/meta.json new file mode 100644 index 0000000000..a251964955 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/sp14wardencap.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by RynKatze for SP14, based on captain's cap taken from TG and edited by Skarlett and Emisse", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Neck/Cloaks/sp14liberatorcommander.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/sp14liberatorcommander.rsi/equipped-NECK.png new file mode 100644 index 0000000000..ea01540ede Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/sp14liberatorcommander.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/sp14liberatorcommander.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/sp14liberatorcommander.rsi/icon.png new file mode 100644 index 0000000000..abb725b18b Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/sp14liberatorcommander.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/sp14liberatorcommander.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/sp14liberatorcommander.rsi/inhand-left.png new file mode 100644 index 0000000000..699f76a498 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/sp14liberatorcommander.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/sp14liberatorcommander.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/sp14liberatorcommander.rsi/inhand-right.png new file mode 100644 index 0000000000..b026ea2ab3 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/sp14liberatorcommander.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/sp14liberatorcommander.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/sp14liberatorcommander.rsi/meta.json new file mode 100644 index 0000000000..8aa76fabf5 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/sp14liberatorcommander.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RynKatze for SS14 based on the Captain's Formal Cloak sprite taken from tg.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Neck/Cloaks/sp14warden.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/sp14warden.rsi/equipped-NECK.png new file mode 100644 index 0000000000..4dcfd9c6d8 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/sp14warden.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/sp14warden.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/sp14warden.rsi/icon.png new file mode 100644 index 0000000000..9b480cf534 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/sp14warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/sp14warden.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/sp14warden.rsi/inhand-left.png new file mode 100644 index 0000000000..570139d892 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/sp14warden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/sp14warden.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/sp14warden.rsi/inhand-right.png new file mode 100644 index 0000000000..c037fb8509 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/sp14warden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/sp14warden.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/sp14warden.rsi/meta.json new file mode 100644 index 0000000000..8aa76fabf5 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/sp14warden.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by RynKatze for SS14 based on the Captain's Formal Cloak sprite taken from tg.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..5633ded636 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..5633ded636 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/icon.png new file mode 100644 index 0000000000..d3c1268c2c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/inhand-left.png new file mode 100644 index 0000000000..b8802f1492 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/inhand-right.png new file mode 100644 index 0000000000..a35d26139b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/meta.json new file mode 100644 index 0000000000..6db94208e1 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Recoloured by RynKatze for SP14 from Captain's Carapace sprites edited by Emisse and taken from tg.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..cd3f6c2852 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..cd3f6c2852 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/icon.png new file mode 100644 index 0000000000..9b78e5eb7c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/inhand-left.png new file mode 100644 index 0000000000..ce0e98a74d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/inhand-right.png new file mode 100644 index 0000000000..b129f3d639 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/meta.json new file mode 100644 index 0000000000..8257c4d57a --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite made by RynKatze for SP14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..95be8cbf0e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..95be8cbf0e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/icon.png new file mode 100644 index 0000000000..17ae09fbaf Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/inhand-left.png new file mode 100644 index 0000000000..eaff9ae1bb Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/inhand-right.png new file mode 100644 index 0000000000..2b12ba9712 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/meta.json new file mode 100644 index 0000000000..8257c4d57a --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite made by RynKatze for SP14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/Equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/Equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..5580574bf8 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/Equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/Equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/Equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..5580574bf8 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/Equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/icon.png new file mode 100644 index 0000000000..2c30c29acd Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/inhand-left.png new file mode 100644 index 0000000000..e3c63356f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/inhand-right.png new file mode 100644 index 0000000000..d85dc338cb Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/meta.json new file mode 100644 index 0000000000..446e931cac --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite made by RynKatze for SP14 based on sprite made by Emisse for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sp14wardens.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sp14wardens.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..dd4fac6385 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sp14wardens.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sp14wardens.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sp14wardens.rsi/icon.png new file mode 100644 index 0000000000..b44e716563 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sp14wardens.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sp14wardens.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sp14wardens.rsi/inhand-left.png new file mode 100644 index 0000000000..0e5ff95acc Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sp14wardens.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sp14wardens.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sp14wardens.rsi/inhand-right.png new file mode 100644 index 0000000000..b6a8b27368 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sp14wardens.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sp14wardens.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sp14wardens.rsi/meta.json new file mode 100644 index 0000000000..035d6ccb2b --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sp14wardens.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by RynKatze", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14liberator.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14liberator.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..6fa3200421 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14liberator.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14liberator.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14liberator.rsi/icon.png new file mode 100644 index 0000000000..5cc74860e7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14liberator.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14liberator.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14liberator.rsi/inhand-left.png new file mode 100644 index 0000000000..504a33c40f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14liberator.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14liberator.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14liberator.rsi/inhand-right.png new file mode 100644 index 0000000000..7806e112c0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14liberator.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14liberator.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14liberator.rsi/meta.json new file mode 100644 index 0000000000..4d7709b9b5 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14liberator.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by belay5 (discord), modified by RynKatze for SP14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/equipped-INNERCLOTHING-MONKEY.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/equipped-INNERCLOTHING-MONKEY.png new file mode 100644 index 0000000000..8063858968 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/equipped-INNERCLOTHING-MONKEY.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..3dc618e976 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/icon.png new file mode 100644 index 0000000000..9e24c81266 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/inhand-left.png new file mode 100644 index 0000000000..01bb31c7d4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/inhand-right.png new file mode 100644 index 0000000000..1331d4a906 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/meta.json new file mode 100644 index 0000000000..0e511cc1d7 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by RynKatze", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + { + "name": "equipped-INNERCLOTHING-MONKEY", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14warden.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..a7715a2151 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14warden.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14warden.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14warden.rsi/icon.png new file mode 100644 index 0000000000..658a81572c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14warden.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14warden.rsi/inhand-left.png new file mode 100644 index 0000000000..bc989c7e5a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14warden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14warden.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14warden.rsi/inhand-right.png new file mode 100644 index 0000000000..73fc5abb0e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14warden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14warden.rsi/meta.json new file mode 100644 index 0000000000..035d6ccb2b --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14warden.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by RynKatze", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json index bca3be1df8..6224a9937c 100644 --- a/Resources/Textures/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/Markers/jobs.rsi/meta.json @@ -190,6 +190,9 @@ { "name": "seniorofficer" }, + { + "name": "sp14warden" + }, { "name": "technicalassistant" }, diff --git a/Resources/Textures/Markers/jobs.rsi/sp14warden.png b/Resources/Textures/Markers/jobs.rsi/sp14warden.png new file mode 100644 index 0000000000..50a336e945 Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/sp14warden.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json index 5600268fde..63243748e9 100644 --- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2 sprites based on fire and emergency sprites", + "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2_door state modified by Flareguy from fire_door, using sprites from /vg/station at https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e , sp14warden doors modified from cap lockers by Unajoy.", "license": "CC-BY-SA-3.0", "states": [ { @@ -492,15 +492,21 @@ "name": "shotguncase_open" }, { - "name": "sparking", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1 + "name": "sparking", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] ] - ] + }, + { + "name": "sp14warden_door" + }, + { + "name": "sp14warden_open" }, { "name": "syndicate" diff --git a/Resources/Textures/Structures/Storage/closet.rsi/sp14warden_door.png b/Resources/Textures/Structures/Storage/closet.rsi/sp14warden_door.png new file mode 100644 index 0000000000..36616785fa Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/sp14warden_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/sp14warden_open.png b/Resources/Textures/Structures/Storage/closet.rsi/sp14warden_open.png new file mode 100644 index 0000000000..d266a26e3a Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/sp14warden_open.png differ