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 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,057 Commits 55 Branches 0 Tags
b5a16d89453dfb5a2eac04973db3bebf352bbf45
Commit Graph

120 Commits

Author SHA1 Message Date
kevinz000
c6c2a703e5 Merge remote-tracking branch 'origin/master' into magrifles_again 2019-10-21 00:47:03 -07:00
deathride58
50c27df28f Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more 2019-10-15 03:48:44 -04:00
kevinz000
692f2322c0 Merge pull request #8928 from Ghommie/Ghommie-cit121 
Reverts a commit that reverted a fix.
 2019-07-25 17:43:14 -07:00
Ghommie
7065a86841 Revert "Revert "Fixes rocket launchers, buffing their accuracy etc."" 2019-07-19 22:02:22 +02:00
Ghommie
7e99dd205a Fixing Shredder guns not accepting standard flechette mags, and magpistol mag sprites. 2019-07-19 21:54:48 +02:00
kevinz000
28072a31dc Update magweapon.dm 2019-07-13 20:03:39 -07:00
kevinz000
69f06444e6 smgs 2019-07-09 08:20:45 -07:00
kevinz000
a2d52c0ed9 HERE WE GO AGAIN. 2019-07-09 07:55:44 -07:00
Ghommie
9081b5b773 Revert "Fixes rocket launchers, buffing their accuracy etc." 
This reverts commit 1c6156dd0e.
 2019-07-08 07:17:49 +02:00
Ghommie
1c6156dd0e Fixes rocket launchers, buffing their accuracy etc. 2019-07-08 06:56:20 +02:00
Trilbyspaceclone
3bf667ba36 Update magweapon_energy.dm 2019-05-22 12:42:28 -04:00
Trilbyspaceclone
005647d4f6 Update magweapon_energy.dm 2019-05-22 12:12:06 -04:00
kevinz000
90c3e4b776 Merge pull request #8322 from Trilbyspaceclone/patch-117 
Buffs mag-gun recharges speed
 2019-05-11 22:18:29 -07:00
Trilbyspaceclone
dc4aa42525 Update magweapon_energy.dm 2019-05-05 06:35:32 -04:00
kevinz000
0bfac54070 Update magweapon_energy.dm 2019-05-04 23:16:27 -07:00
kevinz000
cbc0607086 Merge pull request #8290 from Trilbyspaceclone/Laser_gun_adv 
Readds Laser carbines.
 2019-04-30 05:31:33 -07:00
Trilbyspaceclone
60a9544a6b Update magweapon_energy.dm 2019-04-29 00:19:47 -04:00
Trilbyspaceclone
4492e60a9f typo 2019-04-29 00:02:53 -04:00
Trilbyspaceclone
5430454c73 Update magweapon.dm 2019-04-28 23:59:29 -04:00
Trilbyspaceclone
d136d95743 Update magweapon.dm 2019-04-28 23:56:39 -04:00
Trilbyspaceclone
b51751dfa8 Update magweapon_energy.dm 2019-04-28 23:38:34 -04:00
Trilbyspaceclone
c5f3f67824 Update magweapon.dm 2019-04-28 23:33:31 -04:00
Trilbyspaceclone
514e15ee6c Update magweapon.dm 2019-04-28 23:32:38 -04:00
Useroth
e51cdf98b2 Fixed the calibers up. 2019-04-29 04:58:26 +02:00
Trilbyspaceclone
22912832d7 Create magweapon_energy.dm 2019-04-28 22:46:50 -04:00
Trilbyspaceclone
bc251b59aa Update magweapon.dm 2019-04-28 22:43:01 -04:00
Trilbyspaceclone
f6bb8b6aef Update magweapon.dm 2019-04-28 22:33:58 -04:00
Trilbyspaceclone
9ff3918ffd Update magweapon.dm 2019-04-28 22:25:19 -04:00
Trilbyspaceclone
ad2cacb59e toys 2019-04-28 22:05:53 -04:00
Trilbyspaceclone
fb7a129ca5 Update magweapon.dm 2019-04-28 21:56:48 -04:00
Trilbyspaceclone
3eeafbb975 Merge branch 'master' into hell 2019-04-28 21:54:55 -04:00
Trilbyspaceclone
bec3cf8967 Update magweapon.dm 2019-04-28 21:24:45 -04:00
Trilbyspaceclone
0fa3fb6aca Update magweapon.dm 2019-04-28 16:46:12 -04:00
Useroth
c59cb823bb Let's try like this. 2019-04-28 21:14:11 +02:00
Trilbyspaceclone
b7b4bf1a61 Update magweapon.dm 2019-04-28 14:51:53 -04:00
Trilbyspaceclone
15a1b2baeb Poojawa pointed this out 2019-04-27 18:56:40 -04:00
Trilbyspaceclone
0b58285b53 5 - > 2 2019-04-11 00:36:31 -04:00
Trilbyspaceclone
02f8f89a79 Update magweapon.dm 2019-04-09 09:52:05 -04:00
Trilbyspaceclone
079dd582b8 Update magweapon.dm 2019-04-09 01:26:32 -04: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
Trilbyspaceclone
a3fd4d496e Fixes WT-550 Toxic ammo 2018-10-21 14:13:24 -04:00
Trilbyspaceclone
9b30150571 Fixing placement and nerfing of Adv Illegal node 2018-09-03 02:32:04 -04:00
Trilbyspaceclone
42c39d8908 Adv illegal ballistic Third times the charm? (#7426) 
* Adds in a new tec node

* Fixes it maybe hopefully?

* MESSES WITH E-SHOTGUNS
If the blaster shotgun is broke then blame me for this

* Perhaps properly adds in the node!

* Meh

* .dm remove

* boop

* NULL

* Readds the files 

missed re-adding them on my fork

* "

"

* Wait maybe if I try this it all works

It has nothing to do with anything and dose not even show me deleting

* Back to square one

...

* X to doubt 

[X]

* huh

* Look back at the past

Look were the error is

* Maybe that bolt action gun is messing with things

* hmm

* I know these two ammos are ok

* m45?

* m45?

* I must be doing this .45 ammo wrong

* Update pistol.dm

* Lets see

* Update all_nodes.dm

* Maybe?

* m9mm

* Lets try that

* so its linked correctly

* Update pistol.dm

* removes some spaces

* Revert "Testing code"
 2018-08-28 02:44:27 -07:00
deathride58
69e1cb5aea nerfs disablers, buffs tasers (#7507) 2018-08-28 02:41:01 -07:00
Trilbyspaceclone
50ced97507 Buffs WT-550 (#7486) 2018-08-23 00:24:11 -07:00
LetterJay
166e6b66de Update toys.dm 2018-08-01 08:41:10 -05:00
LetterJay
77b3c46dbf moves some stuff around 2018-08-01 08:07:56 -05:00
deathride58
914967f081 Merge pull request #7356 from Trilbyspaceclone/WT-550 
Hopefully this will add in the missing WT-550 Toxin Ammo for sec
 2018-07-10 02:03:08 -04:00
TrilbySpaceClone
7f9365e1db Modularized, plz dont yell at me 2018-07-06 17:42:24 -04:00
TrilbySpaceClone
54779cae1d Modularized, plz dont yell at me 2018-07-06 17:37:50 -04:00