Commit Graph
13708 Commits
Author SHA1 Message Date
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
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
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
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
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
kevinz000andGitHub 33a972529c Update wheelchair.dm 2019-06-28 04:42:55 -07:00
ArturlangandGitHub 442c21fdba For the actual deflecting! 2019-06-28 11:41:01 +03:00
ArturlangandGitHub 69a62314e9 Defines so carp reroutes the deflects 2019-06-28 11:37:12 +03:00
ArturlangandGitHub eb8133cf3b Defines var
Filthy webedits, i know.
2019-06-28 11:35:00 +03:00
ArturlangandGitHub 2ecaa57a98 Description so people know it exists 2019-06-28 11:28:37 +03:00
ArturlangandGitHub a9d4f53728 Alt-Keys now let you strafe! Wow! 2019-06-28 11:27:35 +03:00
ArturlangandGitHub 8160da6a6a Reviewer suggestions 2019-06-28 11:06:33 +03:00
deathride58andGitHub d979dfef59 Merge pull request #8738 from Ghommie/Ghommie-cit86
porting pizza fixes.
2019-06-28 00:53:23 -04: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
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
deathride58andGitHub 3cd5b1d180 Merge pull request #8741 from Ghommie/Ghommie-cit88
ports "Stockings"
2019-06-28 00:38:27 -04: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
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
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
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
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
Ghommie 180ab72b78 more changes. 2019-06-28 03:45:42 +02:00
Ghommie 8d9832938f New sprites for the curator, lawyer and roboticist pda cartridges. 2019-06-28 03:31:46 +02:00
TrilbyspacecloneandGitHub 227dd82daa just adrinals 2019-06-27 17:57:58 -04:00
Ghommie a90ef6faa3 and it's gone. 2019-06-27 15:06:04 +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
Ghommie e61f13634e Merging the end-of-shift and its shuttle call announcements into one. 2019-06-27 04:23:14 +02:00
TrilbyspacecloneandGitHub 6ad0a0ba0d Update belt.dm 2019-06-26 20:14:05 -04:00
TrilbyspacecloneandGitHub 6b173432b2 Update belt.dm 2019-06-26 20:09:37 -04:00
TrilbyspacecloneandGitHub 707da687e7 madness 2019-06-26 18:54:02 -04:00
TrilbyspacecloneandGitHub 69ac1dfb6d icons 2019-06-26 18:52:34 -04:00
TrilbyspacecloneandGitHub b1617999fb Update shields.dm 2019-06-26 18:22:59 -04:00
TrilbySpaceClone 9cab7b960c web-editless 2019-06-26 18:10:13 -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
ArturlangandGitHub c0c7597c76 Fixes trauma healing nanites. 2019-06-25 12:39:30 +03:00
kevinz000andGitHub 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
kevinz000andGitHub 45842ebda7 Update lungs.dm 2019-06-25 01:38:26 -07:00
kevinz000andGitHub 67312abf04 Update life.dm 2019-06-25 01:37:51 -07:00
kevinz000andGitHub b45a789b54 Update life.dm 2019-06-25 01:35:56 -07:00
kevinz000andGitHub 626ec64c1c Update lungs.dm 2019-06-25 01:34:19 -07:00
Sishen 935080e7a1 thatwasreallyannoying 2019-06-24 20:21:27 -04:00
Ghommie 67f00fc049 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42 2019-06-24 16:48:15 +02:00
Ghommie 31b5f2a458 ports "Stockings" 2019-06-24 07:30:13 +02:00
Ghommie 9f0278c34f map merging. 2019-06-24 06:13:42 +02:00
Ghommie fd68236594 ports "More variety for dorms bedsheets" + 3 new bed sheets. 2019-06-24 05:54:14 +02:00