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
25,060 Commits 55 Branches 0 Tags
4aa1d55abbf33a1468d45c946681d73253d37062
Commit Graph

574 Commits

Author SHA1 Message Date
kevinz000
da502aa31d Merge pull request #9535 from Ghommie/Ghommie-cit247 
Fixing sniper rifles scope datum action oddity.
 2019-10-24 19:05:25 -07:00
Ghommie
4c8d7023c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258 2019-10-24 09:50:20 +02:00
deathride58
f85f110baa Merge pull request #9047 from Poojawa/syntheticbloods 
RGB Blood Reworks + Blood generator
 2019-10-23 20:54:55 -04:00
Ghommie
fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
nik707
107bb36253 Merge pull request #9566 from Citadel-Station-13/kevinz000-patch-104 
Fixes neurotoxin stunning non-carbons
 2019-10-22 16:47:53 -05:00
Poojawa
7463bbc001 Merge branch 'master' into syntheticbloods 2019-10-21 21:06:18 -05:00
deathride58
f7cf10853e Merge pull request #8894 from Citadel-Station-13/tgfusion 
T G F U S I O N
 2019-10-21 21:17:16 -04:00
BlackMajor
cebdc1414f Merge pull request #9540 from YakumoChen/laser-minigone 
Reverts #9189 (Laser Minigun)
 2019-10-22 13:36:45 +13:00
Poojawa
6fc750dca0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-21 19:13:19 -05:00
kevinz000
69a125d996 Update neurotoxin.dm 2019-10-21 14:41:40 -07:00
kevinz000
838575da50 Merge pull request #9503 from deathride58/tasernerf 
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
 2019-10-21 00:59:58 -07:00
YakumoChen
e39a087dc8 remove beam 2019-10-20 03:09:32 +00:00
YakumoChen
6a5d1c20bd delete minigun 2019-10-20 03:08:20 +00:00
YakumoChen
61bc735ee7 remove gatling laser 2019-10-20 03:07:23 +00:00
Ghommie
fe71e2984c Fixing sniper rifles scope datum action oddities. 2019-10-19 16:40:01 +02:00
Ghommie
e991328087 progress 2019-10-19 15:02:56 +02:00
Poojawa
ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
Thalpy
597160ca15 Fixed werid stuff. 2019-10-15 14:17:36 +01:00
Thalpy
e115c456f3 Ohh I'm fixing 2019-10-15 13:41:49 +01:00
Thalpy
acc0ff8a17 Adds craftable extended mags 2019-10-15 12:37:35 +01: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
Poojawa
394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
kevinz000
b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches 
Ports /tg/ advanced surgerytools and tool defines.
 2019-10-11 12:10:31 -07:00
Ghommie
689136fe94 Nerfs cyborg disabler to hold 25 shots rather than 43, just like a normal disabler. 2019-10-09 23:07:39 +02:00
lolman360
04521551f0 one commit wonder 2019-10-08 19:46:28 +11:00
Poojawa
3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
Fermi
89f3a01bc0 Merge branch 'master' into tg-Organ-port 2019-10-01 06:17:58 +01:00
Poojawa
117e5a409d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 00:05:44 -05:00
kevinz000
6e55fec7bd Merge pull request #9189 from Sishen1542/gatling 
[READY] craftable laser minigun, because why not
 2019-09-28 00:40:02 -07:00
kevinz000
6fa6502b75 Merge branch 'master' into tgfusion 2019-09-28 00:35:50 -07:00
Poojawa
f57bdc39a2 I still fucking hate components. 2019-09-23 02:03:37 -05:00
YakumoChen
e297dbd0a3 Update energy_gun.dm 2019-09-21 02:39:47 +00:00
Fermi
587568bf88 Merge branch 'master' into tg-Organ-port 2019-09-19 01:33:15 +01:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
kevinz000
39beca1a0f Merge pull request #9199 from Tupinambis/IUsedTheShotgunYouKnowWhy 
I Used The Shotgun, You Know Why? (Shotgun Balance Pass)
 2019-09-13 10:47:15 -07:00
Poojawa
65a89030eb reverts the bleed changes till they can be better tuned 2019-09-12 00:14:26 -05:00
Poojawa
4fa09059d7 Medibeam heals bleed_rate and radiation 2019-09-11 04:38:09 -05:00
kevinz000
87cf0b971a Merge pull request #9221 from Sishen1542/chappy 
adds some new nullrods with some back end null rod refactors
 2019-09-06 16:47:46 -07:00
Sishen
a3967b6f77 aaaaaaaa 2019-09-03 02:29:08 -04:00
Sishen
b4f27b8841 allows renaming of non null rod holyweapons, fixes hypertool description 2019-08-31 18:05:09 -04:00
Sishen
d9fff579b1 damage and stamina balances 2019-08-31 17:39:51 -04:00
Sishen
ba5021af5b gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool 2019-08-31 02:55:29 -04:00
Sishen
b69c928419 FOR THE EMPEROR 2019-08-30 16:50:03 -04:00
nik707
01f732c57a Merge pull request #9207 from Ghommie/Ghommie-cit189 
Rawket lawnchair fix.
 2019-08-29 19:29:14 -05:00
nik707
121c2c2f53 Merge pull request #9172 from Citadel-Station-13/kevinz000-patch-75 
You rack the riot shotgun
 2019-08-29 19:11:19 -05:00
Sishen
47ee3a8a6d fuck 2019-08-28 23:56:08 -04:00
Ghommie
18b023b127 arg 2019-08-28 04:47:53 +02:00
Ghommie
e25697dc14 rocket fix. 2019-08-28 03:37:35 +02:00
Tupinambis
3b2be43bd8 Slightly increased rubbershot damage from 12.5 to 15 per pellet. 2019-08-27 18:35:08 -05:00