Commit Graph

1390 Commits

Author SHA1 Message Date
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
Atermonera
ef7568a6ae Merge pull request #6154 from Mechoid/Sif_Tree_Expansion
Sif Trees and Icon Scaling
2019-05-28 09:21:22 -08:00
Mechoid
4429fd7ecb Sif Animal Expansion 1 (#6038)
* Begins work on the Sivian animal expansion.

* Adds the Leech, Shimm, Duck, Raccoon, Frostfly, Glitterfly, and Kururak.

* Changelog.

* FixFix

* Fix possible slur, fix leech.

* Fixfix2
2019-05-21 16:57:34 -07:00
Mechoid
20ba94d209 Makes sif trees pretty. Also, scale can now be adjusted in the X axis and Y axis separately. 2019-05-05 14:23:44 -07:00
Mechoid
234af8bc9e Multi-Tile movement, and a shuttle mechanized vehicle to use it. 2019-04-20 00:33:04 -07:00
Neerti
1afbe8d4b0 Explorer Update - Cataloguers (#6016)
* Explorer catalog scanners.
2019-03-30 13:18:15 -07:00
Screemonster
15bfadce37 Unpicks some mining spaghetti (#5978)
* Untangle xenoarch from mining somewhat

* professionalism

* sonic jackhammers only for artefact-safe tunnelling

* destroy artefacts code disabled on everything
2019-03-12 19:00:19 -05:00
Anewbe
aade8c356f Items are now assumed to be conductive, rather than the opposite 2019-03-02 20:34:49 -06:00
Neerti
1aea21ed8a Refactors arcing projectiles to use the new pixel system. 2019-02-20 02:25:51 -05:00
Mechoid
c322392fca Makes aiming more clear. 2019-02-12 13:10:11 -08:00
Anewbe
a23982d960 Merge pull request #5950 from Neerti/turret_fix
Fixes turrets, AI shooting, and makes mob AI shooting a little smarter.
2019-02-11 22:06:11 -06:00
Neerti
a91fe1e9a5 Fixes turrets and makes mob AI shooting a little smarter. 2019-02-10 23:30:58 -05:00
Mechoid
be47785e34 I shouldn't do math at 2 AM 2019-02-08 22:24:34 -08:00
Mechoid
7d90ecf05e Fix a div 0. 2019-02-07 21:21:27 -08: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
Neerti
e1343ac521 Merge pull request #5918 from kevinz000/pp_fix_1
[READY] Fixes pixel projectiles critical bugs
2019-02-01 18:00:03 -05:00
kevinz000
9e662e8982 stuff 2019-01-31 21:45:02 -08:00
kevinz000
0e45e20923 stuff 2019-01-31 21:01:44 -08: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
5d914afefc fixes 2019-01-17 18:50:39 -08:00
kevinz000
8b2b1675ac Travis 2019-01-16 08:16:00 -08:00
kevinz000
0f4b976d43 Merge remote-tracking branch 'polaris/master' into pixel_projectiles 2019-01-16 08:13:58 -08:00
Neerti
a44764d308 Merge pull request #5823 from Anewbe/egun_stun
Egun stun beams are weaker
2019-01-13 00:28:35 -05:00
Anewbe
57cfb7d5ef Egun stun beams are weaker 2019-01-10 15:47:57 -06:00
kevinz000
7053dbad27 Merge remote-tracking branch 'polaris/master' into pixel_projectiles 2019-01-10 10:26:59 -08:00
Anewbe
2713ad77f7 Guns should once again let people know that they've been fired 2019-01-07 20:35:39 -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
0bed005cda fix 2018-12-23 19:59:21 -08:00
kevinz000
e408250296 Merge remote-tracking branch 'polaris/master' into pixel_projectiles 2018-12-23 11:31:48 -08:00
kevinz000
a4b2b7c871 stuff 2018-12-23 02:34:45 -08:00
Mechoid
f167a0ebb8 Drop the number of shots of normal and sec-xeno tasers back down to 5. 2018-12-20 15:56:13 -08:00
Mechoid
a428fad5e8 Event / Future PoI / Other weaponry & tools. (#5764)
* Starts work on New gear

* Solidify New Gear Post-Testing

* Fix non-meter energy weapons not using their normal power supply.

* Fixfix
2018-12-15 20:11:10 -08:00
kevinz000
90e3dd4cc8 Merge remote-tracking branch 'polaris/master' into pixel_projectiles 2018-12-10 15:54:00 -08:00
kevinz000
ab3f30b28f Merge remote-tracking branch 'polaris/master' into PS_PORT_SCHEDULER 2018-12-09 20:34:39 -08:00
kevinz000
c2c688c4c8 caps 2018-12-06 18:34:37 -08:00
kevinz000
d15f7efa5b Merge branch 'master' into PS_PORT_SCHEDULER 2018-12-06 18:10:48 -08:00
Atermonera
8f946a39b4 Merge pull request #5760 from Anewbe/bioacid
Adds BIOACID damage type
2018-12-06 13:19:05 -08:00
kevinz000
8da11c17a2 Makes math helpers defines for performance (#5654) 2018-12-06 13:13:59 -08:00
kevinz000
a52c341861 Merge remote-tracking branch 'polaris/master' into PS_PORT_SCHEDULER 2018-12-06 10:20:46 -08:00
Anewbe
4b7bc616df Adds BIOACID damage type 2018-12-05 01:41:42 -06:00
Atermonera
23cd3e8d5e Merge pull request #5736 from SpadesNeil/pistol-ammo-fixes
Fixes missing hollow point ammo for 9mm
2018-11-30 21:27:20 -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
Neerti
c97c3e7391 Removes simple_animal entirely. 2018-10-24 05:20:59 -04:00