Commit Graph

418 Commits

Author SHA1 Message Date
Seris02 8f70bd304d yee 2020-02-04 13:24:30 +08:00
Seris02 659110ac8c yee again 2020-02-02 13:44:45 +08:00
Seris02 4c2e702d7a yee 2020-02-02 13:18:26 +08:00
Ghom 44c141f009 Merge branch 'master' into hugbox_meteor_time 2020-01-29 02:28:12 +01:00
kevinz000 54f9df9f88 ;GUYS WHERE'S PORT I KEEP FORGETTING MY DIRECTIONS 2020-01-27 13:19:53 -07:00
kevinz000 f842a249a4 Update meteor_wave.dm 2020-01-25 22:11:49 -07:00
kevinz000 d7ba4134e1 Update meteor_wave.dm 2020-01-25 22:10:39 -07:00
kevinz000 8b4a050ad3 ok 2020-01-25 22:03:53 -07:00
Trilbyspaceclone 9466b0f4ca Merge branch 'master' into glassware 2020-01-23 13:31:04 -05:00
TrilbySpaceClone 92dc5e61c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware 2020-01-13 03:42:20 -05: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 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
Trilbyspaceclone f7aa4f3050 Merge branch 'master' into glassware 2020-01-06 23:55:44 -05:00
Ghommie 686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
Trilbyspaceclone 2931cb6757 Merge branch 'master' into glassware 2020-01-02 20:30:20 -05:00
Ghommie 49f1176170 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-30 16:06:16 +01:00
Putnam 418e4c21ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2019-12-30 01:56:59 -08:00
Putnam 90ebbdfdb9 elements are so good. they're so good 2019-12-30 00:53:03 -08:00
Seris02 f1292c503c makes it a trait 2019-12-30 11:33:15 +08:00
Seris02 69d82338bc excludes certain ghost roles from being affected by health events 2019-12-28 16:46:50 +08:00
Ghommie 53d142b4c0 more work. 2019-12-25 01:34:33 +01:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghommie 9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-20 23:40:21 +01:00
TrilbySpaceClone 67d3d19cb9 correctiosn
and movement
2019-12-07 13:43:34 -05: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
Winter Flare 6377f1b3a9 Organisation 2019-12-06 03:42:57 -05:00
kevinz000 6a305dfe4f Merge pull request #9955 from Ghommie/Ghommie-cit394
Updating supply pods code.
2019-12-05 21:54:42 -07:00
Sishen 3ccc88e2b9 Update meteor_wave.dm 2019-12-01 05:15:41 -07:00
Ghommie 4e05c27cdb Updating supply pods code. 2019-11-27 01:54:10 +01:00
BlackMajor c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Ghommie 5153ed04ec aaa 2019-11-21 06:48:26 +01:00
Putnam 0d297e92c7 read words 2019-11-19 22:02:06 -08:00
Putnam f7361c2059 Made sure every dynamic-controlled event doesn't randomly trigger on dynamic. 2019-11-19 21:58:55 -08:00
Ghommie 21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Ghommie dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Ghommie a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Putnam ba091b3a27 limited midround wizard summon events possibilities 2019-11-17 05:56:19 -08:00
Putnam f3c4897b48 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-14 22:31:48 -08:00
Ghommie 6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-15 00:36:50 +01:00
kevinz000 5b5e655b18 Merge pull request #9801 from Ghommie/Ghommie-cit348
Fixing anti-meta hidden random event reports.
2019-11-14 16:28:07 -07:00
kevinz000 b670c94ca4 Merge pull request #9790 from PersianXerxes/lowerMeteorWarnings
Reducing meteor warning time
2019-11-14 16:24:10 -07:00
kevinz000 2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
kevinz000 47f01907f0 Merge pull request #9666 from Ghommie/Ghommie-cit296
Shameless late game crew nerf
2019-11-14 15:54:13 -07:00
Putnam 5e51cc63f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-13 16:58:44 -08:00
Ghommie 29deebbd23 Fixing anti-meta event announcements. 2019-11-13 19:01:11 +01:00
Persi b8137cde65 Reducing meteor warning time 2019-11-12 06:02:24 -05:00
Ghommie 4c1eba0d81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-11-10 23:52:48 +01:00
Ghommie 09860d463f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-10 23:23:36 +01:00
Ghommie e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00