From b44cb0095a09e8b7b0c607d504311ef092315b8b Mon Sep 17 00:00:00 2001 From: Swept Date: Sat, 19 Dec 2020 23:16:50 +0000 Subject: [PATCH] Traitor Uplink Content (#2778) * Adds syndicate toolbox * Ancient jumpsuit * Disk, Extra-bright lantern, syn med/ammo duffels etc. * Disk sprite fixed * Final * Addressed reviews * Update duffel.yml Co-authored-by: DrSmugleaf --- .../Components/PDA/UplinkCategory.cs | 6 + Resources/Prototypes/Catalog/Fills/duffel.yml | 128 +++++++++- .../Prototypes/Catalog/uplink_catalog.yml | 225 +++++++++++++++++- .../Entities/Clothing/Hands/gloves.yml | 11 + .../Entities/Clothing/Shoes/specific.yml | 10 + .../Entities/Clothing/Uniforms/jumpsuits.yml | 33 +++ .../Entities/Objects/Consumable/food.yml | 20 -- .../Entities/Objects/Devices/pda.yml | 9 + .../Entities/Objects/Misc/dat_fukken_disk.yml | 19 ++ .../Objects/Misc/identification_cards.yml | 16 ++ .../Objects/Specific/rehydrateable.yml | 34 +++ .../Entities/Objects/Tools/jaws-of-life.yml | 41 ++++ .../Entities/Objects/Tools/lantern.yml | 13 + .../Entities/Objects/Tools/toolbox.yml | 21 +- .../Entities/Objects/Tools/tools.yml | 27 --- .../Back/Duffels/syndicate.rsi/icon-ammo.png | Bin 0 -> 294 bytes .../Back/Duffels/syndicate.rsi/icon-med.png | Bin 0 -> 289 bytes .../Back/Duffels/syndicate.rsi/meta.json | 8 + .../ancient.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1312 bytes .../Uniforms/Jumpsuit/ancient.rsi/icon.png | Bin 0 -> 455 bytes .../Jumpsuit/ancient.rsi/inhand-left.png | Bin 0 -> 287 bytes .../Jumpsuit/ancient.rsi/inhand-right.png | Bin 0 -> 321 bytes .../Uniforms/Jumpsuit/ancient.rsi/meta.json | 27 +++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1420 bytes .../Jumpsuit/centcom_officer.rsi/icon.png | Bin 0 -> 437 bytes .../centcom_officer.rsi/inhand-left.png | Bin 0 -> 284 bytes .../centcom_officer.rsi/inhand-right.png | Bin 0 -> 321 bytes .../Jumpsuit/centcom_officer.rsi/meta.json | 27 +++ .../equipped-INNERCLOTHING.png | Bin 0 -> 717 bytes .../Jumpsuit/centcom_official.rsi/icon.png | Bin 0 -> 273 bytes .../centcom_official.rsi/inhand-left.png | Bin 0 -> 416 bytes .../centcom_official.rsi/inhand-right.png | Bin 0 -> 452 bytes .../Jumpsuit/centcom_official.rsi/meta.json | 27 +++ .../Misc/id_cards.rsi/blue-inhand-left.png | Bin 0 -> 256 bytes .../Misc/id_cards.rsi/blue-inhand-right.png | Bin 0 -> 356 bytes .../Objects/Misc/id_cards.rsi/meta.json | 16 ++ .../Misc/id_cards.rsi/orange-inhand-left.png | Bin 0 -> 283 bytes .../Misc/id_cards.rsi/orange-inhand-right.png | Bin 0 -> 284 bytes .../Objects/Misc/nukedisk.rsi/icon.png | Bin 0 -> 353 bytes .../Objects/Misc/nukedisk.rsi/meta.json | 21 ++ .../Objects/Tools/jaws_of_life.rsi/meta.json | 84 ++++++- .../jaws_of_life.rsi/syn_jaws_cutter.png | Bin 0 -> 598 bytes .../Tools/jaws_of_life.rsi/syn_jaws_pry.png | Bin 0 -> 525 bytes 43 files changed, 771 insertions(+), 52 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml create mode 100644 Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml create mode 100644 Resources/Prototypes/Entities/Objects/Tools/jaws-of-life.yml create mode 100644 Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-ammo.png create mode 100644 Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/meta.json create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/blue-inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/blue-inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/orange-inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/orange-inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png create mode 100644 Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json create mode 100644 Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_cutter.png create mode 100644 Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png 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 0000000000000000000000000000000000000000..8f16dfb3528e01fed8556356c86acef9f404c2d4 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyHUT~%t_Kbr;OFNT5)!IsWGrW7 zR8&;7WnfTOSHFLm;o>odBfA(RBqT&cM9!W)tEHtipMhZt14BClgOih!kB?9GEdC0h zIgBMie!&b5&u*jvIWs(6978O6-%dC!bXbAIRhMfE@51%}|6gA;Niy|P&gPeeidE;G z^1bT)9$vCMaXgoep{TLfs!fK`P~1gDDM$H?rE zYHZLsP^GbfJFEY~{X@SmU*Dy@#k{19<$tSi{ltiEa#mZ}IS<`PS?TN7B)PHXp$Lzp qjCIQ$o^^f6?K5^iezWxXN7k~p>_uKz&MX1Ck-^i|&t;ucLK6VGL2R!8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..210878cb81d512761ea5beb03befa16864fa85b2 GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy#sNMdt_Kbr;OFNT5)!IsWGrW7 zR8&;7WnfTOSO4XIn}|7;GeE}qZn(O z@D>}V^{wBR_a|#^F)tBo`g`cZeh!^=~aQgFKP)fv*a%t&3^o$1Es|23E7GJ%;F_~cs?;gcL`WkD{(uSr zHIPR9*TN_&o@f+NFMN}G%j~+@+nK$;nE7DYnYo$y-h1=r&D`vefq{X6fq{X6!GDS; zUTViDe%kUA@ehe`I4sgHem%F^ek%Qv!296ffW|^EJ^KuTw+FEVHy<1vw0fGHoV3!f z!{avo&{(}EW07BZpnPj~jk*5zQxXlZG&tj_hgT~IjrkB^Tj6bgy5va&Mq zMjqul{GO}8-rk;g1Umn`c)s%};9XT!CCYgO+}i2Dt)IKQJJ+7%a$CC~2AJr4_aKs= zoSZzU=PYw;rvtZsii?Ydp&J_;MgHpQN+?@cSm?_Ckv@7d``!oS3oz1WXJ_I8?(gr# zyP&{VJP&4oqoX65o}LzI1iazlVX@|-+(IaGmReq3rmn6o5qz-%$?y95dRkv!CwivV zr;-7nv>X6AAaYr%Why9odV0jZV_;xF^n}<0gK(agX%#3>0eQy<1IYPI8vxkZ*`e<4 zZjnX+uBfOG>6Migt^TxP055s6!m=SUiPF+inw_1sRw4W+z%qy_paZ?gkyIXQZZ<|; z2BsS;%m4h4ckWI6LfZh31^>MPlw*LK%VXP_uC1>QzgKxGC>h|v7PHg6EK|UKpZEL% zVfQi>C>@FYiwJxm^4MVvkOwm46vhB~AVW@J43Gyh+fAd`*}lnlVi_xAQ$4->~?v8)&Y z9N_YjMWsJw4*(IcySqzMQ&Sf4=;$aN9v-T8rwnj_ii!6} zMbw2$uCA_T+yJ-_AkTMM7I}&G3uO%333{nlD4)s>ged8>gsA*SXfZ)P8r|;7dXK!Z@zSP zg32F8UVR%+aInJ{S)PweOH1^oF_N)+!ZM(=ydmSDjQH^WX-w&^u(Ah$07SV`9sn0O zDH(hri<|O(p!IJMyD`S~^>x-hjLHBfxZPw@L7-b=5a9CiGN>-vNC$VI0}%+YxVT7( zMD~vczzOc4MhIj8zN#v_Vz$7XEQ2lr-4U9bn-l*7bb?P%fD_!1A=~$q3=AF%i0C(I W0L@Y0YF~)}0000jyIPerDb`Z{9ql2@@tvxO&{E5>N!6H908W%H?t?=8s?UDqYUFeph9nmyf@{6U5ucKBVK05_EY(_wQNj^k9PW-5 zOa~D_P`LoPAX࿖}pijWD&@~;pespH83WgL@g{ xUES9EBLcM+OUE|brW=Amzhqr~JYnt^2XV<-9Q$yAs+Q962 zWp&osRa!o*9D!o%r>>4MSnD8E8o!gLTmMd&UU`G@M(u`9qpWv#S9U1&tDJiA^wHCf zl?Po$2b(c;U_M$sf{OCaUUrf6z)W;WU&vBFM`i=4Q5AmCKJ4 P=phDAS3j3^P6fp8`RJ`d~#Oh!pZ< z>PsLBf)uT_R1|ZeFO}3o?vyBLqckb?(j)(DljiSTR(^9go4w2Bc4ziq$q&*RoXNHxBqHaE4)X8 za!bqK4B^Y(5OUd9bEZtIKiv2}YP9cQhBlO@{6P9VD}yIH?&kt5X#S(LUi+GQfa657 zRB_~GIsa-y51zVm5K`wQ2L=E8{!4gv;yt;1>HPPQ`Xi?G1YcLHB(?6v#GxKET->nZ znwi4d!*z0+mpekkxYrwUs0OG-fb8Ho6eL>wKsbi2%FPgg2cHYi;v!ZmD|41{5lkBb z6wuPGsGMd&X9Z8?Oc)EGfSfn~&f74R(|ID~6@acjU1d3_a4dh*>2lsXSbYQVtIvZ< zj!nUJdlH_+T1KOkrhF<#S}dwZ_0_Cv?g6|zD|>+wo^R&ZC!9B~vm+nVcN1}}I9)8y zvCYShlwO~i%Q%nMQ*A$A;pzSe0{szTr@y5-{SoArN;~iLhSy)no^)7a;-m zjaFdC9WUzZ>v8hrr62e^v2hO4^gLDv!VYq5<;;*}uf>rLo@{Vm4vp8~hqs?$WozdK zWncLDraunz;MXHjd{=dorN3$mGjT9JD;$t8=64&G%(Pj*j%VsX$)DRm26ynhO&A7qL_5>w6JXQ&XGD z{uJCI6rKbAc-qBoLrTV)1Na#)z+E#a+MF=%ni{FgyC3( zA)92|=mjt&fcv2;c9fRIW?nPkHn|Ua(KiWp2PNgWS3Z9i68jH00005===54p(=MAS%G4K!C#6AovM&csPTG0;&jHuOz)R z*9vmUv1Il>+Dj;z1zh(@F1xcc*_oZWorOlDnR*OP0z^Ds%&mx3GcV_z%fnQ^cycYr zmvD&FkG9;CwK0GhZUxBsrddD^25JXI*tRX#X(XA}Nl$kFURAl{aaG{;Me936p{tbDptd!1@Pd zq;EZJ_e)rCO<0zN`tCWr`W?#U9bC1K(Cv2Nx*_gMeHH)wR&4ICiO;19P|S@K^LgNX zIFkK91{&TxvwuQ%22%F6q8T+CKfZQJlcF_6lpZ6Qg+iQxN+HUIA4Cm_$}|Y%>7no# fX*3$mlmp-kj8=qNn0$I|00000NkvXXu0mjfV$8rL literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5456486c2589acec3dd4dc1e6ac4ad79c3ef5a13 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|etpJ}8R}k$jViYBAW@cuaFY8*X z7&28WY=(B^9G%n?R#{nDO-)UGeSIfRoCuS790gR(SQ6wH%;50sMjDW_z|+Ms#N+te z$+lcA1_EyG0y#%#--tTfm3^W%=Th!NK^M;tD%|&cKTP*b+ZNls=auXJ39lGklx8VNU&9Y4gTW%IetWcE6xGmXz<;8(B*Az^DwUll9*mG&u%N@(^bi8@+ z=gy|)B~km9rk5;`{`;vXXwU0A+dZCiuKj#xt#|Y4QpSY^>q=j8g2+OHe=;1c#cRE7 cR(%kaeqg-#;!YP8pj#O{UHx3vIVCg!0K;Z?^#A|> literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..23855a8759e370493aafc27569cb8e04fc93a7cb GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|etpJ}8R}k$jViYBAW@cuaFY8*X z7&28WY=(B^9G%n?R#{nDO-)UGeSIfRoCuS790gR(SQ6wH%;50sMjDWF)YHW=#N&8! zf&}a0hIa=V8}Bj(Uy)T|WYgj0(b1Loq@cJ$<8%qzcg-1G%d9szyV|Bt3psaW1GDFq z%|++Vc=@n$1d5%HG>$b`>mXD*-;}po|4y23d4usr?S@XHsJC}hI~4m>PQ7^f=w-)B z2G5WaS3ManbG=!#I6>qB`vwDpDGx#)FuL&l5UCK`5b`MafKlv=Tx%17(f~@-ieco1E{ta?c6q OAqG!ZKbLh*2~7awGIwqO literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..aef08cee2cd2ed35099643ea18ab461e0862fa50 GIT binary patch literal 717 zcmV;;0y6!HP)YCm3;=oN8u#?^89V?00j5brK~z|U?UvhagD?<8y-sZG5}FIXkO2Mv&+KBF zL~5Ajr4OmZC>9TAJ&f@xwo;omy_-mvhbG8(`~7|=aAT{gvIbPFap%2vwzB29$hGnQ z!+WCvpH$nrJYOqj?hhVtE^rl-GTfp;;Rk^`(vA5vjVAY6apwl`sX#pvs6_+yNU*>a znMOSlsK)&M(06VCFM1|e)-wUnGXdsC;OcndUeRg%=jCSp-6H9Dn)8#VL00000NkvXXu0mjf5+5$y literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9fcf7ace5a2268473e36d2f1e3f50a1019e49e4f GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyP60k4uKyVrbo05bCi1qnw%SbP zUA1bJlFzvFLp}VK-l^f`Ci8*u!58J2n3NU(Y2b(zY_k z_T;9cb9fjh_Nxb&9$V4$^fF6!PP9vbU*f`Zy{vzU-#v$Q9>-rg^Zc_B5}Z(c&1!+uU*|2&9Fx2p-86OnR~%(se}mP- Ua0dTNphFluUHx3vIVCg!0Hm>GssI20 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..942a5247abd17f910f0f5e933936d1c09fcfc9e4 GIT binary patch literal 416 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e-2k5uS0G(bz`)SP@clajLmUIc zHimWU7^0)29UUDdBqV}^gF8Ap7_1l=JQ)~r7$mQ8@&Yw5mIV0)GdMiEkp|@CRE0#8 zxTF>*7iAWdWaj5FFjUM54l5`s{r)Am;N#aPTHd-^=gyoD-VkbV(fGk5o%24LCmD)* zdUseD2N_>B_EMPhXws2MAqv5os^4^2yh370Z@2MU4MTI$BW6#6!V10? zGfML?R4teKyIF+q9MImCo-U3d9-YYv60D088X5$cn;BYE4;)Zw&^(`U=s*HTqNKqF zi6pHA&Y}da#!V7)oD4*Fv@KiGX0>2bfar?0_EjLp+5%(qV#nl#l7fuJ;s>1=9cuYr z=%gI5NdDT@nV}?0QdI*0A2t9wg9fK09#vIK|w(n7#LGiQ;3L&06G8wNdN$B02$T^4FCWD0d!JM zQvg8b*k%9#0Bm|xSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1YCm3;=qk8vU~r4$c4o0L@86K~zYIV_+Bsqk!%}fPqN>Q&b2f0S1f) z3@nBi@{A@73{X*)AO@!p3 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9adcd4b6a3c02f8ac0b92c94b19bf4054a69e1f9 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=$30yfLn`LHy|t0I*@34uG5*vW z2jNp1xoHXfUTLRTbP9|o%rcTxe(TzIgvG`^;@5t*i#9*!m6+TB>IH!}W<1Wp+g6<8 z7B$TYdFLtl%z544jJqb<$@Mnoi&!EVZ$Gque>8q}R>b+2%XU`gxo~b`%3AyMSJjQ5 zMdtPE{zml8**!6iQT|+e&9vDiCsy1MsQa(Hk1=p3#B?BeLgnhehFkXzd)N2aSW-L^Y)fu-ys8m*2LLG z{Ei!^WJI5v@THnLs&BKd`GWJZ)2viQWSXvJaCs}NeKN7ogTe~DWM4fzs`^A literal 0 HcmV?d00001 diff --git a/Resources/Textures/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 0000000000000000000000000000000000000000..5937b9cd210ed553f914c758cacc0e35c3a32b01 GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSJOMr-u0Yzu!{cVH!!ZVRrvj-@ zKt5whkY6x^!?PP{Ku%s&NJNQCYH@N=WKhlO#F@nvH#g*lHV9hnrO5Ujah!%*Kg)ZEy$v)fp8 z^9qS26T6MqY8aY}9x;0o6jt!Hm{FRSVY9n*%Tld?M?jmMJzX3_EP9g@Bv?ZjnF^S= zWE@zyo6g^0P_h(c%JFwdnaAvOltnD^&r9Atdi*h^u~qe(|5g(w7T?$(=#l>UH a1~kO4gk_z>m$_?!Oa@O^KbLh*2~7Y>Q((IQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png b/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1ef83e9abb0681830b298e14ffded29c54db34bb GIT binary patch literal 353 zcmV-n0iOPeP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL zOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DX%m+CpEDsC9^nNiHkEOv#1y-YRJWzR+N~V z3St8_rljU1R)U0e47rpQT>V_YHUR*X)gR9P5HIln003c0L_t(IjbmUK1=ItKf=WtC zg1Gq%jK(TqLB;|&`9vuQMN<%ps=yp*XR!cIK2V@@U1#t350et`f&t)WY(`DjE00000NkvXXu0mjflG%m} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..973b1428b80485c15188bbd8931bfc44a4963cfe GIT binary patch literal 598 zcmV-c0;&CpP)q*$ zVOLmTS657eosS zJ_-sJ5)wo`Jg1tPdv0z+JUl!$HpfJKl>h($0d!JMQvg8b*k%9#0Ov_WK~y-6V_+Bs zLk%#30hq}I1*r1OK)}KRQo+Q^#?HaX#m$4Hf{~YxkB^^4K#+xzkx58cL{v;%LQ+Z^ zu7XiU76jzv6%>_}l$4brqRPrjj4%Z%s;a7LYHI50N*Wp(np)Z*K^Pw1EIdMnj+#w#IhGAYkvHq+|$H;0Odxj?OMFO0KT1 zZpQ9l1sxgs=rSe)(Yy00OHZb?Jy`6aWAK07*qoM6N<$g1p4w%K!iX literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ed36af3d67b4b5bf494d31510bd3bfa2412beabe GIT binary patch literal 525 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy4+DHcTn`*LpeQTb-_TH;o}L^T zY0kjl?%?o0(ei(S<^Ndo|Iudu!;Jq28T|Lr`|qKprK*$|hU^v9UP$?!>C?b*+5uq%rypVxm1_MJs14AnVLp1|KhO~6Nq*R!= zxC=M89T%5!Vb^`2e#Vj@zhDN3XE)M-oLinQjv*Gk$q5py&HM&NMvtbaC8aU0PH1H+ z$rLj)Gn>E^R>tS2mnRozmm->wSyxxLKz9vOlhYxkMM;l@Cav-K1QOKD%*>RO>{!s# zV{*o~M`u%jg08x{`uYVNLLot66DK$CjuK_Mdd1Yl#N_AJEu|%2zwq*ynk>+g=uL27 z&S*8<&w0Zt*f=wjcZFcjGY3X)@61eYZEfxBI_V8e(bn44J4Ab)J^Lee$>GI=2M=C6 zdGqMivv&_)K5Y;w=;?VTcInbIF@^d=j9CYajG`hU9`I&66&jvlWVjkGULR|Bj0Y5E Mp00i_>zopr05k->cK`qY literal 0 HcmV?d00001