diff --git a/Resources/Maps/packedstation.yml b/Resources/Maps/packedstation.yml index 5e065b8dc8..96bbadd4a9 100644 --- a/Resources/Maps/packedstation.yml +++ b/Resources/Maps/packedstation.yml @@ -87665,7 +87665,7 @@ entities: - color: '#0000FFFF' type: AtmosPipeColor - uid: 9229 - type: LaserSecGun + type: LaserRifleCog components: - pos: 41.526512,27.667274 parent: 0 @@ -109560,7 +109560,7 @@ entities: - canCollide: False type: Physics - uid: 11192 - type: LaserSecGun + type: LaserRifleCog components: - pos: 41.526512,27.4329 parent: 0 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 3af39fcf6b..ccc75b79de 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -102,7 +102,7 @@ size: 24 sprite: Objects/Weapons/Guns/Battery/svalinn.rsi - type: BatteryBarrel - fireCost: 20 + fireCost: 25 - type: entity name: cog laser carbine @@ -123,7 +123,7 @@ size: 24 sprite: Objects/Weapons/Guns/Battery/cog.rsi - type: BatteryBarrel - fireCost: 10 + fireCost: 12 - type: entity name: laser cannon @@ -247,35 +247,3 @@ magState: mag steps: 5 zeroVisible: true - -- type: entity - name: laser gun - parent: BatteryGunBase - id: LaserSecGun - description: A laser gun. - components: - - type: Sprite - netsync: false - sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi - layers: - - state: base - map: ["enum.RangedBarrelVisualLayers.Base"] - - state: mag-unshaded-4 - map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] - shader: unshaded - - type: Item - size: 24 - sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi - - type: BatteryBarrel - minAngle: 1 - fireRate: 6 - cellSlot: - ejectOnUse: true - insertSound: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg - soundOptions: - volume: -2 - startingItem: PowerCellMediumStandard - whitelist: - components: - - Battery diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png deleted file mode 100644 index 43d8242338..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png deleted file mode 100644 index ff7a8709f8..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-left.png deleted file mode 100644 index 6dae4d7646..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-right.png deleted file mode 100644 index b3d6103648..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png deleted file mode 100644 index 43de02d5af..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png deleted file mode 100644 index 3e6690995b..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png deleted file mode 100644 index 197a0cac69..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png deleted file mode 100644 index 3f7c3289dd..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json deleted file mode 100644 index f405b7d296..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/3b42532472e7cc1e65bba9d166c27ab6f7ea89b5", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -}