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
47,209 Commits 55 Branches 0 Tags
062cbaed29362a0edd80f5908cb68b9feee47c72
Commit Graph

208 Commits

Author SHA1 Message Date
Hatterhat
2155a8bdce funny ammo 2022-08-03 06:11:04 -05:00
SandPoot
695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Putnam3145
1e01852b93 Merge pull request #15320 from shellspeed1/working-on-new-fancy-syringe-guns 
Improvements to the reagent gun and brand new smart dart repeater. [Ready]
 2021-11-17 17:09:23 -08:00
shellspeed1
329336f5ed Update code/modules/projectiles/ammunition/special/syringe.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:19:06 -08:00
shellspeed1
47da4007f7 Update code/modules/projectiles/ammunition/special/syringe.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:18:04 -08:00
shellspeed1
142b74ed5d Update code/modules/projectiles/ammunition/special/syringe.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:15:07 -08:00
shellspeed1
580e398e38 minor bug fix, also inhand sprites 2021-11-04 02:33:12 -07:00
shellspeed1
973d471dd4 woopsie 2021-10-31 05:04:08 -07:00
shellspeed1
026ce5dec4 tiny bit more polish, some number tweaks, and research. 2021-10-31 04:18:15 -07:00
shellspeed1
f148eb0a4c minor cleanup 2021-10-31 03:24:24 -07:00
shellspeed1
7166ead8bd Uses vial as chem pool. 2021-10-31 01:28:49 -07:00
shellspeed1
fb7d2a8ef3 smart dart initial 2021-10-30 19:35:09 -07:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
Hatterhat
1d005db9a8 THE YEEHAW UPDATE 2021-09-30 23:10:33 -05:00
silicons
2192d8a87e Merge pull request #14817 from zeroisthebiggay/endit 
[READY] tempgun rebalance (it's not a nerf don't worry)
 2021-08-02 17:11:20 -07:00
silicons
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
zerothebigboy
fa738856bf i need a nap 2021-06-10 03:22:34 -04:00
silicons
716c2a04e4 Merge pull request #14160 from keronshb/motivation 
Adds a new traitor item, Motivation (Part 1)
 2021-06-09 11:10:17 -07:00
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
silicons
d4529b1bf3 Merge pull request #14651 from WanderingFox95/WanderingFox95-ReagentDartgunRebalance 
The reagent dart gun uplink item needed work.
 2021-04-28 21:17:36 -06:00
silicons
1585d1c2be fixes 2021-04-26 23:32:33 -07:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
WanderingFox95
4e0bf12c0c Modifies dart size and properties 
They inject less but pierce again
 2021-04-23 23:15:40 +02:00
keronshb
20c190c17d Merge remote-tracking branch 'upstream/master' into motivation 2021-04-14 17:55:24 -04:00
The0bserver
1d31fb084f More concealment, fixes a problem with the .45-70 2021-04-11 19:40:54 -04:00
The0bserver
55eb445a07 Adds Derringers (Code) Initial Commit 2021-04-11 04:20:12 -04:00
silicons
15dd80a085 less awful 2021-03-20 13:39:59 -07:00
silicons
70b8d833c0 changes 2021-02-28 00:00:14 -07:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
keronshb
a4e933185e Merge remote-tracking branch 'origin/master' into motivation 2021-01-29 09:29:55 -05:00
keronshb
a2833ea85f Movitation WIP 
WIP still working on this
 2021-01-26 13:27:06 -05:00
silicons
a1e92e55aa Merge pull request #14102 from Hatterhat/somatobuff-50513 
[READY] somatoray buff - mutation locks + revolution ray
 2021-01-25 23:17:29 -07:00
Letter N
021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
Hatterhat
e006587f4b today i will not test my code 2021-01-19 17:24:33 -06:00
DeltaFire
1e8e1ec72b Merge pull request #13786 from kiwedespars/why 
x-ray laser nerfs
 2020-12-19 05:28:43 +01:00
kiwedespars
98c3335dce doubles xray laser cost, 20 -> 10 shots 2020-12-15 21:04:10 -08:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
Trilbyspaceclone
c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
silicons
d35cba095f Merge pull request #13108 from Hatterhat/357-dumdum 
.357 DumDum Rounds (they're adminspawn only don't worry)
 2020-08-17 08:58:00 -07:00
Trilbyspaceclone
1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04:00
Hatterhat
8370a31942 funny adminspawn wound bullets 2020-08-10 12:12:32 -05:00
Timothy Teakettle
2153f9ea35 i too, want people to be hit their ricochets 2020-08-03 17:36:40 +01:00
Trilbyspaceclone
e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
Timothy Teakettle
9b34407c9f uplink 2020-08-03 15:27:17 +01:00
Timothy Teakettle
2bbe4631d6 working ricochets 2020-08-03 14:46:24 +01:00
Timothy Teakettle
0bf9553eca hmm 2020-08-02 19:13:39 +01:00