Commit Graph

25822 Commits

Author SHA1 Message Date
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
Putnam
009c0b46d5 Added some more blocking rules (whoops) 2019-11-14 22:28:42 -08:00
Putnam
e68ad13983 Reduced RNG a bit more 2019-11-14 22:24:43 -08:00
CitadelStationBot
90b02db98c Automatic changelog generation for PR #9723 [ci skip] 2019-11-14 17:46:56 -06:00
kevinz000
746bbccb9c Merge pull request #9723 from Ghommie/Ghommie-cit321
Riding component fix and hacky mood runtimes workaround.
2019-11-14 16:46:54 -07:00
kevinz000
02e8a73265 Merge pull request #9737 from Ghommie/Ghommie-cit326
Ports techweb backend refactor & co.
2019-11-14 16:45:09 -07:00
CitadelStationBot
81220b8c7c Automatic changelog generation for PR #9742 [ci skip] 2019-11-14 17:44:43 -06:00
kevinz000
d5a245945c Merge pull request #9742 from Seris02/gpsthing
makes gps show location on examine
2019-11-14 16:44:40 -07:00
kevinz000
178aedc5cc Merge pull request #9754 from Ghommie/Ghommie-cit330
porting "global to static"
2019-11-14 16:38:27 -07:00
kevinz000
40523802f3 Merge pull request #9804 from Ghommie/Ghommie-cit351
Unmodularize keybindings.
2019-11-14 16:36:55 -07:00
CitadelStationBot
2476cf853a Automatic changelog generation for PR #9803 [ci skip] 2019-11-14 17:36:21 -06:00
kevinz000
ca99a8285c Merge pull request #9803 from Ghommie/Ghommie-cit350
Ports Improved beach away mission and some fluff mapping items.
2019-11-14 16:36:19 -07:00
CitadelStationBot
364e267598 Automatic changelog generation for PR #9801 [ci skip] 2019-11-14 17:28:10 -06: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
CitadelStationBot
a3d2a983b4 Automatic changelog generation for PR #9800 [ci skip] 2019-11-14 17:25:55 -06:00
kevinz000
cf1db8a396 Merge pull request #9800 from Trilbyspaceclone/changlog_messing_MKII
Updates changlog headers - 2 eletric boogaloo
2019-11-14 16:25:53 -07:00
CitadelStationBot
db09bf5fb1 Automatic changelog generation for PR #9797 [ci skip] 2019-11-14 17:25:24 -06:00
kevinz000
d3822378dc Merge pull request #9797 from PersianXerxes/permaVR
Adds two VR sleepers to all current maps' perma.
2019-11-14 16:25:22 -07:00
kevinz000
d6f540faf7 Merge pull request #9796 from Ghommie/Ghommie-cit347
Unmodularize airlocks.
2019-11-14 16:24:56 -07:00
kevinz000
bd650e53da Merge pull request #9795 from Ghommie/Ghommie-cit346
Unmodularize areas.
2019-11-14 16:24:36 -07:00
CitadelStationBot
57c9d90db2 Automatic changelog generation for PR #9790 [ci skip] 2019-11-14 17:24:13 -06:00
kevinz000
b670c94ca4 Merge pull request #9790 from PersianXerxes/lowerMeteorWarnings
Reducing meteor warning time
2019-11-14 16:24:10 -07:00
CitadelStationBot
5f3413fc10 Automatic changelog generation for PR #9788 [ci skip] 2019-11-14 17:23:59 -06:00
kevinz000
c3250cecc3 Merge pull request #9788 from Seris02/hemitapered
Makes tapered penises look more tapered
2019-11-14 16:23:56 -07:00
CitadelStationBot
c8195a18f4 Automatic changelog generation for PR #9786 [ci skip] 2019-11-14 17:22:57 -06:00
kevinz000
81303b1225 Merge pull request #9786 from Ghommie/Ghommie-cit345
Fixing some reagents taste descriptions.
2019-11-14 16:22:54 -07:00
CitadelStationBot
4f7a39aef5 Automatic changelog generation for PR #9785 [ci skip] 2019-11-14 17:22:31 -06:00
kevinz000
178501f415 Merge pull request #9785 from Ghommie/Ghommie-cit344
tweaked towel sprites tonalities and fixing their onmob suit overlay.
2019-11-14 16:22:28 -07:00
CitadelStationBot
1ab8e9e0c9 Automatic changelog generation for PR #9783 [ci skip] 2019-11-14 17:22:11 -06:00
kevinz000
8c247a566a Merge pull request #9783 from Ghommie/Ghommie-cit343
Fixing Aux base camera RCD door settings and toggle window type actions.
2019-11-14 16:22:08 -07:00
CitadelStationBot
8c0bee81e4 Automatic changelog generation for PR #9781 [ci skip] 2019-11-14 17:18:33 -06:00
kevinz000
9b56aa0cae Merge pull request #9781 from Hatterhat/northstar-fast-intents
northstar works on all intents, is slightly better than help intenting people with the hugs hands
2019-11-14 16:18:31 -07:00
CitadelStationBot
51dcb044e0 Automatic changelog generation for PR #9780 [ci skip] 2019-11-14 17:15:12 -06:00
kevinz000
b8f59abe34 Merge pull request #9780 from Hatterhat/fastredbutton
the one PR about making big red buttons detonate syndibombs faster
2019-11-14 16:15:10 -07:00
CitadelStationBot
42356fb2c6 Automatic changelog generation for PR #9614 [ci skip] 2019-11-14 17:07:46 -06:00
kevinz000
4ad56ac1e2 Merge pull request #9614 from Trilbyspaceclone/patch-234
Lowers ghosts and insain clowns hp to 120 from 1e6
2019-11-14 16:07:43 -07:00
CitadelStationBot
f7d8be5989 Automatic changelog generation for PR #9628 [ci skip] 2019-11-14 17:00:49 -06:00
kevinz000
4c89b8c33f Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2019-11-14 16:00:45 -07:00
CitadelStationBot
04b9e3fe91 Automatic changelog generation for PR #9632 [ci skip] 2019-11-14 16:58:55 -06:00
kevinz000
6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281
Porting multi-z support updates.
2019-11-14 15:58:53 -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
CitadelStationBot
d128be6c38 Automatic changelog generation for PR #9663 [ci skip] 2019-11-14 16:54:41 -06:00
kevinz000
499afa6666 Merge pull request #9663 from Trilbyspaceclone/patch-235
Buffs/Fixes embalming
2019-11-14 15:54:38 -07:00
CitadelStationBot
1996d080d5 Automatic changelog generation for PR #9666 [ci skip] 2019-11-14 16:54:16 -06:00
kevinz000
47f01907f0 Merge pull request #9666 from Ghommie/Ghommie-cit296
Shameless late game crew nerf
2019-11-14 15:54:13 -07:00
CitadelStationBot
5097dbc94c Automatic changelog generation for PR #9680 [ci skip] 2019-11-14 16:53:10 -06:00
kevinz000
d15a1b0e6b Merge pull request #9680 from Owai-Seek/extendedbounties
Reworked a bit of bounty stuff.
2019-11-14 15:53:07 -07:00
CitadelStationBot
649e5bfb94 Automatic changelog generation for PR #9683 [ci skip] 2019-11-14 16:52:13 -06:00
kevinz000
318c03cc28 Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
2019-11-14 15:52:11 -07:00
CitadelStationBot
3cf1b09e0c Automatic changelog generation for PR #9688 [ci skip] 2019-11-14 16:51:22 -06:00