Commit Graph

117 Commits

Author SHA1 Message Date
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
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
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
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
a52c341861 Merge remote-tracking branch 'polaris/master' into PS_PORT_SCHEDULER 2018-12-06 10:20:46 -08:00
Spades
82a9aca463 Wrong category. Moved to correct location. 2018-11-09 19:44:53 -05:00
Spades
002f14a6eb Fixes missing hollow point ammo for 9mm
9mm didn't have HP ammo for some reason, which is dumb, considering HP
ammo makes 9mm not useless while not being overpowered as hell.

All I did was add in the missing projectiles and relevant casings. How
they get implimented if at all is up to another PR.

Also made some notes for later because apparently Polaris is in a
feature freeze so I am not pushing new features, just fixing a missing
one, but I need to remind myself to do this later or remind somebody
else if I forget.
2018-11-09 19:37:15 -05:00
kevinz000
50aa3fa15c Merge remote-tracking branch 'polaris/master' into PS_PORT_SCHEDULER 2018-10-21 21:24:25 -07:00
Kates
46e067d6f5 Magazines improvements (#5666)
* Give sounds to emptying magazines

* Clear some trash in the saber magazines

* The magazine NOW behaves correctly.

* The second half and more casing noises.
2018-10-15 14:52:33 -05:00
kevinz000
2c0898f870 Regex 2018-10-14 20:03:17 -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
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
fea8fcc064 Merge pull request #4310 from Neerti/11/19/2017_hunting_rounds
Adds Hunting Rounds
2017-11-21 00:29:12 -06:00
Neerti
9db34eae86 Adds Hunting Rounds
Adds a system for projectiles to inflict additional damage on specific kinds of simple animals.
Adds special bullets for certain rifles which are very effective against 'animal' SAs such as giant spiders, bears, carp, and such. The bullets do less damage to other targets such as humanoids.
Replaces the southern cross gun locker regular ammo with hunting ammo.
2017-11-19 23:59:17 -05:00
Spades
79d3ee82ab Shotgun clip rebalance
An alternative solution to the problem I highlighted in
https://github.com/PolarisSS13/Polaris/pull/4302

If this is merged, **do not merge**
https://github.com/PolarisSS13/Polaris/pull/4303
2017-11-19 14:08:03 -05: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
mistyLuminescence
ae308a3a91 Reworks cryopod storage 2017-10-20 19:14:45 +01:00
Anewbe
a248a4a4a1 Ports Bay's railguns, and assorted gun sprites 2017-10-02 17:29:24 -05:00
Spades
32c79939b6 More merging updates 2017-09-19 23:58:40 -04:00
Spades
4cae6368a2 Adds M1 Garand 2017-09-01 03:03:03 -04:00
Spades
9ca5b07da0 Might as well fix shotgun clip icons too 2017-08-10 06:39:49 -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
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
Spades
b9798b99da Fixes .44 mag sprite, again
reeeeeeeeeeeeeeeeeeee
2017-07-04 17:49:52 -04:00
Spades
79e192f565 Missed a few things. 2017-06-20 01:04:07 -04:00
Spades
be2a99ca32 Some ammo fixes
- Fixes pirate gun not getting 12g caliber correctly.
- Fixes .357 caliber not being named consistently with everything else.
(Do not merge this until
https://github.com/PolarisSS13/Polaris/pull/3533 is merged pls, unless
Yosh fixes his caliber to be correct also.)
- Changes .50AE ammo to .44 because that's more consistent with what the
gun is capable of in-game, because it uses the same damage values as the
.357 and not a bullet that shoots through through your fridge, through
your house, and hits your neighbor's home invader like a .50AE is IRL.
The fact that it's .44 makes much more sense. This is purely a fluff
change because it annoyed me.
- Fixes a bunch of ammo.dmi icon names and makes the file not a jumbled
fucking mess. This means now your 762 mags and the newly renamed 44 mags
will not be broken anymore.
2017-06-19 23:44:01 -04:00
Spades
3a0bdf5cf9 Name tweak for Anewbe 2017-05-27 16:31:17 -04:00
Spades
cef9c4f98d One last thing. 2017-05-27 16:27:05 -04:00
Spades
ae3d877730 Might be helpful if I clicked save on my files 2017-05-27 16:25:38 -04:00
Spades
36544bc7da Documentation, proper file naming, and more consistency 2017-05-27 16:23:39 -04:00
Spades
bb2f19fe7d Map fixes, and a comment removal 2017-05-27 05:14:51 -04:00
Spades
bc3f4fb0dc Polishing oversights away 2017-05-27 05:07:34 -04:00
Spades
3ff9d441f9 Finishes fixing ammo inconsistencies 2017-05-27 04:39:49 -04:00
Spades
8579adcc53 Naming convention of ammo is now consistent
s = Speedloaders. (Functionally the same as clips, but they're not
_really_ the same thing, just in case we change these later.)
c = Clips. (Can also be used to fill other magazines.)
m = Magazine. (Holds ammo rounds.)
a = Ammo. (Individual rounds of ammo.)
2017-05-26 19:32:23 -04:00
Anewbe
903a2a2e5f Fixes a few things, adds 556 clips 2017-05-12 18:03:49 -05:00
Anewbe
58b9c63ec2 Makes the 556 and 762 calibers more appropriate to their naming 2017-05-01 20:25:43 -05:00
Anewbe
bfb3871ec3 Adds hollowpoint rounds, for bears and such 2017-04-03 18:27:19 -05:00
Anewbe
19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00
Anewbe
be4aa63263 AP bullets 2016-11-15 19:50:28 -06:00
Anewbe
e65b0851f3 Adds emp shotgun shells, not yet obtainable. 2016-09-25 23:52:30 -05:00
Neerti
828dacf485 Centralizes weight class definitions
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
Daranz
c0bfd668bb Rename '12mm' to '10mm' in sprites
Round is already referred to as '10mm' everywhere else.
2016-07-11 05:22:23 +01:00
Spades
e51da6c35b Renamed SVD mag to be consistent per request.
It's just a 10 round 762 magazine. It's compatible with the STS.
2016-06-06 22:03:03 -04:00
Spades
9da3e9bac7 Comment corrections to clear confusion. 2016-06-05 13:18:07 -04:00
Spades
c173d0dbb7 The last commit. 2016-06-03 21:01:53 -04:00