cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-01-29 10:22:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,116 Commits 55 Branches 0 Tags
231da023ec9c073f1644172794de8ef2dc43017e
Commit Graph

472 Commits

Author SHA1 Message Date
kevinz000
2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35 
Ports in the container_type to reagents flags refactor.
 2019-06-08 01:26:28 -07:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
kevinz000
487461fbda Merge pull request #8500 from Trilbyspaceclone/patch-158 
Buffs stun slugs
 2019-06-08 01:09:00 -07:00
deathride58
7fcb46e0f6 Merge pull request #8468 from Citadel-Station-13/kevinz000-patch-41 
buffs disabler 20-->25 shots firerate 2.5/s --> 3.33/s speed 412.5-->471.5 pixels/s
 2019-06-08 01:09:52 -04:00
Ghommie
7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
kevinz000
0d97361dea Merge pull request #8430 from Trilbyspaceclone/bad_idea 
Adds improvised 7.62 rifle
 2019-06-05 11:31:10 -07:00
Trilbyspaceclone
da67bdf63d >_> 2019-06-04 12:40:29 -04:00
Trilbyspaceclone
ddfe9812a1 Update shotgun.dm 2019-05-31 16:06:26 -04:00
Ghommie
85ab988842 0, null, and "", all fulfill the ! operator. 2019-05-30 20:09:19 +02:00
kevinz000
031779a944 32 --> 25 2019-05-27 14:28:17 -07:00
kevinz000
6ed955ddde Update beams.dm 2019-05-27 14:25:45 -07:00
kevinz000
4913f332c7 Update stun.dm 2019-05-27 14:23:29 -07:00
Trilbyspaceclone
1b48db693f Update shotgun.dm 2019-05-27 02:42:46 -04:00
Trilbyspaceclone
61605443b5 Update rifle.dm 2019-05-24 22:18:53 -04:00
Trilbyspaceclone
f5d4135fe9 Update automatic.dm 2019-05-24 22:14:17 -04:00
Trilbyspaceclone
5b6f324993 Update shotgun.dm 2019-05-24 22:13:16 -04:00
deathride58
f3116baa08 Merge pull request #8253 from Citadel-Station-13/kevinz000-patch-37 
Removes firing pins from preprinted gravity guns
 2019-05-21 08:04:26 -04:00
Trilbyspaceclone
150db880de Update laser.dm 2019-05-01 16:07:11 -04:00
Trilbyspaceclone
fd251d3dd2 Update laser.dm 2019-05-01 15:15:29 -04:00
kevinz000
cbc0607086 Merge pull request #8290 from Trilbyspaceclone/Laser_gun_adv 
Readds Laser carbines.
 2019-04-30 05:31:33 -07:00
Trilbyspaceclone
aabba13648 Update shotgun.dm 2019-04-26 20:34:47 -04:00
Trilbyspaceclone
b4bdc9bc1d Update laser.dm 2019-04-26 00:47:21 -04:00
kevinz000
0e863d7daf Update special.dm 2019-04-16 22:42:36 -07:00
deathride58
09f77d0438 Nerfs dinks - Ballistic projectiles are now the only projectiles that can emit a dink 2019-03-18 23:02:07 -04:00
kevinz000
d681b30df5 Merge pull request #8102 from Trilbyspaceclone/semi-auto 
Fixes ever case I can fine of WT-550 Auto Rifle being called Auto Rifle and not Semi-Auto - SMG
 2019-03-10 13:44:57 -07:00
Trilbyspaceclone
5aa5f1ed56 SMG 2019-03-09 20:29:19 -05:00
Trilbyspaceclone
8f9542bc43 Update automatic.dm 2019-03-09 20:05:07 -05:00
nik707
a89ab006c1 Adds new and immersive sound for combat 
Dink!
 2019-03-05 15:03:08 -06:00
Ghommie
e9e9075800 unironically applying Kev's suggestion 2019-03-03 01:09:16 +01:00
kevinz000
317dc309a0 Merge pull request #8024 from deathride58/bloodybloodbloodblood 
Atomizes the med rework's blood effect changes (most things that make a blood effect will now make you actually lose blood) and makes the blood reagent act more like you'd expect
 2019-02-27 16:03:56 -08:00
Ghom
704d7403ac Tweaking some cyborg mounted energy guns. (#8037) 
* You get yourself a bottle and say, "I don't love anything anymore."

* the sunset.

* I'm nuclear gun, I'm wild.
 2019-02-27 16:02:33 -08:00
deathride58
19035c4450 fixes zooming guns being plausible even if you aren't holding the gun in any of your hands (#8012) 2019-02-22 06:01:48 -08:00
deathride58
a386632c8a travis is a travesty 2019-02-20 04:04:23 -05:00
deathride58
20740bda39 a bloody fun time - atomizes the med rework's blood effect changes and makes the blood reagent act more like you'd expect 2019-02-20 00:38:23 -05:00
deathride58
7db87db43a fancier throws, fancier bullet casings, fancier window destruction, fancier bottle smashing (#7997) 2019-02-13 21:02:00 -08:00
deathride58
7b00195c0c reduces stamloss for shotgun pumping from 5 to 2 (#7973) 2019-02-05 18:15:31 -08:00
BlackMajor
454f672e34 Why isn't the compact shotgun compact 
-Changes the wardens compact combat shotgun to fit in backpacks.

No really, a sawed off riot shotgun fits in a backpack and holds more ammo. Any Warden worth their salt just swaps shotguns, you'd think a "Compact" shotgun would be able to fit much the same considering the lower ammo count.
 2019-01-16 19:54:58 +13:00
deathride58
a877e796d4 Merge pull request #7890 from Ragolution/endrapen 
Suicide Messages, Combat Messages, Uniforms Recovered
 2019-01-14 21:39:02 -05:00
Ragolution
e390f37998 Adjusts wording for grammar on cryo shotgun dart 
Travis is fucking bullying me.
 2019-01-04 07:36:32 -05:00
Ragolution
5f019696bd Spellcheck 2 Electric Boogaloo 
statis

Misspelling of status.
 2019-01-04 06:52:57 -05:00
deathride58
2d01ac3604 Merge pull request #7868 from Citadel-Station-13/kevinz000-patch-4 
fixes neurotoxin properly
 2019-01-03 07:47:34 -05:00
Trilbyspaceclone
21f111b5e0 [Ready] New mech weapon, Melon Seed Scatter shot! - Requested and helped made by Elllsiy (#7873) 
* Fixing updater

* Adds the gunthingy

* makes the bullet

* Update mecha_designs.dm

* Update all_nodes.dm

* Fixes stam harm
 2019-01-03 04:38:10 -08:00
Trilbyspaceclone
1f1c5b3710 [Ready] Adds in a scatter shot Bulldog drum! (#7863) 
* Fixing updater

* adds the ammo

* Update uplink_items.dm

* Update shotgun.dm

* Update uplink_items.dm
 2018-12-31 03:11:44 -08:00
kevinz000
5c3eb5b00e Update neurotoxin.dm 2018-12-30 22:22:45 -08:00
kevinz000
96b4171044 Update neurotoxin.dm 2018-12-24 01:52:08 -08:00
Ignari-Coldstorm
9c16527cd4 Mining Vendor and PPKA changes! (#7817) 
* Mining Vendor and PPKA changes!

Adjusted the prices on a couple items as well as added in the pocket extinguisher to the vendor. Adjusted the Premium Proto-Kinetic Accelerator to have one less range.

* Update machine_vending.dm
 2018-12-16 03:56:21 -08:00
kevinz000
6ba2d56435 Update neurotoxin.dm 2018-12-08 04:14:36 -08:00
deathride58
6c5694ce0c Merge pull request #7780 from Ignari-Coldstorm/Premium-KPA 
Adds a new PKA to the mining Vendor
 2018-12-03 11:20:37 -05:00
Ignari_Coldstorm
55517ae329 Adds a new PKA to the mining Vendor 
Miners are always going and saying that they amass so many points while mining, yet nothing is worthwhile enough to buy with said points so they sit there wasted usually. This adds a new premium Kinetic Accelerator with stronger base stats, meanwhile it costs 8K mining points. Will later be adding premium edition of Kinetic crusher. Ideal goal is to encourage miners to mine enough ore for station to get this gear before they go out to hunt for real.
 2018-11-30 20:18:49 -06:00