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
35,269 Commits 55 Branches 0 Tags
c9cb29ceea22d1ba51decd28f80b7837e9e00f2d
Commit Graph

135 Commits

Author SHA1 Message Date
Strazyplus
c9cb29ceea Who feeding the chunkydrakes 2020-07-11 22:57:37 -04:00
Strazyplus
13fe156a8b Dragon online! 2020-07-11 21:32:34 -04:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
kevinz000
445d94f335 haha whew 2020-06-17 21:32:10 -07:00
kevinz000
86a07fffc3 line fix 2020-06-12 15:34:40 -07:00
kevinz000
f9c624ef80 based vorestation 2020-06-12 15:32:32 -07:00
Trilbyspaceclone
0b0e9011a7 Prevent surgery tools and items from being rad contaminatable (#12413) 
* Update tools.dm

* Update tools.dm

* Update robot_modules.dm
 2020-06-04 15:56:15 -07:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Ghommie
88d86e53d0 Porting some radial menu updates, and that one clown mask. 2020-05-09 00:45:48 +02:00
Ghommie
87a6bd013c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-17 21:57:21 +02:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Ghommie
7193efa613 Fixing some doggie issues. 2020-04-16 05:29:17 +02:00
Trilbyspaceclone
9d0dbb38f8 Update robot_modules.dm 2020-03-20 01:52:43 -04:00
Hatterhat
1fe67d5ce9 a finger of the monkey's paw curls. 2020-03-16 01:35:47 -05:00
Hatterhat
802d37a399 borgs should be outclassed lategame and not hunt 2020-03-15 15:55:31 -05:00
kevinz000
16d6ba9e21 Merge pull request #11323 from Ghommie/Ghommie-cit600 
Porting a couple material datums code updates and fixes.
 2020-03-06 00:17:21 -07:00
Ghommie
f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00
kevinz000
f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000
a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00
Ghom
7763475b83 Merge pull request #10572 from Tupinambis/SiliconDefault 
Removes harm prevention clause indicators from relevant sources.
 2020-02-20 15:33:27 +01:00
kevinz000
0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
kevinz000
eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
Ghommie
c34714cb90 Something about the in operator and spaceDMM version update. 2020-02-10 07:37:59 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
kevinz000
611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
kevinz000
0eb13d8f23 refactors guns a bit 2020-01-27 17:39:49 -07:00
BlackMajor
77e7dff11b Webedit PR man bad 2020-01-24 01:41:40 +13:00
BlackMajor
5fb2e60ebf Merge branch 'master' into master 2020-01-24 00:50:46 +13:00
BlackMajor
7733d3f98a Update robot_modules.dm 2020-01-24 00:42:41 +13:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
Tupinambis
dd9e62c8bb Sillycon law prevention clause removal. 2020-01-15 23:15:18 -06:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
BlackMajor
30fc5b560b Couple of lingering fixes 2020-01-11 17:57:18 +13:00
Ghommie
825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
kevinz000
5b2c4deaa0 lockcharge --> locked_down 2020-01-07 12:04:41 -08:00
BlackMajor
5a97259ba9 Fix a couple of bugs, add wrapping paper and destination tagger 2020-01-07 15:33:16 +13:00
BlackMajor
8948e0491e add mining card 2019-12-30 02:07:49 +13:00
BlackMajor
b811d3e57e More work on it 2019-12-30 01:23:41 +13:00
BlackMajor
2e03a529bf checking off the list 2019-12-29 22:11:10 +13:00
BlackMajor
206a5e168a More mining changes 2019-12-29 20:15:49 +13:00
Ghommie
b4c0433d6d more work. 2019-12-27 17:45:19 +01:00
BlackMajor
4e1a9b83cf Pushing work for tonight. 2019-12-28 01:01:26 +13:00
BlackMajor
e0e521977a Start just to make the PR 2019-12-27 22:37:57 +13:00
Ghommie
57cecd2499 work 2019-12-25 06:54:44 +01:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
BlackMajor
03d2e9eb6d Compress secK9 2019-12-17 23:32:51 +13:00