cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-22 20:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
5328 Commits
Author SHA1 Message Date
lolman360andGitHub 55ed77a89d Update robot_modules.dm 2020-07-18 16:15:47 +10:00
lolman360andGitHub f84b044f34 Update robot_modules.dm 2020-07-18 16:05:57 +10:00
BlackMajor f68962e9d3 This is a bad idea 2020-07-18 16:46:08 +12:00
Enric Gabriel 432cb077ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-17 23:09:00 -03:00
timothyteakettle e8fade4f7f changes 2020-07-18 02:29:12 +01:00
timothyteakettle 8bb9b11922 Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port 2020-07-18 01:26:41 +01:00
timothyteakettle 7714fcfaba more changes 2020-07-18 01:26:38 +01:00
siliconsandGitHub 655afda020 Merge pull request #12780 from BlackMajor/borgo 
Even more engiborg power creep
 2020-07-17 17:08:23 -07:00
Timothy Teakettle 93b4570f8d more changes 2020-07-17 23:23:47 +01:00
Timothy Teakettle a4478b0cda it continues 2020-07-17 22:38:28 +01:00
silicons a2c3643e20 fix 2020-07-17 12:46:32 -07:00
siliconsandGitHub cc6079d413 Update human_movement.dm 2020-07-17 09:10:03 -07:00
silicons 993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
Enric Gabriel 05593f84a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 22:13:13 -03:00
siliconsandGitHub 484da28600 Merge branch 'master' into shoelaces 2020-07-16 17:31:41 -07:00
siliconsandGitHub e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
Enric Gabriel adc419761a typing indicators very good 2020-07-16 21:06:30 -03:00
Enric Gabriel 310b0e4e91 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 14:53:25 -03:00
Timothy Teakettle ebd648c03d name edgecase too 2020-07-16 18:32:24 +01:00
Timothy Teakettle a8a495c0ac rewrites pickle handling 2020-07-16 18:22:58 +01:00
Artur 9e73788714 Gah 2020-07-16 17:40:05 +03:00
BlackMajor fc909cd7c6 Added material sheets and tiles. This took more work than you'd think. 2020-07-17 01:17:54 +12:00
ArturlangandGitHub 92ed5d3201 Merge branch 'master' into TGUI-3.0 2020-07-16 15:59:37 +03:00
Artur af65b626e3 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-16 15:56:08 +03:00
Letter N 2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
timothyteakettle 8bfc30c8ac i can't spell 2020-07-16 02:54:31 +01:00
timothyteakettle 03bd806c73 pickle 2020-07-16 02:51:07 +01:00
Timothy Teakettle a7e2668eff funniest 2020-07-15 23:50:39 +01:00
Enric Gabriel 90f2e58f47 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-15 17:13:32 -03:00
siliconsandGitHub 6121cbd091 Merge pull request #12738 from timothyteakettle/travelling-traders 
the travelling trader midround event
 2020-07-15 08:50:20 -07:00
BlackMajor bd7c9d11d3 oh no 2020-07-16 02:02:29 +12:00
Enric Gabriel b3f05d69c8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-14 14:25:12 -03:00
Artur d0f1a805e4 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-14 16:15:48 +03:00
siliconsandGitHub c333a71c74 Update life.dm 2020-07-14 04:30:38 -07:00
Enric Gabriel 485d7b3fec i don't... just why? 2020-07-13 20:08:45 -03:00
Enric Gabriel 674af2dc86 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-13 17:30:11 -03:00
LinandGitHub 55c4e40fbb Merge pull request #12706 from silicons/records 
adds security/medical records to character setup
 2020-07-13 11:50:02 -05:00
Artur 5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Strazyplus 15470de825 Don't DragON me, mister! 
Removes comments from code
Removes mentions of Navier
Why are we still here? Just to suffer?
 2020-07-13 07:01:48 -04:00
Timothy Teakettle 29628dd82a cows 2020-07-12 21:40:16 +01:00
Strazyplus 92a6d673ba Drakes are dragons too 2020-07-12 07:32:09 -04:00
Strazyplus 2eb353d195 More License detail tweaks. 2020-07-12 00:56:43 -04:00
Strazyplus 582be67063 Lawyer-drake when? 
unmodularized drakeborg
added licencing documentation
reduced / simpified code comments
 2020-07-12 00:42:46 -04:00
Strazyplus 47921b2ae6 Removed unused sleeper_override 2020-07-11 23:16:42 -04:00
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
Enric Gabriel 0c953f25d6 fixes 2020-07-11 21:02:37 -03:00
Enric Gabriel 6dff5cabd4 merges skyrat#2036 2020-07-11 20:39:27 -03:00
Enric Gabriel 3635a93248 few good stuff 2020-07-11 20:33:14 -03:00
Enric Gabriel beec77b17d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-11 20:04:30 -03:00