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-14 20:02:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,269 Commits 55 Branches 0 Tags
eb9e27a497d68e3a433059cb15a7d39d2136b4fc
Commit Graph

642 Commits

Author SHA1 Message Date
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
Tupinambis
d43b4599ef I was bullied to reduce click delay. 2019-08-26 15:53:44 -05:00
Tupinambis
13638ed5d6 Reverts some changes I deemed unneccesary. Undoes a fuckup 2019-08-26 15:08:36 -05:00
Poojawa
bd49187ea7 on second thought, let's not try to half ass fancy ideas. 2019-08-26 14:45:36 -05:00
Tupinambis
a4fd2be7f7 Various Shotgun Nerfs. 2019-08-26 14:45:12 -05:00
Poojawa
74a24fdcc1 WHAT IN TARNATION 2019-08-26 14:30:27 -05:00
Poojawa
9558252b93 Revert/replaces a lot of #8024 with bleed_rate 
Wearing armor reduces the blood loss you incur, no longer are you instantly deleted on blood.  Dripping blood WILL kill you if you don't solve that issue, medical gauze has been tripled as a QoL for medical staff as a result.
 2019-08-26 14:22:17 -05:00
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
Sishen
20f4e260e1 minigun ooga 2019-08-23 19:39:20 -04:00
kevinz000
3c59b43ff7 Update shotgun.dm 2019-08-21 06:39:18 -07:00
Poojawa
32c7a7c3ee Virology's broken as fuck, damnifino why 2019-08-21 03:36:40 -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
264cbf8108 reverts the add_blood back to add_blood_DNA 2019-08-15 12:49:10 -05:00
Poojawa
0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Poojawa
283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
kevinz000
27b3cb6656 Merge pull request #9018 from Ghommie/Ghommie-cit171 
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
 2019-08-04 19:04:59 -07:00
kevinz000
f59abbf073 Merge pull request #8942 from jakeramsay007/WardenShotgun 
Changes the Warden's shotgun to instead be foldable, with greatly increased penalties for being folded.
 2019-08-03 00:48:59 -07:00
kevinz000
b52462de0d Merge pull request #8958 from Trilbyspaceclone/emitter_gun 
Makes a new traitor Emitter gun for Engi memes
 2019-08-01 23:29:10 -07:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Chayse Ramsay
085251f5f7 update_icon 2019-07-30 04:35:54 +01:00
Trilbyspaceclone
969b928642 Update special.dm 2019-07-29 07:53:41 -04:00
Trilbyspaceclone
f9dfe5ae97 Update special.dm 2019-07-29 07:53:11 -04:00
TrilbySpaceClone
13936e97de emiting happyness 2019-07-24 14:40:59 -04:00
Chayse Ramsay
1c8768afe4 Redundant Redundancies made Redundant 2019-07-22 19:31:42 +01:00
Chayse Ramsay
ede61d8cb2 Changes the Warden's shotgun to instead be foldable, with greatly increased recoil and spread while folded. 2019-07-22 00:55:41 +01:00
Ghommie
7065a86841 Revert "Revert "Fixes rocket launchers, buffing their accuracy etc."" 2019-07-19 22:02:22 +02:00
Ghommie
1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-15 17:33:41 +02:00
kevinz000
835e91d46e compile 2019-07-14 05:13:47 -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
Ghommie
ffecca8c11 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-03 03:24:28 +02:00
Ghommie
f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00