Commit Graph

311 Commits

Author SHA1 Message Date
Kates
2c63372a49 Improve gun animations to be more modular. (#7645)
* Improve gun animations to be more modular.
- This is a port of TGCM pull/4807. Credit to SplinterGP for helping me set things up.
- It essentially allows people to not need a '-pump' for their animation, but instead to just use whatever they please. They just need to write it down at the relevant intervals.

* Improve further.

* Update shotgun.dm
2020-09-20 03:49:03 -07:00
Cerebulon
4474f3f713 Flavour Enhancement: Guns (#7333)
* Flavour Lore: Guns

* New guns/sprites, crates, etc.

* couple o oversights fixed

* couple o oversights fixed

* final tweekz
2020-07-13 20:04:59 -07:00
Aronai Sieyes
ad75bb86bd Alter playsound paradigm 2020-05-19 11:06:28 -04:00
Mechoid
aafd4b4fa6 Explorer Expansion: New Horizons (#6960)
* Large amount of work; Animal taming, shearing. Random animal spawns on sif grass/forest turfs. New PoIs, thermal poncho.

* Combat drone DMI moved to drones folder. Mining Drone subtype added. "Tameable" with ores, will collect and store ores when not in active combat.
2020-05-01 11:19:21 -07:00
Aronai Sieyes
6c6644f86c Rewrite examine() to pass a list around (#7038) 2020-04-29 13:42:16 -07:00
Unknown
3973fbf0ec I forgot to add this 2020-04-11 23:38:45 -04:00
Unknown
e551141313 Dual-wield Penalties and Urist Gun Sprites
- Reenables Dual Wielding penalties on most heavy guns.
- Adds wielded sprites for all weapons with dual-wield penalties.
- Ports a ton of gun sprites from Urist McStation
- Removes mention of requires_two_hands in code since that is not used anymore.
2020-04-11 23:35:24 -04:00
Unknown
665a2f45bf Sniper Rifle QOL
- Adds Action Buttons for Sniper Rifles

I have been thinking of a very mild buff to the LWAP, mainly because the Laser Cannon does far more damage and is more portable, and the Laser Rifle has much more shots and has swappable cells.

But for now just going with this QOL Tweak.
2020-03-29 21:15:15 -04:00
Mechoid
c7ba2a8e4b Antag Uplink Expansion (#6788)
* Adds Energy Daggerpens, Thieves gloves and Buzzer Ring.

* Updoot

* fixfix weakfire

* Extra Touches

* chlgongog

* Fix antag injector cases.
2020-03-16 21:21:41 -07:00
Arokha Sieyes
5b15917d32 to_chat replacing stream operator 2020-02-17 13:14:08 -05:00
ElectricB1ue
e9cc7c71ea Adds two new alternate sprites for the detective's revolver. (#6230)
* Adds the sprites

* This should do things.
2019-06-28 20:22:19 -05:00
Anewbe
aade8c356f Items are now assumed to be conductive, rather than the opposite 2019-03-02 20:34:49 -06:00
Spades
8355717e3b Introduces caseless ammo, and a caseless rifle (#5886)
* Icon changes

* Introduces caseless ammunition

* Deletes unused icons, adds G11

Deletes these icons:
- lemat_old
- staffofchange
- barretsniper and barretsniper-empty
- noisecannon (old sprite)

* Magazine capacity nerf, removes stun mags

* Revert "Magazine capacity nerf, removes stun mags"

This reverts commit 411f4e024b.

* Removes references to G11, because it's not one

* I lied. *Now* they're renamed.

* Icon changes

* Icon changes, again

* Merge my icon changes you fuck
2019-02-06 23:35:08 -06:00
Spades
d78f94e88d Changes (R&D made) Saber SMG to Advanced SMG (#5881)
* Changes Saber SMG to Advanced SMG

* Updates protolathe descriptions

* Eh, I'll just include the icon changes now.

I'll fix conflicts with other PRs manually.

* Merges auto shotgun sprite
2019-01-31 18:57:47 -06:00
Spades
99ee197085 Unfucks Vintage Rifle (#5877)
* Unfucks Vintage Rifle

I'm going to slap whoever copypasted this blindly.

Also this really shouldn't be 7.62/.308 but hurr durr out of scope
¯\_(ツ)_/¯

* Apparently I'm going crazy and the icon was fine

* Ammo naming consistency
2019-01-27 15:04:11 -06:00
Anewbe
68eb0a4bb1 Merge pull request #5906 from SpadesNeil/auto-shotgun-replacement
Gives the auto shotgun a new sprite
2019-01-27 14:59:04 -06:00
Spades
f145cd539e Gives the auto shotgun a new sprite
I didn't like the old one so here's a new one.
2019-01-26 15:37:57 -05:00
Neerti
9ff8103153 Merge pull request #5636 from kevinz000/pixel_projectiles
[READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work
2019-01-26 04:25:17 -05:00
Spades
4e873524f5 Tommygun now Tommy Gun (#5875)
* Tommygun now Tommy Gun

https://github.com/PolarisSS13/Polaris/pull/5837

* Corrects sprite names

I figure this can stay as it is.
2019-01-22 22:21:30 -06:00
kevinz000
1315bfff2c Merge remote-tracking branch 'polaris/master' into pixel_projectiles 2019-01-06 23:12:48 -08:00
Spades
81c3036140 Guns sounds refactor and improvements (#5803)
* Gun sound updates

Grenade Launcher sound source:
https://freesound.org/people/LeMudCrab/sounds/163458/

* Actually, this is a better way to handle this.

* Fixed accidental inconsistent indentation

* Renames shotgun.ogg to Gunshot_shotgun.ogg

Also actually changes the file names like I was supposed to last night.

* *peers* Didn't I just fix this shit?

* Actually fixes the missing files this time

* Update audible_deception.dm

* Changed tungsten core projectile sound by request

* Actually no this line is stupid and makes me angry

Simplifies dumb code that was badly copypasted.

Also fixed missing D'eagle fire_sound

* Smarter code

Less copypasta, more runtimes prevented in case somebody decides to make
a soundless gun whether done intentionally or not.

* Update gun.dm
2019-01-06 18:27:24 -08:00
kevinz000
90e3dd4cc8 Merge remote-tracking branch 'polaris/master' into pixel_projectiles 2018-12-10 15:54:00 -08:00
kevinz000
50838a76f2 Evreything works but timers 2018-10-14 10:47:27 -07:00
lbnesquik
d14b45ea06 Add an animated rifle.
Nothing is particularly impressive except the animation.
2018-10-01 22:19:32 +02:00
lbnesquik
7b5b214ebb Shotgun cycling animation framework
This adds the possiblity for empty sprites on all shotgun/pump/thing and for cycling animations.
https://cdn.discordapp.com/attachments/407267031562453032/488751327531368481/2018-09-10_18-43-05.gif
This particular weapon was made by a friend so i'll wait for their permission before porting it in.
2018-10-01 15:26:22 +02:00
Anewbe
17a5010f44 Signal pistol can be reloaded (#5566) 2018-09-16 17:23:39 -07:00
Anewbe
ee48151135 Adds smart magazine, magazine functionality 2018-08-21 17:10:40 -05:00
Kates
535cca9d0e Saber fix. (#5384)
* Saber fix.

* Saber fix 2: Electric boogaloo

* parenthèse

* "And another one"

* Actually fixes the indentation

* Balance revert
2018-07-10 23:49:11 -05:00
Woodratt
c32bcf785a PoI Stage 0.5
Doing this in smaller bits

- New random sif mob selector, peaceful animals
- Drone lootpile (basic placeholder loot right now until we figure out how to give them proper drone loot)
- New random spider mob selector, nurse spider and nurse hat spider (hat spider has 10 more health points and is a rare chance to spawn, woo)
- New spacesuit random spawn, medical space suits
- New Random Shotgun spawn
- New random gun spawns
- Fixed icon for random medicine spawn
- Fixed broken icon for 44 magazines
- Fixed Ice Cave dungeon walls being called 'steel'
- Added new Crystal type, to avoid the SM style crystal from spawning in crystal PoIs
2018-04-25 22:11:30 -07:00
Woodratt
32860140b4 44 revolvers
Port from Bay

- Addition of two more revolvers in 44 cal for variety
- Creation of rubber rounds for 44 cal (stats taken from virgo no idea how good they are in actual fights)
- Includes 44 ammo speedloaders, regular and rubber speedloaders
- Slight adjustments to allow for firing animations taken from Bay (the mosley revolver has a firing animation that plays)
- Includes in hand sprites

We did already have the 'webley' sprite (it exists in a recolored sprite). However it is a alternate sprite for the detective's 45 revolver. This brings it in as a actual proper revolver with sprites that are different than the detectives revolver, and maybe in the future can be thrown into loot lists and PoIs.
2018-03-26 14:33:43 -07:00
Anewbe
153009e03c Ports more two-handed gun sprites from Bay 2018-02-21 01:57:56 -06:00
Anewbe
534a588a6a Gun changes (#4185)
* Various background gun changes

* Forgot to include the sounds, woops

* Fixes some more gun stuff

* Makes the cham gun work again
2018-02-12 23:12:14 -08:00
Anewbe
442b5cbdf6 Comments out the automatic firemode code (#4748) 2018-02-07 09:59:42 -08:00
Andromeda-K22
58cf8000ba Automatic firemode for guns (#4730)
* New gun firemode: automatic

Full-auto destruction at the tip of your fingers! If you're an admin. Switch the automatic var to 1 to make any gun automatic.

This code is largely donated by Mport and the SS:CM project. Relevant modifcations are located in automatic.dm, special.dm, and automagical.dm

* Removes '/blue's

* Removes a block of pseudocode.

* Welp. Missed some things.

* Automatic removed from the Suppression gun, as requested by @Anewbe in #4730

* Requested changes.
2018-02-06 22:57:53 -06:00
Spades
b441ccd6e3 9mm pistol updates (#4480)
* These aren't supposed to be here!!

* Adds new Security pistol and large capacity magazines

* Removes new pistol from Security spawns

* Removed references of Beretta because it's not one
2018-01-14 14:45:15 -06:00
Anewbe
6e3bbd31c0 Removes the mosin-nagant, moves the sprites 2017-11-22 01:14:14 -06:00
sabess
77e4aa2cf4 fixed a thing 2017-11-07 21:40:00 +11:00
Sabess
c96781499f Allows detectives to take an optional revolver + some other stuff (#4217)
* I'm like 99% sure this works

* uhm

* accidentally broke something after I tested but before I PRed, fixed now
2017-11-05 22:53:11 -06:00
Spades
32c79939b6 More merging updates 2017-09-19 23:58:40 -04:00
Spades
bf771d3d0d Grammar error 2017-09-01 04:46:44 -04:00
Spades
13a83743a3 update_icon 2017-09-01 03:09:32 -04:00
Spades
4cae6368a2 Adds M1 Garand 2017-09-01 03:03:03 -04:00
Anewbe
676fb6daf6 Merge pull request #3694 from SpadesNeil/gun-stuff
Gun stuff. Some fixes, some changes, and a shiny new SVD
2017-08-20 11:21:50 -04:00
Spades
90c55d64da Description changes
- Fixed descriptions lacking what rounds a gun uses.
- Made some descriptions have better grammar.
- Made some descriptions have more interesting fluff.
- AS-24 auto shotgun no longer has a unique description not copied
almost word for word from the assault rifle.
2017-08-09 21:06:29 -04:00
Spades
6b02206adf Sniper Changes and Fixes
- Fixes the heavy sniper hand sprite so it no longer looks like a
pistol. Not ideal, but better.
- Changes energy sniper to use the Z8's hand sprite, because it's more
distinct than looking the same as the laser carbine.
- Adds the SVD back by request of Woodrat. It's not spawnable yet, since
I don't know where you want to balance it.
2017-08-09 21:04:58 -04:00
Spades
b3f6f6b392 Assault rifle tweaks and fixes
- STS-35 no longer has "This one is unmarked" because it literally means
nothing useful.
- Assault Carbine name has been changed to Bullpup Rifle.
- Bullpup Rifle starts with only 10 rounds as opposed to 20, making it
slightly less useful than the Z8 marksman rifle.
- Fixed the Bullpup Rifle not using the correct sprites, hopefully.
- Bullpup Rifle's 3 round burst is nerfed to 2 rounds.
2017-08-07 21:04:25 -04:00
LorenLuke
31e90bfeed Adds Collapsible AM rifle. Createes new uplink entry (#3644)
* Adds Collapsible AM rifle, and adds case with parts and 5 shots to Uplink. Separates it and intended merc version, both costing default telecrystal amount. Does NOT make them antagonist type specific.

* Addresses review.

* Makes rifle case traitor/merc specific. Enables ability to have specific uplink items be available only for specific antags.
2017-07-28 16:06:20 -05:00
Cameron653
97957fcaee Replaces more macros. (#3647)
* MORE MACRO CHANGES

AHHHHHHHHHHHHHHHHHHHH

* Fixes a few typos

* Fixes compile error

* Fixes for real

* 4 macros left that I can't find
2017-07-27 21:12:21 -05:00
Spades
2e776ac645 Changes 5.56mm to 5.45mm, now 20% less stupid
The same as https://github.com/PolarisSS13/Polaris/pull/3612 except this
time I'm not a dumbass and accidentally overwriting other changes
because the Github client decided not to sync with Polaris.
2017-07-19 14:24:50 -04:00
Andromeda-K22
760dce00fa Shotgun additions and minor tweaks (#3554)
* 24-round shotgun mag fixes + making it relevant.

Adds the AS-24 Shotgun to the traitor uplink for 100 TCs, also makes automatic shotgun magazines costs the appropriate amount (13,000 metal up from 2200)

* Magazine variety.

Nothing really new here. Beanbag / pellet mags for the admin-only AS-24.

* shotgun 6-shell clips, autolathe and shotgun tweaks.

+6-shell quickloader clips for shotguns, with proper metal costs for slugs, beanbags and buckshot.

+minor tweak to shotguns to allow the quickloaders to work in a non-silly way (load_method = SINGLE_CASING|SPEEDLOADER) since there are literally no other shotgun speedloaders this probably shouldn't be an issue (as it's ever so slightly quicker than loading with a box)

+added sprites for quickloading clips.

* Requested changes.

-6 round shotgun clip sprites
+4 round shotgun clip sprites
-/+ adjusted shotgun clips to 4 rounds

* cherrypicking

* fixes

did a bad

* literally a number
2017-07-07 15:12:32 -05:00