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 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,795 Commits 55 Branches 0 Tags
d44fbd3fb19ba704a1e84612ee673d3b3f98412d
Commit Graph

14913 Commits

Author SHA1 Message Date
Fermi
d44fbd3fb1 Brain fix 2019-09-27 23:46:44 +01:00
Fermi
b622ea4fd2 Fixes 2019-09-27 13:49:25 +01:00
Fermi
b16e697201 eye tweaks. 2019-09-27 13:34:27 +01:00
Fermi
50ef6aa257 Eye fix 2019-09-27 13:28:23 +01:00
Fermi
a6a1449951 This was supposed to be the atomised branch aaargh!! 2019-09-27 11:44:15 +01:00
Fermi
e11197f977 Truth 2019-09-27 11:23:06 +01:00
Fermi
888906b4e7 Fixes Mk1 ! 2019-09-27 11:12:53 +01:00
Thalpy
1bdb66d5de Okay a few things I just saw 2019-09-27 07:28:02 +01:00
Fermi
167ffde648 OOPS 2019-09-21 14:07:23 +01:00
Fermi
97fa05f446 Merge branch 'master' into tg-Organ-port 2019-09-21 14:01:52 +01:00
Fermi
f8dfb1e3aa Okay. 2019-09-21 12:45:10 +01:00
Fermi
a3ae942c1d Okay.. I think this fixes it all. 2019-09-21 11:13:20 +01:00
Fermi
f0ea842c17 lil tweaks. 2019-09-21 09:58:37 +01:00
kevinz000
5608d37fd5 Merge pull request #9263 from Trilbyspaceclone/batter_up 
Adds a new traitor bundle - Synda Major Leage Player
 2019-09-21 01:56:41 -07:00
kevinz000
15aab80d75 Merge pull request #9253 from chefferz/chefferz-balance1 
Doubles stamina regen when standing/laying down
 2019-09-21 01:48:20 -07:00
kevinz000
313956002b Merge pull request #9269 from Thalpy/FermiGrenades 
Re-enables fermichem mechanics for grenades, nuances heat for general handling and enables SDGF/hatmium explosions.
 2019-09-21 01:46:22 -07:00
kevinz000
3e899e59f9 Merge pull request #9283 from Trilbyspaceclone/removal 
Removes a lot of unused files
 2019-09-21 01:45:11 -07:00
kevinz000
f259d98d7a Merge pull request #9282 from Ghommie/Ghommie-cit193 
Fixed a few dozen suits' body coverage inconsistencies.
 2019-09-21 01:43:52 -07:00
kevinz000
1fda7755d3 Merge pull request #9298 from Ghommie/Ghommie-cit197 
Fixes undershirts n socks colors prefs.
 2019-09-21 01:43:10 -07:00
kevinz000
5c8e585010 Merge pull request #9292 from Ghommie/Ghommie-cit94 
Fixes clown shoes and work boots.
 2019-09-21 01:42:03 -07:00
kevinz000
f898c99f62 Merge pull request #9304 from Trilbyspaceclone/bs_blood 
Its a blood bath! A BlueSpace Blood Bath!
 2019-09-21 01:39:29 -07:00
kevinz000
7d192c305a Merge pull request #9306 from kappa-sama/voidcell 
Abductor batteries can be used to unlock abductor research
 2019-09-21 01:39:08 -07:00
kevinz000
30fa8d8231 Merge pull request #9293 from Ghommie/Ghommie-cit195 
leftover legcuffs/handcuffs overlays fix.
 2019-09-21 01:38:14 -07:00
kevinz000
a9965d64b3 Merge pull request #9312 from Linzolle/ligament 
ports ligament surgeries as well as dissection
 2019-09-21 01:37:47 -07:00
Fermi
a08c1229d6 OKAY now I'm done I think. 2019-09-21 09:31:53 +01:00
Fermi
4b44b31aa3 Okay, feature done 2019-09-21 08:24:46 +01:00
Fermi
2b80998f64 Adds: cybernetic_heart_u and VV viewer. 2019-09-21 04:19:34 +01:00
Fermi
13cf5a7822 Updates 2019-09-20 22:51:14 +01:00
kevinz000
0a71762444 Merge pull request #9308 from Sishen1542/greyboiz2 
fix greyshirt response team
 2019-09-20 14:16:17 -07:00
kevinz000
9108c1ce89 Merge pull request #9203 from Trilbyspaceclone/fancy 
Makes brass tools look better*
 2019-09-20 12:09:33 -07:00
Fermi
3b1a36fb07 Needed. 2019-09-20 04:17:01 +01:00
Thalpy
79011190c1 Merge branch 'master' into tg-Organ-port 2019-09-19 21:26:42 +01:00
Fermi
b9a2a5ce38 Oops 2019-09-19 15:41:26 +01:00
Fermi
a398f64b66 Okay 2019-09-19 15:33:40 +01:00
Fermi
40bac8c807 t 2019-09-19 14:44:12 +01:00
Fermi
d8e6f4247e Traaavis 2019-09-19 13:40:44 +01:00
Linzolle
573932437e COMMA 2019-09-18 23:55:52 -05:00
Linzolle
cd2e894ebe display results and wording 2019-09-18 23:51:35 -05:00
Linzolle
4bf9c8cc84 citadel fixes 2019-09-18 23:15:05 -05:00
XDTM
023428f6a4 port experimental dissection 2019-09-18 23:04:11 -05:00
XDTM
8ad11d7250 ports ligament surgeries 2019-09-18 22:55:46 -05:00
Fermi
df4da58ce8 Merge branch 'NeuroFix' of https://github.com/Thalpy/Citadel-Station-13 into NeuroFix 2019-09-19 01:46:32 +01:00
Fermi
08eeda97f5 Heck 2019-09-19 01:45:21 +01:00
Thalpy
18ce46d7ec Merge branch 'master' into NeuroFix 2019-09-19 01:44:09 +01:00
Fermi
587568bf88 Merge branch 'master' into tg-Organ-port 2019-09-19 01:33:15 +01:00
Fermi
aabc2423a8 Oops. 2019-09-19 01:19:45 +01:00
Fermi
107dd67cbe Well it compiles; just synthtissue and TongueLoss now. 2019-09-19 01:14:12 +01:00
Sishen
fa4f05b919 Update ert.dm 2019-09-18 20:13:12 -04:00
Fermi
dfa40a4b22 tg Code complete, now to bugtest and clear compile errors. 2019-09-18 23:57:21 +01:00
kappa-sama
34d109f6a2 on further thought, all of them 2019-09-18 17:12:06 -04:00