diff --git a/Content.Shared/GameObjects/Components/PDA/UplinkCategory.cs b/Content.Shared/GameObjects/Components/PDA/UplinkCategory.cs index 13f8ad5245..a9278bba79 100644 --- a/Content.Shared/GameObjects/Components/PDA/UplinkCategory.cs +++ b/Content.Shared/GameObjects/Components/PDA/UplinkCategory.cs @@ -4,6 +4,12 @@ namespace Content.Shared.GameObjects.Components.PDA { Weapons, Ammo, + Explosives, + Misc, + Bundles, + Tools, Utility, + Armor, + Pointless, } } diff --git a/Resources/Prototypes/Catalog/Fills/duffel.yml b/Resources/Prototypes/Catalog/Fills/duffel.yml index b86c279f9d..4a6180c7c9 100644 --- a/Resources/Prototypes/Catalog/Fills/duffel.yml +++ b/Resources/Prototypes/Catalog/Fills/duffel.yml @@ -1,7 +1,7 @@ - type: entity parent: ClothingBackpackDuffelMedical id: ClothingBackpackDuffelSurgeryFilled - name: surgical duffel bag + name: surgical duffelbag description: "A large duffel bag for holding extra medical supplies - this one seems to be designed for holding surgical tools." components: - type: StorageFill @@ -14,3 +14,129 @@ - name: Scalpel - type: Storage capacity: 30 + +- type: entity + parent: ClothingBackpackDuffelSyndicate + id: ClothingBackpackDuffelSyndicateFilledMedical + name: syndicate surgical duffelbag + description: "A large duffel bag for holding extra medical supplies - this one seems to be designed for holding surgical tools." + components: + - type: Sprite + state: icon-med + - type: StorageFill + contents: + - name: Hemostat + - name: BoneSaw + - name: Drill + - name: Cautery + - name: Retractor + - name: Scalpel + - type: Storage + capacity: 30 + +- type: entity + parent: ClothingBackpackDuffelSyndicate + id: ClothingBackpackDuffelSyndicateFilledShotgun + name: Bojevic bundle + description: "Lean and mean: Contains the popular Bojevic Shotgun, a 12g beanbag drum and 2 12g buckshot drums." #, and a pair of Thermal Imaging Goggles. + components: + - type: Sprite + state: icon-ammo + - type: StorageFill + contents: + - name: ShotgunBojevic + - name: MagazineShotgun + - name: MagazineShotgunBeanbag +# - name: ThermalImagingGoggles + - type: Storage + capacity: 100 + +- type: entity + parent: ClothingBackpackDuffelSyndicate + id: ClothingBackpackDuffelSyndicateFilledSMG + name: C-20r bundle + description: "Old faithful: The classic C-20r Submachine Gun, bundled with three magazines." #, and a Suppressor. + components: + - type: Sprite + state: icon-ammo + - type: StorageFill + contents: + - name: SmgC20r + - name: MagazinePistolSmg + amount: 2 +# - name: SMGSuppressor + - type: Storage + capacity: 100 + +- type: entity + parent: ClothingBackpackDuffelSyndicate + id: ClothingBackpackDuffelSyndicateFilledLMG + name: L6 Saw bundle + description: "More dakka: The iconic L6 lightmachinegun, bundled with 2 box magazines." + components: + - type: Sprite + state: icon-ammo + - type: StorageFill + contents: + - name: LMGL6 + - name: MagazineLRifleBox + - type: Storage + capacity: 100 + +- type: entity + parent: ClothingBackpackDuffelSyndicate + id: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher + name: China-Lake bundle + description: "An old China-Lake grenade launcher bundled with 9 rounds of various destruction capability." + components: + - type: Sprite + state: icon-ammo + - type: StorageFill + contents: + - name: LauncherChinaLake + - name: GrenadeBlast + amount: 3 + - name: GrenadeFlash + amount: 3 + - name: GrenadeFrag + amount: 3 + - type: Storage + capacity: 200 + +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelSyndicateCostumeCentcom + name: Centcom official costume duffelbag + description: "Contains a full CentCom Official uniform set, headset and clipboard included. The headset comes without an encryption key." + components: + - type: StorageFill + contents: + - name: ClothingHeadHatCaptain + - name: ClothingEyesGlassesSunglasses + - name: ClothingUniformJumpsuitCentcomOfficial + - name: ClothingShoesBootsJack + - name: ClothingHandsGlovesColorGray + - name: ClothingHeadsetService + - name: ClothingOuterVestKevlar + - name: Paper + - name: Pen + - name: CentcomPDA + - type: Storage + capacity: 50 + +- type: entity + parent: ClothingBackpackDuffelClown + id: ClothingBackpackDuffelSyndicateCostumeClown + name: clown costume duffelbag + description: "Contains a complete Clown outfit." + components: + - type: StorageFill + contents: + - name: ClothingUniformJumpsuitClown + - name: ClothingShoesClown + - name: ClothingMaskClown + - name: BikeHorn + - name: ClownPDA + - name: ClothingHeadsetService + - type: Storage + capacity: 30 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 1c1542f2ef..6a5d0c75d5 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1,17 +1,238 @@ +# Guns + - type: uplinkListing id: UplinkPistolClarissa category: Weapons itemId: PistolClarissa - price: 15 + price: 6 + +- type: uplinkListing + id: UplinkRevolverInspector + category: Weapons + itemId: RevolverInspector + price: 8 + +# Inbuilt suppressor so it's sneaky + more expensive. +- type: uplinkListing + id: UplinkPistolMandella + category: Weapons + itemId: PistolMandella + price: 8 + +#- type: uplinkListing +# id: UplinkCrossbowEnergyMini +# category: Weapons +# itemId: CrossbowEnergyMini +# price: 8 + +# bug swept to make +#- type: uplinkListing +# id: UplinkESword +# category: Weapons +# itemId: ESword +# price: 8 + +# bug swept to make +#- type: uplinkListing +# id: UplinkDoubleBladedESword +# category: Weapons +# itemId: DoubleBladedESword +# price: 16 + +# bug swept to make +#- type: uplinkListing +# id: UplinkEnergyDagger +# category: Weapons +# itemId: EnergyDagger +# price: 2 + +# Explosives + +- type: uplinkListing + id: UplinkExplosiveGrenade + category: Explosives + itemId: ExGrenade + price: 4 + +- type: uplinkListing + id: UplinkExplosiveGrenadeFlash + category: Explosives + itemId: GrenadeFlashBang + price: 4 + +- type: uplinkListing + id: UplinkSyndieMiniBomb + category: Explosives + itemId: SyndieMiniBomb + price: 6 + +#- type: uplinkListing +# id: UplinkExplosiveC4 +# category: Weapons +# itemId: ExplosiveC4 +# price: 5 + +#- type: uplinkListing +# id: UplinkDuffelExplosiveC4 +# category: Weapons +# itemId: DuffelExplosiveC4 +# price: 15 + +# Ammo - type: uplinkListing id: UplinkPistol9mmMagazine category: Ammo itemId: magazine_9mm + price: 2 + +# For the Mandella +- type: uplinkListing + id: UplinkMagazineClRiflePistol + category: Ammo + itemId: MagazineClRiflePistol + price: 2 + +# For the Inspector +- type: uplinkListing + id: UplinkSLMagnum + category: Ammo + itemId: SLMagnum + price: 2 + +# Bundles + +- type: uplinkListing + id: UplinkC20RBundle + category: Bundles + itemId: ClothingBackpackDuffelSyndicateFilledSMG + price: 14 + +- type: uplinkListing + id: UplinkBojevicBundle + category: Bundles + itemId: ClothingBackpackDuffelSyndicateFilledShotgun + price: 13 + +- type: uplinkListing + id: UplinkL6SawBundle + category: Bundles + itemId: ClothingBackpackDuffelSyndicateFilledLMG + price: 18 + +- type: uplinkListing + id: UplinkGrenadeLauncherBundle + category: Bundles + itemId: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher + price: 25 + +# Tools + +- type: uplinkListing + id: UplinkToolbox + category: Tools + itemId: ToolboxSyndicateFilled price: 5 +- type: uplinkListing + id: UplinkSyndicateJawsOfLife + category: Tools + itemId: SyndicateJawsOfLife + price: 2 + +- type: uplinkListing + id: UplinkDuffelSurgery + category: Tools + itemId: ClothingBackpackDuffelSyndicateFilledMedical + price: 5 + +- type: uplinkListing + id: UplinkCarpDehydrated + category: Tools + itemId: DehydratedSpaceCarp + price: 5 + +# Armor + +# Should be cameleon shoes, change when implemented. +- type: uplinkListing + id: UplinkClothingNoSlipsShoes + category: Armor + itemId: ClothingShoesChameleonNoSlips + price: 2 + +- type: uplinkListing + id: UplinkClothingOuterVestWeb + category: Armor + itemId: ClothingOuterVestWeb + price: 5 + +- type: uplinkListing + id: UplinkHardsuitSyndie + category: Armor + itemId: ClothingOuterHardsuitSyndie + price: 5 + +- type: uplinkListing + id: UplinkHardsuitSyndieHelmet + category: Armor + itemId: ClothingHeadHelmetHardsuitSyndie + price: 5 + +# Misc + +- type: uplinkListing + id: UplinkBalloon + category: Misc + itemId: BalloonSyn + price: 20 + +- type: uplinkListing + id: UplinkDecoyDisk + category: Misc + itemId: NukeDiskFake + price: 1 + +- type: uplinkListing + id: UplinkRevolverCapGun + category: Misc + itemId: RevolverCapGun + price: 4 + - type: uplinkListing id: UplinkPen - category: Utility + category: Misc itemId: Pen price: 2 + +- type: uplinkListing + id: UplinkSoapSyndie + category: Misc + itemId: SoapSyndie + price: 1 + +- type: uplinkListing + id: UplinkUltrabrightLantern + category: Misc + itemId: lanternextrabright + price: 2 + +#- type: uplinkListing +# id: UplinkTelecrystal +# category: Misc +# itemId: Telecrystal +# price: 1 + +# Pointless + +- type: uplinkListing + id: UplinkCostumeCentcom + category: Pointless + itemId: ClothingBackpackDuffelSyndicateCostumeCentcom + price: 4 + +- type: uplinkListing + id: UplinkCostumeClown + category: Pointless + itemId: ClothingBackpackDuffelSyndicateCostumeClown + price: 4 diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 34489d77ae..af8bdb86c9 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -125,3 +125,14 @@ sprite: Clothing/Hands/Gloves/spaceninja.rsi - type: Clothing sprite: Clothing/Hands/Gloves/spaceninja.rsi + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsGlovesCombat + name: combat gloves + description: These tactical gloves are fireproof and shock resistant. + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/Color/black.rsi + - type: Clothing + sprite: Clothing/Hands/Gloves/Color/black.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index 37e5bb9aa0..5ad0b459a6 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -79,3 +79,13 @@ sprite: Clothing/Shoes/Specific/wizard.rsi - type: Clothing sprite: Clothing/Shoes/Specific/wizard.rsi + +- type: entity + parent: ClothingShoesColorBlack + id: ClothingShoesChameleonNoSlips + name: no-slip shoes + #name: no-slip chameleon shoes + #description: These shoes have an action button to change shape, but unlike the chameleon shoes from the kit they also protect you from slips. + description: These protect you from slips while looking like normal sneakers. + components: + - type: NoSlip diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 740398223d..9d7a21edee 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1,3 +1,14 @@ +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitAncient + name: ancient jumpsuit + description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/ancient.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/ancient.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitBartender @@ -74,6 +85,28 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/chaplain.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCentcomOfficial + name: centcom official's jumpsuit + description: It's a jumpsuit worn by CentCom's officials. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/centcom_official.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/centcom_official.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCentcomOfficer + name: centcom officer's jumpsuit + description: It's a jumpsuit worn by CentCom Officers. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/centcom_officer.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/centcom_officer.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitChef diff --git a/Resources/Prototypes/Entities/Objects/Consumable/food.yml b/Resources/Prototypes/Entities/Objects/Consumable/food.yml index 84197458e6..0d5a0f08e2 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/food.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/food.yml @@ -1763,25 +1763,6 @@ sprite: Objects/Consumable/Food/hburger.rsi - type: Grindable -- type: entity - parent: FoodBase - id: FoodMonkeyCube - name: monkey cube - description: Just add water! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: chem.Nutriment - Quantity: 10 - maxVol: 11 # needs room for water - caps: AddTo, RemoveFrom, FitsInDispenser - - type: Sprite - sprite: Objects/Consumable/Food/monkeycube.rsi - - type: Rehydratable - target: MonkeyMob_Content - - type: Grindable - - type: entity parent: FoodBase id: FoodMonkeysDelight @@ -2997,4 +2978,3 @@ sprite: Objects/Consumable/Food/memoryleek.rsi state: memoryLeek - type: Grindable - diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index d4fe1f426f..f39b7d6e0d 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -350,3 +350,12 @@ state: pda-security - type: Icon state: pda-security + +- type: entity + name: Centcom PDA + parent: AssistantPDA + id: CentcomPDA + description: Colored the numbing grey of bureaucracy. + components: + - type: PDA + idCard: CentcomIDCardSyndie diff --git a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml new file mode 100644 index 0000000000..c1107f0d7f --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml @@ -0,0 +1,19 @@ +- type: entity + name: nuclear authentication disk + parent: BaseItem + id: NukeDisk + description: GET DAT FUCKKEN DISK + components: + - type: Sprite + netsync: false + sprite: Objects/Misc/nukedisk.rsi + state: icon + - type: Item + size: 12 + sprite: Objects/Misc/nukedisk.rsi + state: icon + +- type: entity + parent: NukeDisk + id: NukeDiskFake + description: GET DAT FUCK- wait a second... diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 2ea4423887..91916f84af 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -320,3 +320,19 @@ - Kitchen - Janitor - Theatre + +- type: entity + parent: IDCardStandard + id: CentcomIDCardSyndie + name: Centcom ID card + components: + - type: Sprite + layers: + - state: centcom + - type: Clothing + HeldPrefix: blue + - type: IdCard + jobTitle: Central Commander + - type: Access + tags: + - Maintenance diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml new file mode 100644 index 0000000000..8039c156e5 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml @@ -0,0 +1,34 @@ +- type: entity + parent: FoodBase + id: MonkeyCube + name: monkey cube + description: Just add water! + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Nutriment + Quantity: 10 + maxVol: 11 # needs room for water + caps: AddTo, RemoveFrom, FitsInDispenser + - type: Sprite + sprite: Objects/Consumable/Food/monkeycube.rsi + - type: Rehydratable + target: MonkeyMob_Content + - type: Grindable + +- type: entity + parent: PlushieCarp + id: DehydratedSpaceCarp + name: dehydrated space carp + description: Looks like a plush toy carp, but just add water and it becomes a real-life space carp! + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Nutriment + Quantity: 10 + maxVol: 11 # needs room for water + caps: AddTo, RemoveFrom, FitsInDispenser + - type: Rehydratable + target: CarpMob_Content diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws-of-life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws-of-life.yml new file mode 100644 index 0000000000..eaf81c2e3f --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Tools/jaws-of-life.yml @@ -0,0 +1,41 @@ +- type: entity + name: jaws of life + parent: BaseItem + id: JawsOfLife + description: A set of jaws of life, compressed through the magic of science. + components: + - type: Sprite + sprite: Objects/Tools/jaws_of_life.rsi + state: jaws_pry + - type: Item + sprite: Objects/Tools/jaws_of_life.rsi + - type: TilePrying + - type: Tool + qualities: + - Prying + statusShowBehavior: true + - type: MultiTool + tools: + - behavior: Prying + state: jaws_pry + useSound: /Audio/Items/jaws_pry.ogg + changeSound: /Audio/Items/change_jaws.ogg + - behavior: Cutting + state: jaws_cutter + useSound: /Audio/Items/jaws_cut.ogg + changeSound: /Audio/Items/change_jaws.ogg + +- type: entity + name: syndicate jaws of life + parent: JawsOfLife + id: SyndicateJawsOfLife + description: Useful for entering the station or its departments. + components: + - type: Sprite + state: syn_jaws_pry + - type: MultiTool + tools: + - behavior: Prying + state: syn_jaws_pry + - behavior: Cutting + state: syn_jaws_cutter diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml index a8f62030fd..e50fc08d74 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml @@ -27,3 +27,16 @@ - type: Appearance visuals: - type: LanternVisualizer + +- type: entity + name: extra-bright lantern + parent: lantern + id: lanternextrabright + description: Blinding. + components: + - type: PointLight + enabled: false + radius: 5 + energy: 10 + color: "#FFC458" + - type: LoopingSound diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index b310ee431a..282b5d590f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -9,6 +9,7 @@ size: 9999 - type: ItemCooldown - type: MeleeWeapon + damage: 10 hitSound: "/Audio/Weapons/smash.ogg" - type: entity @@ -98,7 +99,7 @@ sprite: Objects/Tools/Toolboxes/toolbox_green.rsi - type: entity - name: syndicate toolbox + name: suspicious toolbox parent: ToolboxBase id: ToolboxSyndicate description: A sinister looking toolbox filled with elite syndicate tools. @@ -108,6 +109,24 @@ state: icon - type: Item sprite: Objects/Tools/Toolboxes/toolbox_syn.rsi + - type: MeleeWeapon + damage: 15 + +- type: entity + id: ToolboxSyndicateFilled + name: suspicious toolbox + suffix: Filled + parent: ToolboxSyndicate + components: + - type: StorageFill + contents: + - name: Screwdriver + - name: Wrench + - name: Welder + - name: Crowbar + - name: Multitool + - name: Wirecutter + - name: ClothingHandsGlovesCombat - type: entity name: golden toolbox diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index cafa7ee90f..b9fdc3a66f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -133,33 +133,6 @@ - Multitool - type: SignalLinker -- type: entity - name: jaws of life - parent: BaseItem - id: JawsOfLife - description: A set of jaws of life, compressed through the magic of science. - components: - - type: Sprite - sprite: Objects/Tools/jaws_of_life.rsi - state: jaws_pry - - type: Item - sprite: Objects/Tools/jaws_of_life.rsi - - type: TilePrying - - type: Tool - qualities: - - Prying - statusShowBehavior: true - - type: MultiTool - tools: - - behavior: Prying - state: jaws_pry - useSound: /Audio/Items/jaws_pry.ogg - changeSound: /Audio/Items/change_jaws.ogg - - behavior: Cutting - state: jaws_cutter - useSound: /Audio/Items/jaws_cut.ogg - changeSound: /Audio/Items/change_jaws.ogg - - type: entity name: power drill parent: BaseItem diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-ammo.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-ammo.png new file mode 100644 index 0000000000..8f16dfb352 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-ammo.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png new file mode 100644 index 0000000000..210878cb81 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json index 89236692cc..32bf2ce77e 100644 --- a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json @@ -11,6 +11,14 @@ "name": "icon", "directions": 1 }, + { + "name": "icon-ammo", + "directions": 1 + }, + { + "name": "icon-med", + "directions": 1 + }, { "name": "equipped-BACKPACK", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..e74a13048f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/icon.png new file mode 100644 index 0000000000..61b1d0694a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/inhand-left.png new file mode 100644 index 0000000000..ae15d262d7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/inhand-right.png new file mode 100644 index 0000000000..60bea1b51a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json new file mode 100644 index 0000000000..b361c3328c --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit (Will update when PR'd)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..c0c5f8ad07 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png new file mode 100644 index 0000000000..66c859b96f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-left.png new file mode 100644 index 0000000000..5456486c25 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-right.png new file mode 100644 index 0000000000..23855a8759 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json new file mode 100644 index 0000000000..d01e147030 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..aef08cee2c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/icon.png new file mode 100644 index 0000000000..9fcf7ace5a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/inhand-left.png new file mode 100644 index 0000000000..942a5247ab Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/inhand-right.png new file mode 100644 index 0000000000..65f7b91a71 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/meta.json new file mode 100644 index 0000000000..d01e147030 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/blue-inhand-left.png b/Resources/Textures/Objects/Misc/id_cards.rsi/blue-inhand-left.png new file mode 100644 index 0000000000..9adcd4b6a3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/blue-inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/blue-inhand-right.png b/Resources/Textures/Objects/Misc/id_cards.rsi/blue-inhand-right.png new file mode 100644 index 0000000000..394cc79b27 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/blue-inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index a097ce4dbd..0fc51bd2b7 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -242,6 +242,22 @@ { "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/Objects/Misc/id_cards.rsi/orange-inhand-left.png b/Resources/Textures/Objects/Misc/id_cards.rsi/orange-inhand-left.png new file mode 100644 index 0000000000..5937b9cd21 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/orange-inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/orange-inhand-right.png b/Resources/Textures/Objects/Misc/id_cards.rsi/orange-inhand-right.png new file mode 100644 index 0000000000..027f8aea2a Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/orange-inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png b/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png new file mode 100644 index 0000000000..1ef83e9abb Binary files /dev/null and b/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json b/Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json new file mode 100644 index 0000000000..81c0661e3c --- /dev/null +++ b/Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a7215663648f4289d2446a1c82aec1c9a406310c", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json index 2ab00fd169..6f0fd01ae1 100644 --- a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json @@ -1 +1,83 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC BY-SA 3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at commit ea59fb4b810decbb5996b36d8876614b57c3d189", "states": [{"name": "jaws_cutter", "directions": 1, "delays": [[1.0]]}, {"name": "jaws_pry", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "license": "CC BY-SA 3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation at commit ea59fb4b810decbb5996b36d8876614b57c3d189", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "jaws_cutter", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "jaws_pry", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "syn_jaws_cutter", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "syn_jaws_pry", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_cutter.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_cutter.png new file mode 100644 index 0000000000..973b1428b8 Binary files /dev/null and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_cutter.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png new file mode 100644 index 0000000000..ed36af3d67 Binary files /dev/null and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png differ