Commit Graph

9278 Commits

Author SHA1 Message Date
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
a103611d1b Merge pull request #8760 from Trilbyspaceclone/LoudnProud
Makes ling's adrendals have a loudness 2
2019-06-28 05:12:43 -07:00
kevinz000
33a972529c Update wheelchair.dm 2019-06-28 04:42:55 -07:00
Arturlang
442c21fdba For the actual deflecting! 2019-06-28 11:41:01 +03:00
Arturlang
8160da6a6a Reviewer suggestions 2019-06-28 11:06:33 +03:00
deathride58
d979dfef59 Merge pull request #8738 from Ghommie/Ghommie-cit86
porting pizza fixes.
2019-06-28 00:53:23 -04: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
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
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
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
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
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
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
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
Trilbyspaceclone
53c61b9050 Merge branch 'master' into Rnd_brakeup 2019-06-23 21:09:53 -04: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
Ghommie
e0b9706453 Alphabetic order. 2019-06-24 00:38:34 +02:00
TrilbySpaceClone
74c607b2df Ghommie Asked 2019-06-23 17:15:03 -04:00
Sishen
a74712eef2 Update toxins.dm 2019-06-23 15:33:16 -04:00
Fermi
fdba8c000f Fixing compiling errors. 2019-06-23 20:03:37 +01:00