diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 4a9d5c0463..94c332ec06 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -152,7 +152,7 @@ - ReagentId: Absinthe Quantity: 30 - type: Icon - sprite: Objects/Consumable/Drinks/absintheglass.rsi + sprite: _Sidewinder/Objects/Consumables/Drinks/absinthebottle.rsi # Sidewinder state: icon - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 8630912451..f687c1093a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -128,8 +128,8 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkAbsintheBottleFull - name: Jailbreaker Verte - description: One sip of this and you just know you're gonna have a good time. + name: The Green Fairy # Sidewinder + description: One sip of this and you just know you're going to start seeing things. components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml index eadeeabd74..7d5526c314 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml @@ -159,7 +159,7 @@ # Containers - type: entity - name: Jailbreaker Verte bottle + name: The Green Fairy # Sidewinder parent: DrinkBottleBaseEmpty id: DrinkBottleAbsinthe components: diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 602d6296b3..949b1397fc 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -8,7 +8,7 @@ desc: reagent-desc-absinthe physicalDesc: reagent-physical-desc-strong-smelling flavor: alcohol - color: "#33EE00" + color: "#303b21" # Sidewinder metamorphicSprite: sprite: Objects/Consumable/Drinks/absintheglass.rsi state: icon_empty @@ -31,7 +31,7 @@ desc: reagent-desc-ale physicalDesc: reagent-physical-desc-bubbly flavor: ale - color: "#663100" + color: "#8d4b03" # Sidewinder recognizable: true metamorphicSprite: sprite: Objects/Consumable/Drinks/aleglass.rsi diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml index cecd031f97..1202e3e1dc 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml @@ -28,4 +28,4 @@ doAfter: 4 - node: bat - entity: BaseBallBat + entity: SW14BaseBallBat #Sidewinder diff --git a/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml new file mode 100644 index 0000000000..4160c0fb40 --- /dev/null +++ b/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml @@ -0,0 +1,35 @@ +- type: entity + parent: ClothingBeltStorageBase + id: SW14ClothingSlingerBelt + name: slinger belt + description: a typical gunslinger's belt. holds all your guns and ammo! + components: + - type: Sprite + sprite: _Sidewinder/Clothing/Belt/holster.rsi + - type: Clothing + sprite: _Sidewinder/Clothing/Belt/holster.rsi + - type: Storage + grid: + - 0,0,3,1 + +- type: entity + parent: [ClothingBeltStorageBase, BaseSyndicateContraband] + id: SW14ClothingSyndicateSlingerBelt + name: syndicate slinger belt + description: A customized slinger belt, on the inside theres a stitch that says Syndicate. + components: + - type: Sprite + sprite: _Sidewinder/Clothing/Belt/syndieholster.rsi + - type: Clothing + sprite: _Sidewinder/Clothing/Belt/syndieholster.rsi + - type: Item + size: Ginormous + - type: Storage + maxItemSize: Huge + grid: + - 0,0,3,3 + whitelist: + components: + - Gun + - BallisticAmmoProvider + - CartridgeAmmo diff --git a/Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/baseball_bat.yml new file mode 100644 index 0000000000..9f1f92395d --- /dev/null +++ b/Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -0,0 +1,44 @@ +- type: entity + name: baseball bat + parent: [BaseItem, BaseMinorContraband] + id: SW14BaseBallBat + description: A sturdy wooden baseball bat. + components: + - type: Sprite + sprite: _Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Blunt: 10 + Structural: 5 + soundHit: + collection: MetalThud + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 5 + Structural: 10 + - type: Item + size: Normal + - type: Tool + qualities: + - Rolling + speedModifier: 0.75 # a bit unwieldly but does the job + - type: Clothing + quickEquip: false + slots: + - back + - type: Construction + graph: WoodenBat + node: bat + - type: UseDelay + delay: 1 + - type: PhysicalComposition + materialComposition: + Wood: 250 + - type: Tag + tags: + - SW14BaseballBat diff --git a/Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/knife.yml new file mode 100644 index 0000000000..906573f596 --- /dev/null +++ b/Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/knife.yml @@ -0,0 +1,109 @@ +- type: entity + name: kitchen knife + parent: BaseKnife + id: SW14KitchenKnife + description: A common Kitchen Knife, cuts all the food you could imagine.... probably. + components: + - type: Tag + tags: + - Knife + - SW14KitchenKnife + - type: Sprite + sprite: _Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi + state: icon + - type: Item + sprite: _Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi + - type: GuideHelp + guides: + - Chef + - FoodRecipes + +- type: entity + name: butcher's cleaver + parent: BaseKnife + id: SW14ButchCleaver + description: A specific purpose Cleavers Knife. Sharp enough to cut through bone! + components: + - type: Tag + tags: + - Knife + - SW14Cleaver + - type: Sprite + sprite: _Sidewinder/Objects/Weapons/Melee/cleaver.rsi + state: butch + - type: MeleeWeapon + wideAnimationRotation: -115 + attackRate: 1.5 + damage: + types: + Slash: 13 + - type: Item + size: Normal + sprite: _Sidewinder/Objects/Weapons/Melee/cleaver.rsi + - type: GuideHelp + guides: + - Chef + - FoodRecipes + +- type: entity + name: combat knife + parent: [BaseKnife, BaseRestrictedContraband] + id: SW14CombatKnife + description: A sharp knife built for fighting, watch your fingers. + components: + - type: Tag + tags: + - SW14CombatKnife + - Knife + - type: Sprite + sprite: _Sidewinder/Objects/Weapons/Melee/combat_knife.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1.5 + damage: + types: + Slash: 12 + - type: EmbeddableProjectile + sound: /Audio/Weapons/star_hit.ogg + - type: LandAtCursor + - type: DamageOtherOnHit + damage: + types: + Slash: 10 + - type: Item + sprite: _Sidewinder/Objects/Weapons/Melee/combat_knife.rsi + - type: DisarmMalus + malus: 0.225 + +- type: entity + name: survival knife + parent: [CombatKnife, BaseSecurityCargoContraband] + id: SW14SurvivalKnife + description: Weapon of first and last resort for combatting sand carp. + components: + - type: Sprite + sprite: _Sidewinder/Objects/Weapons/Melee/survival_knife.rsi + state: icon + - type: Item + sprite: _Sidewinder/Objects/Weapons/Melee/survival_knife.rsi + +- type: entity + name: machete + parent: [CombatKnife, BaseSecurityCargoContraband] + id: SW14Machete + description: A huge Knife, almost a Sword! + components: + - type: Sprite + sprite: _Sidewinder/Objects/Weapons/Melee/machete.rsi + state: icon + - type: Item + sprite: _Sidewinder/Objects/Weapons/Melee/machete.rsi + - type: DamageOtherOnHit + damage: + types: + Slash: 14 + - type: Tool + qualities: + - Rolling + speedModifier: 0.75 \ No newline at end of file diff --git a/Resources/Prototypes/_Sidewinder/tags.yml b/Resources/Prototypes/_Sidewinder/tags.yml index b514d94e96..99a3ecd40a 100644 --- a/Resources/Prototypes/_Sidewinder/tags.yml +++ b/Resources/Prototypes/_Sidewinder/tags.yml @@ -5,6 +5,21 @@ - type: Tag id: Prybar +- type: Tag + id: SW14BaseballBat + +- type: Tag + id: SW14Cleaver + +- type: Tag + id: SW14CombatKnife + +- type: Tag + id: SW14KitchenKnife + +- type: Tag + id: SW14SurvivalKnife + - type: Tag id: SWMop diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-1.png index e9d7a95189..1d759ab7f5 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-1.png and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-2.png index 745b1b6087..90edc9f1a9 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-2.png and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-3.png index 7b1add8aba..07b954a276 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-3.png and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-4.png index 102c82b37c..490b27f28f 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-4.png and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-5.png index 019f5e700a..3038dd3a7e 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-5.png and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon.png index 12ea1fd9e1..15673bfa60 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_empty.png index ecdaec3e51..11dd744ea9 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_empty.png and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_open.png index 55f7440f97..186905d281 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json index 960293f615..01dddbfb4e 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json @@ -1,20 +1,22 @@ { "version": 1, - "size": { + "size": + { "x": 32, "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", - "states": [ + "copyright": "Sprites by icepicked on Discord for Sidewinder", + "states": + [ { "name": "icon" }, { - "name": "icon_open" + "name": "icon_empty" }, { - "name": "icon_empty" + "name": "icon_open" }, { "name": "fill-1" diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-1.png index 1f619fbaa5..014544e550 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-1.png and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-2.png index 8822751720..014544e550 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-2.png and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-3.png index 6d10fc3f83..39d835e83f 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-3.png and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-4.png index aa9bafc579..6492c7acfb 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-4.png and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-5.png index 6cf2364cfd..f6917557dc 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-5.png and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon.png index 08afa947be..2d69f8a12a 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon_empty.png index 435165699c..a3b7f61eef 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon_empty.png and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon_open.png index b187507165..a161ac3f3b 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json index 960293f615..fad116550b 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "copyright": "Sprites by icepicked on Discord for Sidewinder", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/icon.png index 0267a69709..186905d281 100644 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/icon.png and b/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/meta.json index db0ac608ed..ce01f0f29a 100644 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Sprites by icepicked on Discord for Sidewinder", "states": [{"name": "icon"}]} diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/icon.png index 05d0e0330f..a161ac3f3b 100644 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/icon.png and b/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/meta.json index db0ac608ed..ce01f0f29a 100644 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Sprites by icepicked on Discord for Sidewinder", "states": [{"name": "icon"}]} diff --git a/Resources/Textures/Objects/Fun/caps.rsi/base.png b/Resources/Textures/Objects/Fun/caps.rsi/base.png index 4ba33eff44..296e898652 100644 Binary files a/Resources/Textures/Objects/Fun/caps.rsi/base.png and b/Resources/Textures/Objects/Fun/caps.rsi/base.png differ diff --git a/Resources/Textures/Objects/Fun/caps.rsi/icon.png b/Resources/Textures/Objects/Fun/caps.rsi/icon.png index 6f711170be..7f157c4b0d 100644 Binary files a/Resources/Textures/Objects/Fun/caps.rsi/icon.png and b/Resources/Textures/Objects/Fun/caps.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base.png index 3ae7bd7d4a..286b85c4fa 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/icon.png index 614847a56d..e80686553f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json index a94453eb74..aa7ed1f557 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, Base and Icon moon clips by icepicked on Discord.", "states": [ { "name": "base" diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base.png index 4ba33eff44..296e898652 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json index 89bc20ad9a..bef923ed5b 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from and modified https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "copyright": "Taken from and modified https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi, base by icepicked on Discord.", "states": [ { "name": "base" diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/equipped-BACKPACK.png index b09e803ed6..9bedf3d87d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/inhand-left.png index 2ed02fb5a5..edf24e341e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/inhand-right.png index c281a19870..255c4e5ef8 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/meta.json index 71e01e8b14..e2eeed1e54 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "tgstation at a373b4cb08298523d40acc14f9c390a0c403fc31, equipped-BACKPACK and wielded sprites added by mirrorcult", + "copyright": "tgstation at a373b4cb08298523d40acc14f9c390a0c403fc31, equipped-BACKPACK and wielded sprites added by mirrorcult, Modified by icepicked on Discord.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/unwielded-arrow.png b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/unwielded-arrow.png index d1417b707f..a75fe8a85c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/unwielded-arrow.png and b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/unwielded-arrow.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/unwielded.png b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/unwielded.png index c5dc00243c..a55763bd47 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/unwielded.png and b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/unwielded.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-arrow.png b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-arrow.png index 69419f9a7b..0334fa8624 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-arrow.png and b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-arrow.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-inhand-left.png index 75a9329f70..f39a28492c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-inhand-right.png index 87451fed6c..04969d6d08 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded.png b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded.png index 41d15ef89a..9a56b608e6 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded.png and b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/inhand-left.png index 668bed84d1..d31183da39 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/inhand-right.png index 42e1ebc3a6..e6b77009ce 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json index f5f474b960..ea93e24c5b 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "tgstation at a373b4cb08298523d40acc14f9c390a0c403fc31, sprites modified and cut into layers by mirrorcult", + "copyright": "tgstation at a373b4cb08298523d40acc14f9c390a0c403fc31, sprites modified and cut into layers by mirrorcult, Modified again by icepicked on Discord", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/bolt-open.png index 8cb0656e68..c98d9150fe 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png index c24cda9b0d..5175249db3 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-left.png index 25f53ec7fc..0797c0b8c1 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-right.png index eb631b7356..d971b60e17 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json index 1faecd06b3..a2638ad7ee 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce , https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi", + "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce , https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi, Modified further by icepicked on Discord", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/bolt-open.png index 15c38dcf5b..807cc30619 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/equipped-BELT.png index ed27af7def..814d0d3173 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png index 8c8ede0f81..4ac3b55ba1 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-left.png index def85defae..a4d0580555 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-right.png index 2aa960b949..db82fb5562 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json index 781b1e11b5..0f60db47c0 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce , https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi", + "copyright": "Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce , https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi, Modified by icepicked on Discord.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png index 2d24521008..72e097322d 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png index 9f8ae76c3c..661c8583e7 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png index ce78cfc276..a78c04ed1d 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png index 910dda1a14..29c506c547 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json index 3d83a91ae5..b2e872b4b3 100644 --- a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken and modified by Taral from goonstation at commit https://github.com/goonstation/goonstation/pull/2816/commits/b99c5dff45a6527bbf698bc00f7d24b8ca75a806", + "copyright": "Taken and modified by Taral from goonstation at commit https://github.com/goonstation/goonstation/pull/2816/commits/b99c5dff45a6527bbf698bc00f7d24b8ca75a806, Modified by icepicked on Discord.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png index f928b92fb1..4ca645774e 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png index 65a9442394..873923fc78 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Template/Humanoid/human.png b/Resources/Textures/Template/Humanoid/human.png index bc47dfecef..fe1311447c 100644 Binary files a/Resources/Textures/Template/Humanoid/human.png and b/Resources/Textures/Template/Humanoid/human.png differ diff --git a/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/equipped-BELT.png b/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/equipped-BELT.png new file mode 100644 index 0000000000..eb736551d7 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/icon.png b/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/icon.png new file mode 100644 index 0000000000..c6882154ca Binary files /dev/null and b/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/icon.png differ diff --git a/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/inhand-left.png b/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/inhand-left.png new file mode 100644 index 0000000000..c14678f17b Binary files /dev/null and b/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/inhand-right.png b/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/inhand-right.png new file mode 100644 index 0000000000..12d4bc860d Binary files /dev/null and b/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/meta.json b/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/meta.json new file mode 100644 index 0000000000..1520ff072f --- /dev/null +++ b/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by icepicked on Discord for sidewinder", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/equipped-BELT.png b/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/equipped-BELT.png new file mode 100644 index 0000000000..64223a5a01 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/icon.png b/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/icon.png new file mode 100644 index 0000000000..7a80669c37 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/icon.png differ diff --git a/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/inhand-left.png b/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/inhand-left.png new file mode 100644 index 0000000000..a3fae22a1c Binary files /dev/null and b/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/inhand-right.png b/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/inhand-right.png new file mode 100644 index 0000000000..5097e13cca Binary files /dev/null and b/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/meta.json b/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/meta.json new file mode 100644 index 0000000000..4c25909d0d --- /dev/null +++ b/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by icepicked on Discord for Sidewinder", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..bdee7f10d9 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/icon.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/icon.png new file mode 100644 index 0000000000..e656047532 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/icon.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png new file mode 100644 index 0000000000..492f7bd1a2 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png new file mode 100644 index 0000000000..ffbbe0cc43 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/meta.json b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/meta.json new file mode 100644 index 0000000000..cff50acf87 --- /dev/null +++ b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprites by icepicked on discord for Sidewinder", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-left.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..4dbdbc5359 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-right.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..0b34b7b597 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/butch.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/butch.png new file mode 100644 index 0000000000..99b21075ea Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/butch.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/inhand-left.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/inhand-left.png new file mode 100644 index 0000000000..b6228a4571 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/inhand-right.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/inhand-right.png new file mode 100644 index 0000000000..a48a0630bb Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/meta.json b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/meta.json new file mode 100644 index 0000000000..281e477324 --- /dev/null +++ b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e , Modified by icepicked on discord for Sidewinder", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "butch" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png new file mode 100644 index 0000000000..17e18a38ca Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/icon.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/icon.png new file mode 100644 index 0000000000..df819d5064 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/icon.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png new file mode 100644 index 0000000000..daf7b0feb9 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png new file mode 100644 index 0000000000..a8b83f7e70 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/meta.json b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/meta.json new file mode 100644 index 0000000000..18aaac978d --- /dev/null +++ b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d , Modified by icepicked on discord for Sidewidner", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png new file mode 100644 index 0000000000..fdcc26f3f8 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/icon.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/icon.png new file mode 100644 index 0000000000..27a36f71cc Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/icon.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-left.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-left.png new file mode 100644 index 0000000000..5002808bfa Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-right.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-right.png new file mode 100644 index 0000000000..b0ec965cc5 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json new file mode 100644 index 0000000000..5474c62e10 --- /dev/null +++ b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d , modified by icepicked on discord for Sidewinder", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/icon.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/icon.png new file mode 100644 index 0000000000..396d95e0bd Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/icon.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/inhand-left.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/inhand-left.png new file mode 100644 index 0000000000..19d22845e4 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/inhand-right.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/inhand-right.png new file mode 100644 index 0000000000..53c28c1d5f Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/meta.json b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/meta.json new file mode 100644 index 0000000000..9c4f387ef4 --- /dev/null +++ b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprites by icepicked on discord for Sidewinder", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/equipped-BELT.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/equipped-BELT.png new file mode 100644 index 0000000000..8a37bd40fc Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/icon.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/icon.png new file mode 100644 index 0000000000..1be627f4f1 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/icon.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png new file mode 100644 index 0000000000..abc97dd737 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png new file mode 100644 index 0000000000..7c82805619 Binary files /dev/null and b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/meta.json b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/meta.json new file mode 100644 index 0000000000..ce3fb75fc5 --- /dev/null +++ b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by icepicked on discord for Sidewinder", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +}