From: āda Date: Tue, 16 Dec 2025 01:30:20 +0000 (-0600) Subject: Remove unused tags tied to unused entities (#41366) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=49743515ee03fc6b97b768f39d62aec9aa605a5a;p=space-station-14.git Remove unused tags tied to unused entities (#41366) * commit * fix for haunted * not a magazine * unused sprites * the lost tags --------- Co-authored-by: iaada --- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index 1d7380bb9d..adc3b373d4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -70,16 +70,6 @@ # once it would say bloated, turn into the rotten prototype stage: 1 -# bruh -- type: Tag - id: Raw - -- type: Tag - id: Cooked - -- type: Tag - id: Cutlet - # Raw - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml index ff26c3c15a..02468697db 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml @@ -1,54 +1,23 @@ - type: entity abstract: true parent: [ BaseItem, BaseSecurityContraband ] - id: BaseMagazineCaselessRifle - name: "magazine (.25 caseless)" - components: - - type: Tag - tags: - - MagazineCaselessRifle - - type: BallisticAmmoProvider - mayTransfer: true - whitelist: - tags: - - CartridgeCaselessRifle - proto: CartridgeCaselessRifle - capacity: 30 - - type: Item - size: Small - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 2 - zeroVisible: false - - type: Appearance - -- type: entity - abstract: true - parent: BaseMagazineCaselessRifle id: BaseMagazinePistolCaselessRifle name: "pistol magazine (.25 caseless)" components: - type: Tag tags: - - MagazinePistolCaselessRifle + - MagazinePistolCaselessRifle - type: BallisticAmmoProvider whitelist: tags: - - CartridgeCaselessRifle + - CartridgeCaselessRifle proto: CartridgeCaselessRifle capacity: 10 - type: Item size: Small + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi layers: @@ -68,20 +37,6 @@ name: "pistol magazine (.25 caseless)" description: 10-round magazine for the Cobra pistol. Intended to hold general-purpose kinetic ammunition. components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifle - capacity: 10 - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 6 - zeroVisible: false - - type: Appearance - type: Item inhandVisuals: left: @@ -96,58 +51,6 @@ name: "pistol magazine (.25 caseless practice)" description: 10-round magazine for the Cobra pistol. Intended to hold harmless practice ammunition. components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRiflePractice - capacity: 10 - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#dbdbdb" - - type: MagazineVisuals - magState: mag - steps: 6 - zeroVisible: false - - type: Appearance - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#dbdbdb" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#dbdbdb" - -- type: entity - parent: BaseMagazineCaselessRifle - id: MagazineCaselessRifle - name: "magazine (.25 caseless)" - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifle - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - right: - - state: inhand-right-mag - -- type: entity - parent: BaseMagazineCaselessRifle - id: MagazineCaselessRiflePractice - name: "magazine (.25 caseless practice)" - components: - type: BallisticAmmoProvider proto: CartridgeCaselessRiflePractice - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml deleted file mode 100644 index c3c8e01504..0000000000 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml +++ /dev/null @@ -1,28 +0,0 @@ -- type: entity - abstract: true - parent: [ BaseItem, BaseSecurityContraband ] - id: BaseMagazineHeavyRifle - name: "magazine (.20 rifle)" - components: - - type: Tag - tags: - - MagazineHeavyRifle - - type: Item - size: Small - - type: BallisticAmmoProvider - mayTransfer: true - capacity: 100 - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 2 - zeroVisible: false - - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml deleted file mode 100644 index 5174b6a3b1..0000000000 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml +++ /dev/null @@ -1,59 +0,0 @@ -- type: entity - abstract: true - parent: [ BaseItem, BaseSecurityContraband ] - id: BaseSpeedLoaderPistol - name: "speed loader (.35 auto)" - components: - - type: Tag - tags: - - SpeedLoaderPistol - - type: SpeedLoader - - type: BallisticAmmoProvider - whitelist: - tags: - - CartridgePistol - capacity: 6 - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - ents: [] - -- type: entity - parent: BaseSpeedLoaderPistol - id: SpeedLoaderPistol - name: "speed loader (.35 auto)" - components: - - type: BallisticAmmoProvider - proto: CartridgePistol - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: base-6 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: base - steps: 7 - zeroVisible: false - - type: Appearance - -- type: entity - parent: BaseSpeedLoaderPistol - id: SpeedLoaderPistolPractice - name: "speed loader (.35 auto practice)" - components: - - type: BallisticAmmoProvider - proto: CartridgePistolPractice - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: practice-6 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: practice - steps: 7 - zeroVisible: false - - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml index cd1f220c0f..748d734c1a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml @@ -4,15 +4,12 @@ name: "speed loader (.30 rifle)" description: 5-round 'stripper clip' for quickly reloading the Kardashev-Mosin. Intended to hold general-purpose kinetic ammunition. components: - - type: Tag - tags: - - SpeedLoaderRifle - type: SpeedLoader - type: BallisticAmmoProvider mayTransfer: true whitelist: tags: - - CartridgeLightRifle + - CartridgeLightRifle capacity: 5 proto: CartridgeLightRifle - type: Sprite diff --git a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml index a9c3671c33..5706b802a5 100644 --- a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml +++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml @@ -112,11 +112,6 @@ - type: BatteryDischarger - type: Anchorable -- type: entity - parent: BaseSMES - id: DebugSMES - suffix: DEBUG, Empty - - type: entity parent: BaseSMES id: DebugSMESRecharging @@ -125,11 +120,6 @@ - type: BatterySelfRecharger autoRechargeRate: 50000 -- type: entity - parent: BaseSubstation - id: DebugSubstation - suffix: DEBUG, Empty - - type: entity parent: BaseSubstation id: DebugSubstationRecharging @@ -138,11 +128,6 @@ - type: BatterySelfRecharger autoRechargeRate: 50000 -- type: entity - parent: BaseSubstationWall - id: DebugSubstationWall - suffix: DEBUG, Empty - - type: entity parent: BaseSubstationWall id: DebugSubstationWallRecharging @@ -151,11 +136,6 @@ - type: BatterySelfRecharger autoRechargeRate: 50000 -- type: entity - parent: BaseAPC - id: DebugAPC - suffix: DEBUG, Empty - - type: entity parent: BaseAPC id: DebugAPCRecharging diff --git a/Resources/Prototypes/Entities/Structures/base_structure.yml b/Resources/Prototypes/Entities/Structures/base_structure.yml index d4936c859c..99c5c62b4e 100644 --- a/Resources/Prototypes/Entities/Structures/base_structure.yml +++ b/Resources/Prototypes/Entities/Structures/base_structure.yml @@ -64,6 +64,3 @@ components: - type: TileFrictionModifier modifier: 0.4 - -- type: Tag - id: Structure diff --git a/Resources/Prototypes/Procedural/dungeon_configs.yml b/Resources/Prototypes/Procedural/dungeon_configs.yml index 5da9592995..18d50ec6cd 100644 --- a/Resources/Prototypes/Procedural/dungeon_configs.yml +++ b/Resources/Prototypes/Procedural/dungeon_configs.yml @@ -79,6 +79,9 @@ id: Haunted layers: - !type:PrefabDunGen + roomWhitelist: + tags: + - Haunted presets: - Bucket - Wow diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 1ad47eb84c..a1e01a14a6 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -357,6 +357,9 @@ - type: Tag id: ConveyorAssembly # ConstructionGraph: ConveyorGraph +- type: Tag + id: Cooked # MetamorphRecipe: FoodBurgerCheese, FoodBurgerChicken, FoodBurgerCrab, FoodBurgerDuck + - type: Tag id: CoordinatesDisk # Storage whitelist: DiskCase @@ -441,6 +444,9 @@ - type: Tag id: CubanCarp # CargoBounty: BountyCubanCarp +- type: Tag + id: Cutlet # MetamorphRecipe: FoodBurgerCheese, FoodBurgerChicken, FoodBurgerDuck + ## D ## - type: Tag # Exists on diagonal walls and windows @@ -712,7 +718,7 @@ id: HardsuitSpatio # ConstructionGraph: HardsuitGoliath - type: Tag # Used on DungeonRoom prototypes. - id: Haunted # Unused. Exists on various DungeonRoomPrototypes in haunted.yml, presumably for an unimplemented PrefabDunGen whitelist. + id: Haunted # PrefabDunGen whitelist on Haunted DungeonConfig. - type: Tag id: Head # ConstructionGraph: RitualSeat @@ -861,18 +867,12 @@ # Entities tagged with the following are some sort of gun magazine. Guns whitelist their storage using these tags. # Tagged entities always have BallisticAmmoProviderComponent. -- type: Tag - id: MagazineCaselessRifle # Unused (Exists on BaseMagazineCaselessRifle) - - type: Tag id: MagazineDebug # WeaponPistolDebug - type: Tag id: MagazineGrenade # ShuttleGunDuster -- type: Tag - id: MagazineHeavyRifle # Unused (Exists on BaseMagazineHeavyRifle) - - type: Tag id: MagazineLightRifle # WeaponRifleAk @@ -1172,6 +1172,9 @@ id: Radio # Storage whitelist: BaseClothingBeltEngineering, ClothingBeltMedical, ClothingBeltSecurity. # CargoBounty: BountyRadio. ConstructionGraph: HudMedSec +- type: Tag + id: Raw # MaterialStorage whitelist: Sheetifier + - type: Tag id: RawMaterial # MaterialStorage whitelist for many machines and lathes. Storage whitelist: MaterialBag @@ -1319,12 +1322,6 @@ - type: Tag id: SpeedLoaderMagnum # Ammo: BaseWeaponRevolver, XenoArtifactGun -- type: Tag - id: SpeedLoaderPistol # Unused (Exists on BaseSpeedLoaderPistol) - -- type: Tag - id: SpeedLoaderRifle # Unused (Exists on SpeedLoaderLightRifle) - - type: Tag id: SpiderCraft # Used on various ConstructionPrototypes to create exclusive recipes for tagged entity. @@ -1356,6 +1353,9 @@ - type: Tag id: StringInstrument # MachineBoard construction: DawInstrumentMachineCircuitboard +- type: Tag + id: Structure # # Targeting whitelist: HandLabeler + - type: Tag id: StunImmune # Tagged mob entity cannot gain the stunned status effect. Blacklist on StatusEffectStunned. diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/base.png deleted file mode 100644 index 1108df2138..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-mag.png deleted file mode 100644 index 5d6f6c492d..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-mag.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-stripe.png deleted file mode 100644 index 90827282ba..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-left-stripe.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-mag.png deleted file mode 100644 index 358681f235..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-mag.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-stripe.png deleted file mode 100644 index c762e9a79f..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/inhand-right-stripe.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-1.png deleted file mode 100644 index 54bf062641..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json deleted file mode 100644 index 6c00eec2ad..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)", - "states": [ - { - "name": "base" - }, - { - "name": "stripe" - }, - { - "name": "mag-1" - }, - { - "name": "inhand-left-mag", - "directions": 4 - }, - { - "name": "inhand-left-stripe", - "directions": 4 - }, - { - "name": "inhand-right-mag", - "directions": 4 - }, - { - "name": "inhand-right-stripe", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png deleted file mode 100644 index 779465c927..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/base.png deleted file mode 100644 index 29e6c7d6bd..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-mag.png deleted file mode 100644 index ea1d7dcd79..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-mag.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-stripe.png deleted file mode 100644 index 8b6a3807cb..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-left-stripe.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-mag.png deleted file mode 100644 index 7319d495f2..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-mag.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-stripe.png deleted file mode 100644 index 1a6a8562e5..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/inhand-right-stripe.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/mag-1.png deleted file mode 100644 index f67c10605d..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json deleted file mode 100644 index 12c196b4b4..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (github)", - "states": [ - { - "name": "base" - }, - { - "name": "stripe" - }, - { - "name": "mag-1" - }, - { - "name": "inhand-left-mag", - "directions": 4 - }, - { - "name": "inhand-left-stripe", - "directions": 4 - }, - { - "name": "inhand-right-mag", - "directions": 4 - }, - { - "name": "inhand-right-stripe", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/stripe.png deleted file mode 100644 index e18b4b6892..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/stripe.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-1.png deleted file mode 100644 index c6e9efefaa..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-2.png deleted file mode 100644 index abf7ec8ff7..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-3.png deleted file mode 100644 index cf69b60ef7..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-4.png deleted file mode 100644 index e11b89d444..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-5.png deleted file mode 100644 index 6509054779..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-6.png deleted file mode 100644 index c874cf1d02..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-6.png and /dev/null differ 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 deleted file mode 100644 index 4ba33eff44..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-left.png deleted file mode 100644 index c8d3a33b8d..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-right.png deleted file mode 100644 index 8fe331202f..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/inhand-right.png and /dev/null 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 deleted file mode 100644 index e5a0d8d203..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "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, inhands by TiniestShark", - "states": [ - { - "name": "base" - }, - { - "name": "base-1" - }, - { - "name": "base-2" - }, - { - "name": "base-3" - }, - { - "name": "base-4" - }, - { - "name": "base-5" - }, - { - "name": "base-6" - }, - { - "name": "practice-1" - }, - { - "name": "practice-2" - }, - { - "name": "practice-3" - }, - { - "name": "practice-4" - }, - { - "name": "practice-5" - }, - { - "name": "practice-6" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-1.png deleted file mode 100644 index 735dc30b25..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-2.png deleted file mode 100644 index 42e830647e..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-3.png deleted file mode 100644 index c3b62aa99b..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-4.png deleted file mode 100644 index b049201465..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-5.png deleted file mode 100644 index 7d544186ee..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-6.png deleted file mode 100644 index a0bec08901..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-6.png and /dev/null differ diff --git a/Resources/migration.yml b/Resources/migration.yml index ac85a102ef..d5059b3a22 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -55,7 +55,7 @@ MagazineBoxLightRifleHighVelocity: MagazineBoxLightRifle MagazineBoxMagnumHighVelocity: MagazineBoxMagnum MagazineBoxPistolHighVelocity: MagazineBoxPistol MagazineBoxRifleHighVelocity: MagazineBoxRifle -MagazineCaselessRifleHighVelocity: MagazineCaselessRifle +MagazineCaselessRifleHighVelocity: MagazinePistolCaselessRifle MagazineCaselessRifleShortHighVelocity: null MagazineLightRifleHighVelocity: MagazineLightRifle MagazineMagnumSubMachineGunHighVelocity: null @@ -65,7 +65,7 @@ MagazinePistolHighVelocity: MagazinePistol MagazinePistolSubMachineGunHighVelocity: MagazinePistolSubMachineGun MagazineRifleHighVelocity: MagazineRifle SpeedLoaderMagnumHighVelocity: SpeedLoaderMagnum -SpeedLoaderPistolHighVelocity: SpeedLoaderPistol +SpeedLoaderPistolHighVelocity: null # 2023-08-07 #If the name is anything to go off of, these are presumably just CEV-Eris versions of the snow rock (which we already have.) @@ -305,9 +305,9 @@ MagazineMagnumRubber: MagazineMagnum MagazineMagnumSubMachineGunRubber: null MagazineLightRifleRubber: MagazineLightRifle MagazineRifleRubber: MagazineRifle -MagazineCaselessRifleRubber: MagazineCaselessRifle +MagazineCaselessRifleRubber: MagazinePistolCaselessRifle MagazineCaselessRifleShortRubber: null -SpeedLoaderPistolRubber: SpeedLoaderPistol +SpeedLoaderPistolRubber: null SpeedLoaderMagnumRubber: SpeedLoaderMagnum MagazineBoxPistolRubber: MagazineBoxPistol # RIP box of magnum rubbers 202X to 2024 @@ -738,6 +738,16 @@ ToySkeleton: ToyFigurineSkeleton # 2025-10-28 DrinkKiraSpecial: DrinkOrangeLimeSodaGlass +# 2025-11-08 +DebugSMES: SMESBasicEmpty +DebugSubstation: SubstationBasicEmpty +DebugSubstationWall: BaseSubstationWall +DebugAPC: BaseAPC +MagazineCaselessRifle: MagazinePistolCaselessRifle +MagazineCaselessRiflePractice: MagazinePistolCaselessRiflePractice +SpeedLoaderPistol: null +SpeedLoaderPistolPractice: null + # 2025-12-05 GlowstickBase: GlowstickGreen