Commit Graph

21605 Commits

Author SHA1 Message Date
deathride58 d979dfef59 Merge pull request #8738 from Ghommie/Ghommie-cit86
porting pizza fixes.
2019-06-28 00:53:23 -04:00
CitadelStationBot 42025eac1e Automatic changelog generation for PR #8730 [ci skip] 2019-06-27 23:53:01 -05:00
deathride58 8f168727c5 Merge pull request #8730 from Ghommie/Ghommie-cit80
Port in alt click to eject beaker and swapping beakers for chem machines, grinder radial menu.
2019-06-28 00:52:59 -04:00
CitadelStationBot 11203353e2 Automatic changelog generation for PR #8727 [ci skip] 2019-06-27 23:47:11 -05:00
deathride58 fb66d382fa Merge pull request #8727 from Ghommie/Ghommie-cit78
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcades.
2019-06-28 00:47:09 -04:00
CitadelStationBot eaef818b94 Automatic changelog generation for PR #8741 [ci skip] 2019-06-27 23:38:29 -05:00
deathride58 3cd5b1d180 Merge pull request #8741 from Ghommie/Ghommie-cit88
ports "Stockings"
2019-06-28 00:38:27 -04:00
CitadelStationBot 2dc931cad3 Automatic changelog generation for PR #8744 [ci skip] 2019-06-27 23:37:35 -05:00
deathride58 775bbaba8b Merge pull request #8744 from Linzolle/fix-1
fix atmos helmet
2019-06-28 00:37:33 -04:00
CitadelStationBot 3b8de769ba Automatic changelog generation for PR #8753 [ci skip] 2019-06-27 23:29:34 -05:00
deathride58 2ed69c8b46 Merge pull request #8753 from Sishen1542/siliconmanbad
[PORT] Non-station AI can no longer interact off their z-level.
2019-06-28 00:29:32 -04:00
CitadelStationBot 7562abe2d4 Automatic changelog generation for PR #8745 [ci skip] 2019-06-27 23:25:35 -05:00
deathride58 720d4ee4c8 Merge pull request #8745 from Sishen1542/CASfix
Port of tg pull #44158, the fix of Cards Against Space!
2019-06-28 00:25:32 -04:00
CitadelStationBot be6cd48918 Automatic changelog generation for PR #8755 [ci skip] 2019-06-27 23:23:39 -05:00
deathride58 db6e8ecd4c Merge pull request #8755 from Poojawa/the-balls-should-be-inert
Fixes errant ball behaviour
2019-06-28 00:23:37 -04:00
CitadelStationBot 6de6755af3 Automatic changelog generation for PR #8756 [ci skip] 2019-06-27 23:20:35 -05:00
deathride58 8bc2e0783f Merge pull request #8756 from Sishen1542/boxhosreinforcement
Outfits the Boxstation HoS office with blast doors and r-walls.
2019-06-28 00:20:32 -04:00
CitadelStationBot f7ee35dcda Automatic changelog generation for PR #8762 [ci skip] 2019-06-27 23:14:00 -05:00
deathride58 c4288b05e2 Merge pull request #8762 from Ghommie/Ghommie-cit90
New sprites for two of the most codersprite guns in the game.
2019-06-28 00:13:58 -04:00
CitadelStationBot d8600631f3 Automatic changelog generation for PR #8764 [ci skip] 2019-06-27 23:11:11 -05:00
deathride58 1e3cc6d23e Merge pull request #8764 from Trilbyspaceclone/patch-189
Allows shoulder holster to hold cap gun and mini-eguns
2019-06-28 00:11:09 -04:00
CitadelStationBot d5f8244c4f Automatic changelog generation for PR #8766 [ci skip] 2019-06-27 23:08:29 -05:00
deathride58 229c7c75f2 Merge pull request #8766 from Ghommie/Ghommie-cit92
Fixing "You can Alt click paper with TK to teleport it to you."
2019-06-28 00:08:27 -04:00
CitadelStationBot 7d1a23212b Automatic changelog generation for PR #8767 [ci skip] 2019-06-27 23:07:38 -05:00
deathride58 54b1f6ef8c Merge pull request #8767 from Ghommie/Ghommie-cit93
Fixes "Bubbles ate my Cohiba Robusto!"
2019-06-28 00:07:36 -04:00
LetterJay e82864a36f Merge pull request #8751 from Citadel-Station-13/LetterJay-patch-1
Fixes wrong item path for donator loadout
2019-06-27 08:57:25 -05:00
Ghommie e03b1c2a36 lazy 2019-06-27 14:34:56 +02:00
Ghommie b1a63b603b adjustments. 2019-06-27 14:28:40 +02:00
Ghommie d7028b0059 Fixes "Bubbles ate my Cohiba Robusto!" 2019-06-27 05:32:08 +02:00
Ghommie f118edad1d Fixing "You can Alt click paper with TK to teleport it to you." 2019-06-27 04:42:14 +02:00
Trilbyspaceclone 6ad0a0ba0d Update belt.dm 2019-06-26 20:14:05 -04:00
Trilbyspaceclone 6b173432b2 Update belt.dm 2019-06-26 20:09:37 -04:00
Ghommie aed3623e6e New sprites for two of the most codersprite guns in the game. 2019-06-27 00:28:34 +02:00
Sishen 8cd14ea48a Update BoxStation.dmm 2019-06-26 15:06:38 -04:00
Sishen e3af8a1a6b Update BoxStation.dmm 2019-06-26 14:50:48 -04:00
Poojawa 00a630abe5 Fixes errant ball behaviour 2019-06-26 07:42:02 -05:00
Sishen 65d05f7df0 Goodbye golem AI 2019-06-26 00:08:42 -04:00
Ghommie 61a6d899d2 Should be ready. 2019-06-26 00:21:06 +02:00
LetterJay 5f99d9ec04 Fixes wrong item path for donator loadout 2019-06-25 09:50:35 -05:00
kevinz000 0c20dc6e72 Merge pull request #8706 from Sishen1542/thecargonianengineeralliance
Ports the ability to sell fusion gases & generate research points with fusion. Also adds atmos hardsuits purchasable through cargo.
2019-06-25 02:00:41 -07:00
CitadelStationBot bda687ffb9 Automatic changelog generation for PR #8747 [ci skip] 2019-06-25 01:05:12 -05:00
LetterJay 93c784edad Merge pull request #8747 from Trilbyspaceclone/doner_1233
[Donner] Luna's Gauntlets for BigManClancy
2019-06-25 01:05:10 -05:00
TrilbySpaceClone 50aede119b all works 2019-06-25 01:50:35 -04:00
Sishen 935080e7a1 thatwasreallyannoying 2019-06-24 20:21:27 -04:00
Linzolle 1f19b602c9 fix atmos helmet 2019-06-24 16:17:53 -05:00
Ghommie 31b5f2a458 ports "Stockings" 2019-06-24 07:30:13 +02:00
CitadelStationBot dcd74f899a Automatic changelog generation for PR #8736 [ci skip] 2019-06-23 19:26:32 -05:00
kevinz000 69d48c5e5e Merge pull request #8736 from Trilbyspaceclone/Poojawa_How_Do_I_Update_My_Shit
Removes Nudity Permits and replaces them with invisible gear harnesses
2019-06-23 17:26:30 -07:00
TrilbySpaceClone 74c607b2df Ghommie Asked 2019-06-23 17:15:03 -04:00
kevinz000 08b475f50d Merge pull request #8699 from Sishen1542/cloakfix2
fixes CMO cloak offset and normalize cloak size for the other heads
2019-06-23 06:57:46 -07:00