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-28 02:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

257 Commits

Author SHA1 Message Date
Fermi
8af225e6e3 PLASE 2019-11-24 02:41:21 +00:00
Fermi
b756f37ff6 Alright 2019-11-23 01:05:42 +00:00
Fermi
e44c8c0a4a Well 
I guess
 2019-11-23 00:18:45 +00:00
Fermi
b404e18b15 Merge branch 'master' into FERMICHEMCurTweaks 2019-11-23 00:10:33 +00:00
kevinz000
d6f540faf7 Merge pull request #9796 from Ghommie/Ghommie-cit347 
Unmodularize airlocks.
 2019-11-14 16:24:56 -07:00
Ghommie
b83f92be0e Unmodularize airlocks. 2019-11-13 06:50:35 +01:00
Ghommie
e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
kevinz000
d9fd6cd176 Merge pull request #9735 from Ghommie/Ghommie-cit325 
Unmodularizing 2/3 of the sounds folder.
 2019-11-10 11:45:28 -07:00
Ghommie
3a9e4c1f13 Unmodularizing 2/3 of the sounds folder. 2019-11-06 23:11:15 +01:00
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Ghommie
29daa0c908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-04 22:59:24 +01:00
kevinz000
d9c38d0589 Merge pull request #8948 from Ghommie/Ghommie-cit156 
Cleaning up the arousal module.
 2019-10-31 17:27:03 -07:00
Ghommie
6cf35a67b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-10-31 23:17:39 +01:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie
79c3700d25 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-25 12:42:28 +02:00
Ghommie
cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +02:00
Ghommie
20d9adaccd Floaty floating. 2019-10-23 20:43:05 +02:00
Ghommie
a95b13c24a jetpack fixes too & co 2019-10-23 19:31:54 +02:00
Ghommie
ba307b01a5 Defib fixes and chem effects stuff 2019-10-23 13:45:57 +02:00
Ghommie
fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
Ghommie
475303bd02 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-17 00:50:30 +02:00
Thalpy
9bb045b60a Merge branch 'master' into FERMICHEMCurTweaks 2019-10-08 13:10:35 +01:00
Ghommie
6dbac16c74 Sanitizing the fermis code biohazard. 2019-10-03 04:31:11 +02:00
Thalpy
bfee1c13ff Bhijin's requests. 2019-10-01 20:58:31 +01:00
Fermi
f5c5e81e67 I thought I removed this in the original PR! 2019-09-27 14:16:36 +01:00
Fermi
107dd67cbe Well it compiles; just synthtissue and TongueLoss now. 2019-09-19 01:14:12 +01:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Fermi
b22994e546 Removes MK stuffs 2019-09-10 21:59:24 +01:00
Fermi
443f9e433d Final tweaks 2019-09-10 20:18:45 +01:00
Fermi
018ebc32ae All that remains is MK testing. 2019-09-08 02:46:43 +01:00
Fermi
d90b4769f1 MK, SDGF, Astrogen, Eigen, BE, furranium, hattmium tweaks and fixes. 2019-09-05 22:30:53 +01:00
Fermi
7890ad08d5 what is this 2019-09-03 20:30:21 +01:00
Fermi
a605d2a776 Todo: finish new words and review langauge 2019-09-03 20:16:41 +01:00
Ghommie
2a7b802957 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-08-29 21:01:23 +02:00
Poojawa
3de3f511cf Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes 2019-08-15 08:24:55 -05:00
Poojawa
f76bb27127 Fixes some runtimes and removes a holodeck exploit 
and a cleanup >.>;
 2019-08-08 21:33:42 -05:00
Ghommie
3bd0ba0275 Cleaning up Arousal code & co. 2019-07-23 06:39:53 +02:00
Fermi
a5fcb918aa Astrogen tweaks and cat fixes. 2019-07-19 04:11:26 +01:00
Fermi
3512d5eaec MK only pacifies on withdrawal now. 2019-07-16 06:00:40 +01:00
Fermi
d8a46dd0e3 Another fix to reduce spam. 2019-07-15 23:10:16 +01:00
Fermi
c746cb3078 Quick fix 2019-07-15 23:07:49 +01:00
Fermi
110f0cbb83 Fixes and making a message clearer so people don't think it's admins. 2019-07-13 19:17:19 +01:00
Fermi
ce390fb595 Tweaks to MK 2019-07-09 23:27:37 +01:00
Fermi
3a2192ec2e Hotfix for captain. 2019-07-09 20:36:16 +01:00
Fermi
1b3de620f9 BM requests. 2019-07-09 02:44:17 +01:00
Fermi
e7224991b7 Few fixes 2019-07-08 23:06:01 +01:00
Fermi
c3ac34158a Fixed shock command. 2019-07-08 19:51:10 +01:00
Fermi
b163f56eb3 Guess what it didn't work. 2019-07-07 16:16:02 +01:00
Fermi
30322f1163 TO BE TESTED 2019-07-07 06:29:55 +01:00
Fermi
e84fc73bed Fixed buffers, SDGF, icons and spelling. 2019-07-07 05:59:21 +01:00