Commit Graph

25662 Commits

Author SHA1 Message Date
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
kevinz000
8f08e1017e Merge pull request #9688 from Ghommie/Ghommie-cit306
Fixing gibspawner runtimes and improving them, how gruesome...
2019-11-14 15:51:20 -07:00
CitadelStationBot
a4e47df4bb Automatic changelog generation for PR #9689 [ci skip] 2019-11-14 16:50:54 -06:00
kevinz000
d8e89b235f Merge pull request #9689 from Ghommie/Ghommie-cit307
How many times I have encountered this sort of issue in the past and how much of a meme it was...
2019-11-14 15:50:52 -07:00
kevinz000
09e5cd95a3 Merge pull request #9690 from Ghommie/Ghommie-cit308
Unmodularize configuration, _globalvars and subsystems.
2019-11-14 15:50:20 -07:00
CitadelStationBot
510c068839 Automatic changelog generation for PR #9544 [ci skip] 2019-11-14 16:50:02 -06:00
kevinz000
45e91e7943 Merge pull request #9544 from MrJWhit/brain-damage-change
Changes brain damage lines
2019-11-14 15:49:59 -07:00
kevinz000
617b0db310 Merge pull request #9692 from Ghommie/Ghommie-cit309
Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin.
2019-11-14 15:48:34 -07:00
CitadelStationBot
d41efa1200 Automatic changelog generation for PR #9453 [ci skip] 2019-11-14 16:47:21 -06:00
kevinz000
af0962088c Merge pull request #9453 from Ghommie/Ghommie-cit226
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
2019-11-14 15:47:18 -07:00
CitadelStationBot
c56a303d50 Automatic changelog generation for PR #9430 [ci skip] 2019-11-14 16:45:02 -06:00
kevinz000
dfa2296758 Merge pull request #9430 from Ghommie/Ghommie-cit220
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
2019-11-14 15:44:59 -07:00
CitadelStationBot
f1a2a76f46 Automatic changelog generation for PR #9554 [ci skip] 2019-11-14 16:43:54 -06:00
kevinz000
d1ea2d9990 Merge pull request #9554 from NopemanMcHalt/assu
[READY] Desperate Assistance Battleforce
2019-11-14 15:43:51 -07:00
CitadelStationBot
3d8ebe4219 Automatic changelog generation for PR #9775 [ci skip] 2019-11-14 02:40:19 -06:00
kevinz000
487f98bf68 Merge pull request #9775 from Ghommie/Ghommie-cit340
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
2019-11-14 01:40:16 -07:00
CitadelStationBot
106753c069 Automatic changelog generation for PR #9791 [ci skip] 2019-11-14 02:39:24 -06:00
kevinz000
f1612f6619 Merge pull request #9791 from kappa-sama/revolverports
ports TG's nicer revolver sprites for russian revolvers, normal .357 revolvers, and golden .357
2019-11-14 01:39:21 -07:00
kevinz000
e70a76085c Merge pull request #9789 from PersianXerxes/fixReagentDescriptions
Corrects the descriptions of meth and ephedrine
2019-11-14 01:38:01 -07:00
CitadelStationBot
3e4d6cb30c Automatic changelog generation for PR #9764 [ci skip] 2019-11-14 02:37:44 -06:00