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-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,300 Commits 55 Branches 0 Tags
4c55e86da74fc48a34a5019e73c63a67be44f86d
Commit Graph

62 Commits

Author SHA1 Message Date
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
kevinz000
19072abe37 compile 2020-05-08 23:01:05 -07:00
kevinz000
6d6239a8b4 kay 2020-05-08 22:59:51 -07:00
kevinz000
e684c6e574 ok 2020-05-08 22:40:07 -07:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
TrilbySpaceClone
2cd59a6fb0 that was easy 2020-04-06 08:40:34 -04:00
necromanceranne
a4313ee101 Nerfs scattershot, removes it from nukie uplink, buffs bioterror dart slugs, includes them into nukie uplink (#11675) 2020-03-29 17:45:01 +02:00
necromanceranne
02a8104c3b Makes taserslugs actually tasers, makes mech scattershot not a oneshot (#11671) 2020-03-29 17:19:27 +02:00
necromanceranne
6f0fc2bdea I LOVE YOU KITCHEN GUN! 2020-03-17 03:20:53 +11:00
Ghommie
4a621fb1aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560 2020-02-14 19:39:53 +01:00
Ghom
78ace8e855 Merge pull request #10916 from Citadel-Station-13/kevinz000-patch-6 
Projectiles now always hit chest if targeting chest, snipers now have 100% targeting zone accuracy
 2020-02-14 19:20:32 +01:00
Hatterhat
1d071ff127 one off 2020-02-10 21:40:51 -06:00
Hatterhat
d24afcde1b pb burst from 60 to 81 2020-02-09 19:07:24 -06:00
Ghommie
0703c6eea6 First tweak to cargo reagents selling. 2020-02-06 22:34:54 +01:00
kevinz000
3d7fef76f3 Update sniper.dm 2020-02-05 05:57:16 -07:00
Ghommie
a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. 2020-02-03 05:16:32 +01:00
Ghommie
02fbbd4f95 Ouch. 2020-01-12 16:54:08 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie
b4c0433d6d more work. 2019-12-27 17:45:19 +01:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
kevinz000
dfa2296758 Merge pull request #9430 from Ghommie/Ghommie-cit220 
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
 2019-11-14 15:44:59 -07:00
Ghommie
42d9e3cf51 Porting Robustin's Syndicate Infiltrator PR 2019-11-11 18:49:18 +01:00
Ghommie
b17346a44e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220 2019-10-30 14:46:42 +01:00
kevinz000
9d78d8a259 Merge branch 'master' into magrifles_again 2019-10-23 17:57:19 -07:00
kevinz000
c6c2a703e5 Merge remote-tracking branch 'origin/master' into magrifles_again 2019-10-21 00:47:03 -07:00
Ghommie
5232728ee7 Ports "Adds three new .38 ammo types", also lazily adding .357 AP 2019-10-07 05:25:47 +02:00
Poojawa
f57bdc39a2 I still fucking hate components. 2019-09-23 02:03:37 -05:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
Tupinambis
3b2be43bd8 Slightly increased rubbershot damage from 12.5 to 15 per pellet. 2019-08-27 18:35:08 -05:00
Tupinambis
13638ed5d6 Reverts some changes I deemed unneccesary. Undoes a fuckup 2019-08-26 15:08:36 -05:00
Tupinambis
a4fd2be7f7 Various Shotgun Nerfs. 2019-08-26 14:45:12 -05:00
Poojawa
23333f6ea5 reverts the majority of clean act because it doesn't work properly otherwise 2019-08-20 23:03:31 -05:00
Poojawa
0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
kevinz000
69f06444e6 smgs 2019-07-09 08:20:45 -07:00
Thalpy
1cc0724519 Merge branch 'master' into Dwarf 2019-06-17 12:09:55 +01:00
Fermi
17403bd059 Non-functioning EMP code for review (revert before merging.) 2019-06-13 00:58:54 +01:00
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
Fermi
b6788cdd64 Updated projectile sprite. 2019-06-08 01:45:32 +01:00
Fermi
42d0ab4825 Comment cleanup. 2019-06-08 01:31:21 +01:00
Ghommie
7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Fermi
2888e1b30b Dartgun functions as intended. 2019-06-07 00:12:11 +01:00
Fermi
1a42c017ac DEBUG 2019-06-06 23:23:53 +01:00
Trilbyspaceclone
da67bdf63d >_> 2019-06-04 12:40:29 -04:00
Fermi
fd22dbfc0d More fixes. Need to check over merging math. 2019-06-02 03:59:52 +01:00
Fermi
0fa445c153 Fixes and test. 2019-06-02 03:24:01 +01:00
Trilbyspaceclone
ddfe9812a1 Update shotgun.dm 2019-05-31 16:06:26 -04:00
Poojawa
971ddef989 reverts forensics components. If I can't figure it out, MURDER IT 2019-05-22 04:10:29 -05: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
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