diff --git a/Resources/Prototypes/Entities/Weapons.yml b/Resources/Prototypes/Entities/Weapons.yml index 243e24a1cf..21ca07414d 100644 --- a/Resources/Prototypes/Entities/Weapons.yml +++ b/Resources/Prototypes/Entities/Weapons.yml @@ -1,30 +1,39 @@ - type: entity - name: "LASER" + name: Laser Gun parent: BaseItem id: LaserItem description: A weapon using light amplified by the stimulated emission of radiation components: - type: Sprite - texture: Objects/gun.png + sprite: Objects/laser_retro.rsi + state: 100 - type: Icon - texture: Objects/gun.png + sprite: Objects/laser_retro.rsi + state: 100 - type: HitscanWeapon - type: Item Size: 24 + sprite: Objects/laser_retro.rsi + prefix: 100 + - type: entity - name: GUN + name: C-20r Sub Machine Gun parent: BaseItem id: GUNITEM description: A rooty tooty point and shooty components: - type: Sprite - texture: Objects/projectileweapon.png + sprite: Objects/c20r.rsi + state: c20r-20 - type: Icon - texture: Objects/projectileweapon.png + sprite: Objects/c20r.rsi + state: c20r-20 - type: ProjectileWeapon - type: Item Size: 24 + sprite: Objects/c20r.rsi + - type: entity name: Spear diff --git a/Resources/Textures/Objects/c20r.rsi/c20r-0.png b/Resources/Textures/Objects/c20r.rsi/c20r-0.png new file mode 100644 index 0000000000..7acd1397bf Binary files /dev/null and b/Resources/Textures/Objects/c20r.rsi/c20r-0.png differ diff --git a/Resources/Textures/Objects/c20r.rsi/c20r-12.png b/Resources/Textures/Objects/c20r.rsi/c20r-12.png new file mode 100644 index 0000000000..90c4a68509 Binary files /dev/null and b/Resources/Textures/Objects/c20r.rsi/c20r-12.png differ diff --git a/Resources/Textures/Objects/c20r.rsi/c20r-16.png b/Resources/Textures/Objects/c20r.rsi/c20r-16.png new file mode 100644 index 0000000000..a3ecf32636 Binary files /dev/null and b/Resources/Textures/Objects/c20r.rsi/c20r-16.png differ diff --git a/Resources/Textures/Objects/c20r.rsi/c20r-20.png b/Resources/Textures/Objects/c20r.rsi/c20r-20.png new file mode 100644 index 0000000000..426af2d4d7 Binary files /dev/null and b/Resources/Textures/Objects/c20r.rsi/c20r-20.png differ diff --git a/Resources/Textures/Objects/c20r.rsi/c20r-4.png b/Resources/Textures/Objects/c20r.rsi/c20r-4.png new file mode 100644 index 0000000000..29a2fde1f2 Binary files /dev/null and b/Resources/Textures/Objects/c20r.rsi/c20r-4.png differ diff --git a/Resources/Textures/Objects/c20r.rsi/c20r-8.png b/Resources/Textures/Objects/c20r.rsi/c20r-8.png new file mode 100644 index 0000000000..a0acaf09f6 Binary files /dev/null and b/Resources/Textures/Objects/c20r.rsi/c20r-8.png differ diff --git a/Resources/Textures/Objects/c20r.rsi/c20r.png b/Resources/Textures/Objects/c20r.rsi/c20r.png new file mode 100644 index 0000000000..16fb3a3b6f Binary files /dev/null and b/Resources/Textures/Objects/c20r.rsi/c20r.png differ diff --git a/Resources/Textures/Objects/c20r.rsi/inhand-left.png b/Resources/Textures/Objects/c20r.rsi/inhand-left.png new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/c20r.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/c20r.rsi/inhand-right.png b/Resources/Textures/Objects/c20r.rsi/inhand-right.png new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/c20r.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/c20r.rsi/meta.json b/Resources/Textures/Objects/c20r.rsi/meta.json new file mode 100644 index 0000000000..02ca7aea30 --- /dev/null +++ b/Resources/Textures/Objects/c20r.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "c20r", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-0", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-12", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-16", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-20", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-4", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-8", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/laser_retro.rsi/0-inhand-left.png b/Resources/Textures/Objects/laser_retro.rsi/0-inhand-left.png new file mode 100644 index 0000000000..8034a208f5 Binary files /dev/null and b/Resources/Textures/Objects/laser_retro.rsi/0-inhand-left.png differ diff --git a/Resources/Textures/Objects/laser_retro.rsi/0-inhand-right.png b/Resources/Textures/Objects/laser_retro.rsi/0-inhand-right.png new file mode 100644 index 0000000000..7e0ecad858 Binary files /dev/null and b/Resources/Textures/Objects/laser_retro.rsi/0-inhand-right.png differ diff --git a/Resources/Textures/Objects/laser_retro.rsi/0.png b/Resources/Textures/Objects/laser_retro.rsi/0.png new file mode 100644 index 0000000000..22ac15a8ab Binary files /dev/null and b/Resources/Textures/Objects/laser_retro.rsi/0.png differ diff --git a/Resources/Textures/Objects/laser_retro.rsi/100-inhand-left.png b/Resources/Textures/Objects/laser_retro.rsi/100-inhand-left.png new file mode 100644 index 0000000000..181ab3d177 Binary files /dev/null and b/Resources/Textures/Objects/laser_retro.rsi/100-inhand-left.png differ diff --git a/Resources/Textures/Objects/laser_retro.rsi/100-inhand-right.png b/Resources/Textures/Objects/laser_retro.rsi/100-inhand-right.png new file mode 100644 index 0000000000..00c19292a9 Binary files /dev/null and b/Resources/Textures/Objects/laser_retro.rsi/100-inhand-right.png differ diff --git a/Resources/Textures/Objects/laser_retro.rsi/100.png b/Resources/Textures/Objects/laser_retro.rsi/100.png new file mode 100644 index 0000000000..8a12221de3 Binary files /dev/null and b/Resources/Textures/Objects/laser_retro.rsi/100.png differ diff --git a/Resources/Textures/Objects/laser_retro.rsi/25-inhand-left.png b/Resources/Textures/Objects/laser_retro.rsi/25-inhand-left.png new file mode 100644 index 0000000000..0283834d40 Binary files /dev/null and b/Resources/Textures/Objects/laser_retro.rsi/25-inhand-left.png differ diff --git a/Resources/Textures/Objects/laser_retro.rsi/25-inhand-right.png b/Resources/Textures/Objects/laser_retro.rsi/25-inhand-right.png new file mode 100644 index 0000000000..bcca0e8a02 Binary files /dev/null and b/Resources/Textures/Objects/laser_retro.rsi/25-inhand-right.png differ diff --git a/Resources/Textures/Objects/laser_retro.rsi/25.png b/Resources/Textures/Objects/laser_retro.rsi/25.png new file mode 100644 index 0000000000..d93e4c6138 Binary files /dev/null and b/Resources/Textures/Objects/laser_retro.rsi/25.png differ diff --git a/Resources/Textures/Objects/laser_retro.rsi/50-inhand-left.png b/Resources/Textures/Objects/laser_retro.rsi/50-inhand-left.png new file mode 100644 index 0000000000..56cd96ebd4 Binary files /dev/null and b/Resources/Textures/Objects/laser_retro.rsi/50-inhand-left.png differ diff --git a/Resources/Textures/Objects/laser_retro.rsi/50-inhand-right.png b/Resources/Textures/Objects/laser_retro.rsi/50-inhand-right.png new file mode 100644 index 0000000000..4d0a453d38 Binary files /dev/null and b/Resources/Textures/Objects/laser_retro.rsi/50-inhand-right.png differ diff --git a/Resources/Textures/Objects/laser_retro.rsi/50.png b/Resources/Textures/Objects/laser_retro.rsi/50.png new file mode 100644 index 0000000000..9d29d82911 Binary files /dev/null and b/Resources/Textures/Objects/laser_retro.rsi/50.png differ diff --git a/Resources/Textures/Objects/laser_retro.rsi/75-inhand-left.png b/Resources/Textures/Objects/laser_retro.rsi/75-inhand-left.png new file mode 100644 index 0000000000..181ab3d177 Binary files /dev/null and b/Resources/Textures/Objects/laser_retro.rsi/75-inhand-left.png differ diff --git a/Resources/Textures/Objects/laser_retro.rsi/75-inhand-right.png b/Resources/Textures/Objects/laser_retro.rsi/75-inhand-right.png new file mode 100644 index 0000000000..00c19292a9 Binary files /dev/null and b/Resources/Textures/Objects/laser_retro.rsi/75-inhand-right.png differ diff --git a/Resources/Textures/Objects/laser_retro.rsi/75.png b/Resources/Textures/Objects/laser_retro.rsi/75.png new file mode 100644 index 0000000000..67d7cdd75d Binary files /dev/null and b/Resources/Textures/Objects/laser_retro.rsi/75.png differ diff --git a/Resources/Textures/Objects/laser_retro.rsi/meta.json b/Resources/Textures/Objects/laser_retro.rsi/meta.json new file mode 100644 index 0000000000..149e54c660 --- /dev/null +++ b/Resources/Textures/Objects/laser_retro.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "0", "directions": 1, "delays": [[1.0]]}, {"name": "0-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "0-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "100", "directions": 1, "delays": [[1.0]]}, {"name": "100-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "100-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "25", "directions": 1, "delays": [[1.0]]}, {"name": "25-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "25-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "50", "directions": 1, "delays": [[1.0]]}, {"name": "50-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "50-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "75", "directions": 1, "delays": [[1.0]]}, {"name": "75-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "75-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file