cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-23 05:08:54 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
1757 Commits
Author SHA1 Message Date
siliconsandGitHub 08a6ef88e3 Merge pull request #12711 from LetterN/nerfs-cats 
[s] Updates goonchat [ready]
 2020-07-11 00:46:32 -07:00
Enric Gabriel 7b593d16fb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-11 03:13:42 -03:00
silicons 630d65dfec done 2020-07-10 00:08:53 -07:00
silicons 214b95445e status panel 2020-07-09 23:59:51 -07:00
silicons 9c9c611285 ok 2020-07-09 23:34:35 -07:00
Enric Gabriel e53a0b4cb6 emotes too 2020-07-09 16:04:14 -03:00
Enric Gabriel 62cba3888e possibly fixes doubled stuff on research and forces say_indicator 2020-07-09 16:01:59 -03:00
Putnam a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
Letter N 05684e7196 no config filter thing yet, but the code for it is "ready" 2020-07-08 16:36:58 +08:00
Letter N f757e54db9 muh immursion 2020-07-08 15:59:44 +08:00
Letter N 45a3c47608 removes fun 2020-07-08 15:10:49 +08:00
Artur 280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Enric Gabriel 83522c8571 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-04 17:18:13 -03:00
GhomandGitHub 871993ce14 Merge pull request #12593 from silicons/autobunker 
adds verb to auto bunker override on linked servers
 2020-07-04 18:36:59 +02:00
Artur 7781296fb9 DNA CONSOLE FIX 2020-07-03 11:09:55 +03:00
Artur 365aadec54 Trying to fix the dna t 2020-07-03 00:55:18 +03:00
Artur 6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
siliconsandGitHub e2975a44a1 Merge branch 'master' into policy 2020-07-02 01:23:19 -07:00
Enric GabrielandGitHub 72f993fdbd Pulls #1706 from Skyrat (#18) 2020-07-02 02:20:27 -03:00
Enric Gabriel f5bd261e38 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-30 22:01:51 -03:00
Artur 20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03: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
Enric Gabriel a7ce0b7ece Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-29 17:35:25 -03:00
Putnam3145andGitHub ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800 
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
 2020-06-29 12:44:33 -07:00
LinandGitHub 0a59453ce6 Merge pull request #12605 from Citadel-Station-13/silicons-patch-4 
adds line numbers to config errors
 2020-06-29 13:12:25 -05:00
GhomandGitHub a8046d072a Merge pull request #12626 from Citadel-Station-13/silicons-patch-10 
prevents duplicate chatboxes from typing indicators by inserting 28 macros into the basic macro sets that just trigger a nonsensical verb that does nothing
 2020-06-29 19:27:07 +02:00
siliconsandGitHub c88b7721ad Update policy.dm 2020-06-29 05:03:45 -07:00
siliconsandGitHub 836391075f Update config_entry.dm 2020-06-29 05:03:13 -07:00
Enric Gabriel d505bf0716 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-28 13:33:22 -03:00
siliconsandGitHub ced24b8931 Update input.dm 2020-06-27 01:39:34 -07:00
siliconsandGitHub 0e2f3d0f04 Update input.dm 2020-06-27 01:29:26 -07:00
silicons 2a0b3ce036 typo 2020-06-26 23:48:56 -07:00
silicons 0df5aa083b policies and code hooks 2020-06-26 23:41:44 -07:00
siliconsandGitHub 9c70fa2136 Update configuration.dm 2020-06-24 20:40:57 -07:00
Ghommie c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
silicons b367f76c62 autobunker 2020-06-24 07:49:45 -07:00
Ghommie ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +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
Enric Gabriel 75493584e5 fix the damn beacon 2020-06-22 19:07:52 -03:00
Artur c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Enric Gabriel 776b763e17 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-22 07:03:48 -03:00
LinandGitHub 2cd18f3dba Merge pull request #12557 from silicons/life 
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
 2020-06-21 18:32:58 -05:00
Enric Gabriel 0cb9e36396 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-19 18:31:29 -03:00
GhomandGitHub e31ce2edcf Merge pull request #12414 from LetterN/asset-cache-thing 
asset cache + better minimaps
 2020-06-19 23:09:09 +02:00
kevinz000 445d94f335 haha whew 2020-06-17 21:32:10 -07:00
Enric Gabriel d6e4eb9de3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-18 00:28:18 -03:00
Enric Gabriel cb261a1b74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-17 20:23:21 -03:00
deathride58 1a40fa73fb fixes an upstream oversight that completely bricks a downstream's atmos 2020-06-17 15:24:17 -04:00
SmArtKar 46c3e9e54d Shuttles 2020-06-16 18:16:14 +03:00
Artur ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00