diff --git a/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml index f026ba3d01..e6586b1a44 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml @@ -167,7 +167,6 @@ - SmgAtreides - SmgC20r - SmgDrozd - - SmgStraylight - SmgWt550 - SmgZoric chance: 0.95 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 481454a863..5880fd2600 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -160,44 +160,6 @@ steps: 1 zeroVisible: true -- type: entity - name: Straylight - parent: SmgBase - id: SmgStraylight - description: Pla-ket-ket-ket-ket - components: - - type: Sprite - sprite: Objects/Weapons/Guns/SMGs/straylight.rsi - layers: - - state: base - map: ["enum.RangedBarrelVisualLayers.Base"] - - state: bolt-closed - map: ["enum.RangedBarrelVisualLayers.Bolt"] - - state: mag-0 - map: ["enum.RangedBarrelVisualLayers.Mag"] - - type: Icon - sprite: Objects/Weapons/Guns/SMGs/straylight.rsi - - type: Item - size: 24 - sprite: Objects/Weapons/Guns/SMGs/straylight.rsi - - type: RangedWeapon - - type: MagazineBarrel - currentSelector: Automatic - allSelectors: - - Single - - Automatic - fireRate: 10 - caliber: Pistol - magazineTypes: - - Smg - - type: Appearance - visuals: - - type: BarrelBoltVisualizer - - type: MagVisualizer - magState: mag - steps: 1 - zeroVisible: true - - type: entity name: WT550 parent: SmgBase diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/base.png deleted file mode 100644 index 794d4e022b..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/bolt-closed.png deleted file mode 100644 index ce4dd70da4..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/bolt-closed.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/bolt-open.png deleted file mode 100644 index a9d9bc1dc6..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/bolt-open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/icon.png deleted file mode 100644 index 06979e4257..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/inhand-left.png deleted file mode 100644 index 5e69c0449e..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/inhand-right.png deleted file mode 100644 index b410d99e34..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/mag-0.png deleted file mode 100644 index d3cbb7bdd5..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/mag-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/meta.json deleted file mode 100644 index a7200507ee..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/meta.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/straylight.dmi", - "states": [ - { - "name": "icon", - "directions": 1 - }, - { - "name": "base", - "directions": 1 - }, - { - "name": "bolt-closed", - "directions": 1 - }, - { - "name": "bolt-open", - "directions": 1 - }, - { - "name": "mag-0", - "directions": 1 - }, - { - "name": "suppressor", - "directions": 1 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 1 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/suppressor.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/suppressor.png deleted file mode 100644 index 079d5a45d9..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/straylight.rsi/suppressor.png and /dev/null differ