Commit Graph
26606 Commits
Author SHA1 Message Date
kevinz000andGitHub a65588009c Merge pull request #10038 from Trilbyspaceclone/patch-240
Makes trash carts craftable with plastic
2019-12-05 21:51:30 -07:00
kevinz000andGitHub f937c4d877 Merge pull request #10046 from Ghommie/Ghommie-cit424
Ports flag for bespoke elements.
2019-12-05 21:50:19 -07:00
CitadelStationBot b4d20fc98f Automatic changelog generation for PR #10045 [ci skip] 2019-12-05 22:49:53 -06:00
kevinz000andGitHub 13f43eb783 Merge pull request #10045 from Trilbyspaceclone/patch-241
Makes wallets hold more stuff
2019-12-05 21:49:50 -07:00
kevinz000andGitHub 54be35a243 Merge pull request #9997 from Sishen1542/nuked
removes superspeed from nuka cola
2019-12-05 21:48:34 -07:00
Putnam3145andGitHub 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
CitadelStationBot c8bf77a848 Automatic changelog generation for PR #9975 [ci skip] 2019-12-05 22:47:32 -06:00
kevinz000andGitHub 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
CitadelStationBot 1721fb6e7b Automatic changelog generation for PR #10008 [ci skip] 2019-12-05 22:46:29 -06:00
Putnam3145andGitHub 62c0d59102 Merge pull request #10008 from Seris02/sleepingcarphallucination
adds sleeping carp wrist wrench/violent grab hallucination
2019-12-05 20:46:26 -08:00
CitadelStationBot 8126d08a7b Automatic changelog generation for PR #9990 [ci skip] 2019-12-05 22:45:12 -06:00
kevinz000andGitHub 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
CitadelStationBot c9721a222a Automatic changelog generation for PR #9993 [ci skip] 2019-12-05 22:44:28 -06:00
kevinz000andGitHub 5048995a58 Merge pull request #9993 from Ghommie/Ghommie-cit412
Ports tgstation loom changes, and durathred golems.
2019-12-05 21:44:25 -07:00
CitadelStationBot e47f9007b6 Automatic changelog generation for PR #10049 [ci skip] 2019-12-05 22:43:27 -06:00
kevinz000andGitHub 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
CitadelStationBot f2ebf66d76 Automatic changelog generation for PR #9805 [ci skip] 2019-12-05 22:40:11 -06:00
kevinz000andGitHub b5595114c1 Merge pull request #9805 from Ghommie/Ghommie-cit352
Uplink items are now automatically sorted alphabetically.
2019-12-05 21:40:09 -07:00
CitadelStationBot aa31770360 Automatic changelog generation for PR #9575 [ci skip] 2019-12-05 22:38:33 -06:00
kevinz000andGitHub fbcdc4d330 Merge pull request #9575 from KathrinBailey/Kat'sBoxRework
Box Beautification & Bar Rework & Issue 9706 Fix
2019-12-05 21:38:30 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
CitadelStationBot b320c5cc70 Automatic changelog generation for PR #10019 [ci skip] 2019-12-05 22:29:11 -06:00
kevinz000andGitHub 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
CitadelStationBot 6daffc5080 Automatic changelog generation for PR #10042 [ci skip] 2019-12-05 22:28:26 -06:00
kevinz000andGitHub 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
CitadelStationBot 273c813545 Automatic changelog generation for PR #10033 [ci skip] 2019-12-05 22:28:06 -06:00
kevinz000andGitHub 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
CitadelStationBot 11c4425f65 Automatic changelog generation for PR #10025 [ci skip] 2019-12-05 22:20:00 -06:00
kevinz000andGitHub 29497320c1 Merge pull request #10025 from Linzolle/butchering
refactor butchering component
2019-12-05 21:19:57 -07:00
Ghommie 7958cfa548 Right file 2019-12-06 00:27:50 +01:00
CitadelStationBot 9985be42f1 Automatic changelog generation for PR #9884 [ci skip] 2019-12-05 16:32:19 -06:00
BlackMajorandGitHub b7d0cc6516 Merge pull request #9884 from Useroth/blackpowder-alternative
Black powder fix. Alternative to #9861
2019-12-06 11:32:17 +13:00
CitadelStationBot 95829f65a3 Automatic changelog generation for PR #9372 [ci skip] 2019-12-05 16:29:37 -06:00
BlackMajorandGitHub 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 f74c1d835f removes thing 2019-12-05 20:53:55 +08:00
Seris02 2ce79828b8 ratvar coat updated 2019-12-05 20:46:59 +08:00
CitadelStationBot e9bc9fec60 Automatic changelog generation for PR #9913 [ci skip] 2019-12-04 20:50:24 -06:00
LinandGitHub e3d09ccae8 Merge pull request #9913 from Trilbyspaceclone/crow
Gives the hotel staff some fine silk threads, and adds a new hat
2019-12-05 02:50:21 +00: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
TrilbyspacecloneandGitHub 73891a02bc messenger 2019-12-04 16:56:27 -05:00
Ghommie 07bd51f79a Ports flag for bespoke elements. 2019-12-04 19:38:25 +01:00
TrilbyspacecloneandGitHub 2a591df09a Update wallets.dm 2019-12-04 12:50:18 -05:00
TrilbyspacecloneandGitHub 8ecb920c7f Update bins.dm 2019-12-04 12:20:24 -05:00
Ghommie 3d7ef827a9 better. 2019-12-04 06:31:48 +01:00