Commit Graph

19834 Commits

Author SHA1 Message Date
deathride58 3cd5b1d180 Merge pull request #8741 from Ghommie/Ghommie-cit88
ports "Stockings"
2019-06-28 00:38:27 -04: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
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
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
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
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
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
Trilbyspaceclone 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
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
Trilbyspaceclone 7830b27b07 Update backpack.dm 2019-06-26 19:27:22 -04:00
Trilbyspaceclone 707da687e7 madness 2019-06-26 18:54:02 -04:00
Trilbyspaceclone 69ac1dfb6d icons 2019-06-26 18:52:34 -04:00
Trilbyspaceclone b1617999fb Update shields.dm 2019-06-26 18:22:59 -04:00
TrilbySpaceClone 9cab7b960c web-editless 2019-06-26 18:10:13 -04:00
Thalpy a2a5bbdb11 Found the "the floor" message admin! 2019-06-26 19:40:46 +01:00
Poojawa 00a630abe5 Fixes errant ball behaviour 2019-06-26 07:42:02 -05:00
Fermi afe43070a0 Improved logging and renamed buffer IDs 2019-06-26 12:20:10 +01:00
Fermi fbf54cd560 Ninja fix. 2019-06-26 12:01:26 +01:00
Sishen 65d05f7df0 Goodbye golem AI 2019-06-26 00:08:42 -04:00
Fermi fa9ae6d2e7 Feedback regarding trait 2019-06-25 23:52:38 +01:00
Ghommie 61a6d899d2 Should be ready. 2019-06-26 00:21:06 +02:00
Fermi 3928e027b4 Fixes (see dev discussion) 2019-06-25 23:06:55 +01:00
Arturlang c0c7597c76 Fixes trauma healing nanites. 2019-06-25 12:39:30 +03: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
kevinz000 45842ebda7 Update lungs.dm 2019-06-25 01:38:26 -07:00
kevinz000 67312abf04 Update life.dm 2019-06-25 01:37:51 -07:00
kevinz000 b45a789b54 Update life.dm 2019-06-25 01:35:56 -07:00
kevinz000 626ec64c1c Update lungs.dm 2019-06-25 01:34:19 -07:00
Fermi 4145b0f256 Hotfix for egregious oversights. 2019-06-25 07:22:20 +01:00
Sishen 935080e7a1 thatwasreallyannoying 2019-06-24 20:21:27 -04:00
Ghommie 28d3747c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-06-24 16:55:10 +02: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
Fermi 8605d3a246 Found a pH overflow. 2019-06-24 15:06:18 +01: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
Trilbyspaceclone 53c61b9050 Merge branch 'master' into Rnd_brakeup 2019-06-23 21:09:53 -04:00
Ghommie 71298c084d didn't init the list, bravo. 2019-06-24 03:09:43 +02:00
Trilbyspaceclone e9f36b79bb Merge branch 'master' into meme_tools 2019-06-23 21:07:55 -04:00
Trilbyspaceclone 063fe4fdef Merge branch 'master' into Unmodular 2019-06-23 21:06:21 -04:00
Trilbyspaceclone 5297608bfd Update uplink_items.dm 2019-06-23 20:59:18 -04:00
Trilbyspaceclone 368a623cf8 Update uplink_items.dm 2019-06-23 20:58:13 -04:00
Trilbyspaceclone ede0bbe89e Merge branch 'master' into patch-185 2019-06-23 20:56:25 -04: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