Commit Graph
21643 Commits
Author SHA1 Message Date
CitadelStationBot 48d358d364 Automatic changelog generation for PR #8728 [ci skip] 2019-06-28 12:16:27 -05:00
kevinz000andGitHub d4b9b52f10 Merge pull request #8728 from Sishen1542/JESUSFUCKFIXDISPENSERSALREADYGODDAMN
Dispensers now act like tg counterparts! Tweak to available chems in chem/soda/booze dispensers.
2019-06-28 10:16:25 -07:00
Sishen 92f530eed1 left the , for diethyl when i removed saltpetre whoops 2019-06-28 08:34:35 -04:00
Sishen 84e60b1cd2 Update chem_dispenser.dm 2019-06-28 08:32:56 -04:00
CitadelStationBot bd4ba5da88 Automatic changelog generation for PR #8720 [ci skip] 2019-06-28 07:28:37 -05:00
kevinz000andGitHub 6c77443887 Merge pull request #8720 from Ghommie/Ghommie-cit76
Sort of porting MRE rations from Yogstation.
2019-06-28 05:28:35 -07:00
kevinz000andGitHub 8a2a0100c5 Merge pull request #8772 from Sishen1542/bibleblack
quick bible fix, per kevinz request
2019-06-28 05:27:43 -07:00
kevinz000andGitHub 83f84b01a1 Merge pull request #8700 from Sishen1542/trenchcloak
Adds a reskin option for HoS tenchcoat, the trenchcloak!
2019-06-28 05:24:11 -07:00
Sishen 555c1adf67 fix per kevs request 2019-06-28 08:20:59 -04:00
Sishen 1679a2c42b Merge remote-tracking branch 'upstream/master' 2019-06-28 08:20:12 -04:00
Sishen 1386161aff Revert "Revert "Revert "Revert "Automatic changelog generation for PR #8738 [ci skip]""""
This reverts commit 3fcc884ab5.
2019-06-28 08:20:06 -04:00
Sishen 3fcc884ab5 Revert "Revert "Revert "Automatic changelog generation for PR #8738 [ci skip]"""
This reverts commit 81b9f94511.
2019-06-28 08:19:49 -04:00
CitadelStationBot e336f2db52 Automatic changelog generation for PR #8731 [ci skip] 2019-06-28 07:19:06 -05:00
kevinz000andGitHub f7bbca8918 Merge pull request #8731 from Ghommie/Ghommie-cit81
Ports in microwave updates and its radial menu.
2019-06-28 05:19:04 -07:00
CitadelStationBot a55a0b32ab Automatic changelog generation for PR #8708 [ci skip] 2019-06-28 07:18:37 -05:00
kevinz000andGitHub f76737dc04 Merge pull request #8708 from Trilbyspaceclone/patch-185
Corrects the "Durasteel" to be plastitanium tool boxes
2019-06-28 05:18:35 -07:00
CitadelStationBot a8dfecdf25 Automatic changelog generation for PR #8726 [ci skip] 2019-06-28 07:14:59 -05:00
kevinz000andGitHub ee852382f8 Merge pull request #8726 from Sishen1542/biblethump
Tweaks to chaplain bible heals. Time to pull out the old brainbuster.
2019-06-28 05:14:57 -07:00
CitadelStationBot 506b63a9c7 Automatic changelog generation for PR #8760 [ci skip] 2019-06-28 07:12:46 -05:00
kevinz000andGitHub a103611d1b Merge pull request #8760 from Trilbyspaceclone/LoudnProud
Makes ling's adrendals have a loudness 2
2019-06-28 05:12:43 -07:00
Sishen 81b9f94511 Revert "Revert "Automatic changelog generation for PR #8738 [ci skip]""
This reverts commit 7e9ec43834.
2019-06-28 02:33:42 -04:00
Sishen 7e9ec43834 Revert "Automatic changelog generation for PR #8738 [ci skip]"
This reverts commit f3712660ce.
2019-06-28 02:33:23 -04:00
CitadelStationBot f3712660ce Automatic changelog generation for PR #8738 [ci skip] 2019-06-27 23:53:25 -05:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 54b1f6ef8c Merge pull request #8767 from Ghommie/Ghommie-cit93
Fixes "Bubbles ate my Cohiba Robusto!"
2019-06-28 00:07:36 -04:00
TrilbyspacecloneandGitHub 227dd82daa just adrinals 2019-06-27 17:57:58 -04:00
LetterJayandGitHub 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