cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-25 06:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
132 Commits
Author SHA1 Message Date
Enric Gabriel d85ebed8db Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-16 16:22:36 -03:00
timothyteakettle cdaef63fa1 sorry travis 2020-09-03 23:07:19 +01:00
timothyteakettle 9e2ee588c9 rp prosthetics 2020-09-03 22:05:21 +01:00
timothyteakettle cd7293a9a2 limbs 2020-08-24 03:19:36 +01:00
Enric Gabriel d82cb8b9e8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-03 17:03:13 -03:00
Seris02 82790cffed fixes lizard code 2020-08-03 21:39:11 +08:00
Seris02 aeec3a3404 lizards no longer have broken spines 2020-08-03 17:29:32 +08:00
Enric Gabriel e0fdf3dce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 / merge conflicts 2020-07-23 19:14:58 -03:00
timothyteakettle e8fade4f7f changes 2020-07-18 02:29:12 +01:00
Timothy Teakettle a4478b0cda it continues 2020-07-17 22:38:28 +01: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
silicons 6634e43be4 fix 2020-07-07 07:41:33 -07:00
silicons cee15792b7 ok 2020-07-07 07:25:10 -07:00
Enric GabrielandGitHub 72f993fdbd Pulls #1706 from Skyrat (#18) 2020-07-02 02:20:27 -03: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
deathride58andGitHub 245bf750c7 fixes a pair of dos vectors. this is apparently a day -1 patch! (#12511) 2020-06-12 11:54:18 -07:00
Ghommie a7934f3f88 event. 2020-05-29 18:58:34 +02:00
kevinz000 e6b0fb4929 this was a mistake 2020-04-25 01:02:47 -07:00
Ghommie 41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
kevinz000 f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
kevinz000 7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000 b341818f04 mobility flags 2020-01-12 11:00:12 -08:00
Ghommie c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie 542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Ghommie 358db4f390 Dreamchecker compatibility changes, part 2. 2019-11-14 14:54:12 +01:00
Ghommie 2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
BlackMajor 8b61fe3d72 posibrains on spawn list 2019-10-23 22:46:10 +13:00
deathride58andGitHub 6245d5df30 Merge pull request #9471 from Citadel-Station-13/exploits 
[s] fixes some exploits
 2019-10-14 14:16:46 -04:00
kevinz000andGitHub f393c7fff2 Update new_player.dm 2019-10-11 20:43:10 -07:00
JTGSZ 988a943f01 Try number 2 2019-10-11 02:36:10 -04:00
Ghommie cac4157894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-05 22:03:37 +02:00
Poojawa 1ba9d374fe whatever, I guess 2019-08-25 01:19:16 -05:00
Ghommie 5d1cac62da Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-08-24 13:50:22 +02:00
Poojawa 9cbd8af5b9 Updates colors, fixes alignment issues. 2019-08-18 14:38:10 -05:00
Poojawa 2922f08ef6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-17 23:41:28 -05:00
BlackMajorandGitHub 13f27c040e Merge pull request #8848 from Citadel-Station-13/trait_blacklisting 
Trait blacklisting system: Blacklists Mute and Brain Tumor from ALL heads of staff. Blacklists pacifist + paraplegic from HoS. Blacklists Paraplegic/nolegs from CE. Blacklists phanosthing/no-recognize-faces from HoP
 2019-08-18 15:33:08 +12:00
PoojawaandGitHub d0d6bc37a6 Merge branch 'master' into job-menu-improvements 2019-08-02 11:55:28 -05:00
Poojawa 58a27fa082 tabby boi 2019-07-31 19:37:53 -05:00
BurgerLua c0698bd220 whitespace 2019-07-31 16:40:49 -07:00
BurgerLua 3baac83021 Added 2019-07-31 16:40:35 -07:00
kevinz000 d976dd016a Merge remote-tracking branch 'origin/master' into trait_blacklisting 2019-07-25 15:20:46 -07:00
Ghommie 4df4cbd721 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-07-15 17:23:01 +02:00
PoojawaandGitHub c4f736eb94 Merge branch 'master' into job-menu-improvements 2019-07-10 18:55:29 -05:00
kevinz000 30a006e42f additions, and it now nulls out. 2019-07-08 18:21:04 -07:00
kevinz000 adf2166c57 t 2019-07-08 12:31:15 -07:00
Ghommie 49c8a08c15 Removes the ? that suppressed runtimes. 2019-07-07 20:39:40 +02:00
Ghommie ef745a850d Fixing lobby ghost roles for real. 2019-07-07 20:38:08 +02:00
Ghommie fe2abc990b Fixes new player runtime that makes people unable to join rounds. 2019-07-06 04:51:56 +02:00
Poojawa f66ee6f967 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-07-04 00:44:29 -05:00