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 2026-08-24 05:06:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
145 Commits
Author SHA1 Message Date
BongaTheProto 085bb06e94 Merge remote-tracking branch 'upstream/master' 2023-09-16 14:32:38 -05:00
SandPoot 0b04af4b76 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-09-14 22:32:47 -03:00
SandPoot 3c7e79d384 do after update 2023-09-09 15:39:49 -03:00
BongaTheProto 6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
BongaTheProto f18f566e4d Merge remote-tracking branch 'upstream/master' 2022-02-04 00:16:28 -05:00
SandPoot 2d0637221a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-04 00:59:26 -03:00
SpiWatandGitHub 386a7480a7 Tweenty -> Twenty 
Spelling.
 2022-01-31 19:12:00 -05:00
BongaTheProto 9ce527e068 Merge remote-tracking branch 'upstream/master' 2022-01-26 00:20:29 -05:00
SandPoot e8c8d2b0ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-25 11:38:07 -03:00
BongaTheProto f6dbf66e73 Revert "Revert "Merge pull request #132 from SPLURT-Station/milkjming"" 
This reverts commit a87acfb92f.
 2022-01-17 12:08:15 -05:00
BongaTheProto a87acfb92f Revert "Merge pull request #132 from SPLURT-Station/milkjming" 
This reverts commit 00e0fd04c3, reversing
changes made to 8e70b187e5.
 2022-01-16 23:27:26 -05:00
BongaTheProto b61101c47b cumcumcumcumcumcumcum 
cumcumcumcumcumcumcum
 2022-01-15 04:03:34 -05:00
BongaTheProto 9c71320f20 Merge remote-tracking branch 'upstream/master' 2021-12-15 12:38:35 -05:00
BongaTheProtoandGitHub 64c70711c2 fixes some runtimes (again) (#211) 2021-12-15 14:25:41 -03:00
Iosyf 01690ddec1 Removing runtimes 
Sometimes the showers were washing null objects
Sometimes the text passed to PaperSheets was null

Added check for both
 2021-12-15 11:55:52 +02:00
E 52d4143c83 yeet 2021-12-02 00:59:39 +01:00
LetterN 1fc778f70a soundloop fix. also it gets deleted (woo) 2021-10-30 13:16:31 +08:00
SandPoot 9d701320ac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-15 11:54:42 -03:00
Putnam3145 899e74fc83 Componentized acid 2021-07-03 22:10:44 -07:00
SandPoot 93a3b6dac1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-21 14:58:45 -03:00
necromanceranne 6ebc911937 Batons knockdown and slowdown on rightclick, otherwise they stagger, but always do damage. Damage respects melee armor, but power cells grant armor pen based on max charge. 2021-03-16 04:48:55 +11:00
SandPoot 20509121b8 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-08 14:07:57 -03:00
Letter N 5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
SandPoot 98e11d88a9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-21 23:29:09 -03: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
Letter N 834e4730b3 not existing 2021-02-09 15:44:49 +08:00
Letter N f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
SandPoot 8cb9f76fd2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-04 00:23:01 -03:00
Putnam 29213bbcbe ok i guess it has to be initialize 2020-10-02 17:39:53 -07:00
Putnam 3b21c31872 Makes water closet loot work and not cause bad GC bugs. 2020-10-02 16:56:21 -07:00
SandPootandGitHub 13834c4bef Morrowinventory Port (#75) 2020-09-24 20:14:53 -03:00
silicons 526d257410 fix 2020-07-20 11:48:08 -07:00
silicons 416b989e12 changes 2020-07-20 11:35:10 -07:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons 58e26c540c merge from master 2020-07-20 10:18:44 -07:00
silicons 55f8e37544 sigh 2020-07-18 20:26:11 -07:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07:00
siliconsandGitHub 26fee48cec Merge pull request #12645 from Ghommie/Ghommie-cit825 
More and more fixes.
 2020-06-29 14:18:10 -07:00
GhomandGitHub b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes 
big batch of spelling/grammar corrections
 2020-06-29 21:13:06 +02:00
Ghommie 0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
timothyteakettle 76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
Ghommie c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
GhomandGitHub 77a6511cc7 Fixing two issues. (#12481) 2020-06-09 03:26:19 -07:00
GhomandGitHub 85186a9714 Porting updates related to material datums. (#12317) 
* Porting updates related to material datums.

* art_type

* oh oh
 2020-05-25 14:21:00 -07:00
GhomandGitHub ab5d65a454 Porting the BEPIS research machinery. (#12277) 
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
 2020-05-24 13:05:15 -07:00
GhomandGitHub 863ecf6627 Update watercloset.dm 2020-04-12 07:17:50 +02:00