Commit Graph

16941 Commits

Author SHA1 Message Date
Ghommie bb83d69aa0 Deepfries the trekkie security alert sounds to be three times more annoying, as well as replace the delta alert with the THX Deep Note... actually not. 2019-12-07 08:06:30 +01:00
nik707 e4a41c6169 Merge pull request #9932 from Putnam3145/fix-genital-contam
Make organs no longer radiaoctively contaminable.
2019-12-06 20:37:53 -06:00
kevinz000 968e9c099d Update silicon.dm 2019-12-06 01:12:44 -07:00
Putnam3145 4e022af46f Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
2019-12-05 21:16:47 -08:00
kevinz000 8cb6ff10b8 Merge pull request #10034 from Ghommie/Ghommie-cit420
Fixes the incongruent bone satchel description.
2019-12-05 22:00:38 -07:00
kevinz000 e16b61b865 Merge pull request #10043 from Arturlang/patch-1
PDA cartridges and their contents can no longer be contaminated
2019-12-05 21:58:33 -07:00
kevinz000 b8bb0f2924 Merge pull request #10048 from Ghommie/Ghommie-cit426
Demodularize moodlets.
2019-12-05 21:56:29 -07:00
kevinz000 6a305dfe4f Merge pull request #9955 from Ghommie/Ghommie-cit394
Updating supply pods code.
2019-12-05 21:54:42 -07:00
Putnam3145 6b2d3b116d Merge branch 'master' into Ghommie-cit430 2019-12-05 20:53:14 -08:00
kevinz000 90f31f5b2b Merge pull request #10023 from Sishen1542/i
meteors now only give 60-90 seconds warning
2019-12-05 21:52:32 -07:00
kevinz000 a65588009c Merge pull request #10038 from Trilbyspaceclone/patch-240
Makes trash carts craftable with plastic
2019-12-05 21:51:30 -07:00
kevinz000 f937c4d877 Merge pull request #10046 from Ghommie/Ghommie-cit424
Ports flag for bespoke elements.
2019-12-05 21:50:19 -07:00
kevinz000 13f43eb783 Merge pull request #10045 from Trilbyspaceclone/patch-241
Makes wallets hold more stuff
2019-12-05 21:49:50 -07:00
kevinz000 54be35a243 Merge pull request #9997 from Sishen1542/nuked
removes superspeed from nuka cola
2019-12-05 21:48:34 -07:00
Putnam3145 3633c6936d Merge pull request #10052 from Ghommie/Ghommie-cit428
Banishes some "me" emote magic numbers from this realm.
2019-12-05 20:47:39 -08:00
kevinz000 b932841adf Merge pull request #9975 from Ghommie/Ghommie-cit404
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
2019-12-05 21:47:29 -07:00
Putnam3145 62c0d59102 Merge pull request #10008 from Seris02/sleepingcarphallucination
adds sleeping carp wrist wrench/violent grab hallucination
2019-12-05 20:46:26 -08:00
kevinz000 176bde7829 Merge pull request #9990 from Linzolle/strange-reagent
Fixes to strange reagent and very slight nerf I guess.
2019-12-05 21:45:09 -07:00
kevinz000 5048995a58 Merge pull request #9993 from Ghommie/Ghommie-cit412
Ports tgstation loom changes, and durathred golems.
2019-12-05 21:44:25 -07:00
kevinz000 e2f9a68c2c Merge pull request #10049 from Useroth/new-tg-plants
Colored fairy grass, because fuck your eyes.
2019-12-05 21:43:24 -07:00
kevinz000 b5595114c1 Merge pull request #9805 from Ghommie/Ghommie-cit352
Uplink items are now automatically sorted alphabetically.
2019-12-05 21:40:09 -07:00
kevinz000 d217a9f445 Merge pull request #10032 from Ghommie/Ghommie-cit418
Porting some return type annotations and bad keyword fixes.
2019-12-05 21:33:12 -07:00
kevinz000 bd1b79b182 Merge pull request #10041 from kappa-sama/patch-8
[SALT] chargers and chaos stands are now reasonable to fight
2019-12-05 21:29:39 -07:00
kevinz000 2fcdb24fe3 Merge pull request #10019 from Seris02/wintercoattide
Adds CentCom, Assistant's formal, ratvarian and narsian winter coats + loadout for formal
2019-12-05 21:29:08 -07:00
kevinz000 70d305611c Merge pull request #10042 from Ghommie/Ghommie-cit422
fixes sofa overlays doing nothing, because their layer wasn't properly set.
2019-12-05 21:28:24 -07:00
kevinz000 bbd482015c Merge pull request #10033 from Ghommie/Ghommie-cit419
Fixes traitor codewords highlight and some other hear signal hooks.
2019-12-05 21:28:03 -07:00
kevinz000 29497320c1 Merge pull request #10025 from Linzolle/butchering
refactor butchering component
2019-12-05 21:19:57 -07:00
Ghommie 5024e900f7 Ooow fuck. 2019-12-06 02:45:55 +01:00
Ghommie f1ccccbf36 drake. 2019-12-06 02:14:15 +01:00
Ghommie 9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Ghommie 7958cfa548 Right file 2019-12-06 00:27:50 +01:00
BlackMajor b7d0cc6516 Merge pull request #9884 from Useroth/blackpowder-alternative
Black powder fix. Alternative to #9861
2019-12-06 11:32:17 +13:00
BlackMajor a6f48ea74c Merge pull request #9372 from Weblure/Xenobio-Hotkeys
[Ready] [Test Merge] Ports Xenobio Hotkeys
2019-12-06 11:29:34 +13:00
Ghommie 53ff425f04 Banishes some magic numbers from this realm. 2019-12-05 21:55:28 +01:00
Useroth f4bffdc56d To make sure it doesn't runtime 2019-12-05 19:05:57 +01:00
Useroth 2e84c30e59 Tiny touch-ups 2019-12-05 16:29:50 +01:00
Seris02 0c5a1b900b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintercoattide 2019-12-05 21:09:38 +08:00
Seris02 2ce79828b8 ratvar coat updated 2019-12-05 20:46:59 +08:00
Useroth b9ce4a8622 Oopsie 2019-12-05 01:49:55 +01:00
Useroth 950b884da5 Adds colored fairygrass. 2019-12-05 01:47:42 +01:00
Ghommie 77ef3dabea Demodularize moodlets. 2019-12-04 23:10:39 +01:00
Trilbyspaceclone 73891a02bc messenger 2019-12-04 16:56:27 -05:00
Arturlang 138847838a I suppose 2019-12-04 21:17:49 +02:00
Ghommie 07bd51f79a Ports flag for bespoke elements. 2019-12-04 19:38:25 +01:00
Trilbyspaceclone 2a591df09a Update wallets.dm 2019-12-04 12:50:18 -05:00
Trilbyspaceclone 8ecb920c7f Update bins.dm 2019-12-04 12:20:24 -05:00
Arturlang 7d3103a260 Done 2019-12-04 15:02:36 +02:00
Ghommie 3d7ef827a9 better. 2019-12-04 06:31:48 +01:00
Ghommie dc91114e8b fixes sofa overlays doing jackshit, because their layer wasn't properly set. 2019-12-04 06:26:11 +01:00
TrilbySpaceClone e1717bb534 Merge branch 'master' into crow 2019-12-03 23:45:05 -05:00