Skip to content

Commit

Permalink
[MIRROR] Laser Carbine sprite and sound improvement [MDB IGNORE] (#24…
Browse files Browse the repository at this point in the history
…305)

* Laser Carbine sprite and sound improvement (#78831)

## About The Pull Request
Changes the laser carbine sprite and makes the orange laser sprite
brighter (the laser carbine shot orange lasers from the start). Changes
the laser2.ogg to a new sound that is now used by the laser carbine (can
be heard in the video):

https://github.com/tgstation/tgstation/assets/42353186/cfaff327-335f-4e6b-9773-b1ce62600212

**NEW SPRITE:**
![laser carbine
big](https://github.com/tgstation/tgstation/assets/42353186/5e0b1c90-527c-47ae-9747-7f833a84c880)

**OLD SPRITE:**
![old
carbine](https://github.com/tgstation/tgstation/assets/42353186/5d2eb35c-9ddb-49db-99b3-e1631a1db8dd)
## Why It's Good For The Game
The laser carbine sprite must be improved, as in the original PR people
wanted it to be "polished" so I did it. Polished the sprite without
changing the core design.

![image](https://github.com/tgstation/tgstation/assets/42353186/0c6f73a3-0dd0-4ba5-9cf8-dd34cade2fd1)

New sounds give it a unique sound to distinguish it from other guns,
it's also less noise-polluting than normal laser gun sound which is long
and too beefy for a 10-burn damage gun.
## Changelog
:cl:
sound: laser2.ogg sound has been changed. Now laser carbine uses it.
image: Laser carbine and orange laser sprite have been improved.
/:cl:

* Laser Carbine sprite and sound improvement

---------

Co-authored-by: DrTuxedo <[email protected]>
  • Loading branch information
2 people authored and Iajret committed Oct 13, 2023
1 parent 3ab93db commit 5a86fc4
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions code/modules/projectiles/ammunition/energy/laser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
projectile_type = /obj/projectile/beam/laser/carbine
e_cost = 25 // 40 shots
select_name = "kill"
fire_sound = 'sound/weapons/laser2.ogg'

/obj/item/ammo_casing/energy/lasergun/old
projectile_type = /obj/projectile/beam/laser
Expand Down
Binary file modified icons/obj/weapons/guns/energy.dmi
Binary file not shown.
Binary file modified icons/obj/weapons/guns/projectiles.dmi
Binary file not shown.
5 changes: 5 additions & 0 deletions sound/attributions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,8 @@ https://freesound.org/people/reelworldstudio/sounds/161122/

arcade_jump.ogg is adapted from se2001's "8-Bit Jump 3", which is public domain (CC 0):
hhttps://freesound.org/people/se2001/sounds/528568/

laser2.ogg is adapted with 3 SFX made by junggle (CC 4), inferno (CC Sampling+), humanoide9000 (CC 0):
https://freesound.org/people/junggle/sounds/28917/
https://freesound.org/people/inferno/sounds/18397/
https://freesound.org/people/humanoide9000/sounds/330293/
Binary file modified sound/weapons/laser2.ogg
Binary file not shown.

0 comments on commit 5a86fc4

Please sign in to comment.