Commit Graph

17813 Commits

Author SHA1 Message Date
Ghommie e4d37db02c thanks travis 2019-11-29 05:46:26 +01:00
Ghommie 0bfa2e1438 -hit 2019-11-29 05:36:55 +01:00
Ghommie 77201406bc Oh sh- 2019-11-29 05:35:53 +01:00
Ghommie e6484a22a8 Ports tgstation loom changes, and durathred golems. 2019-11-29 05:34:17 +01:00
Ghommie 65245dafed Fixes ai displays status being reset to "Neutral" on login. 2019-11-29 04:07:56 +01:00
Linzolle 66971236d5 when you forget to hit ctrl+S 2019-11-28 21:02:28 -06:00
Linzolle a940110dee spawn instead of sleep 2019-11-28 20:51:50 -06:00
Ghommie 6cc07c5bc3 Ports the energy gun empty state overlay fix. 2019-11-29 02:59:54 +01:00
Ghommie 340e86e0f4 This is what you get for using magic numbers, assholes! 2019-11-29 02:45:38 +01:00
Linzolle e3439f96f0 strange reagent fix 2019-11-28 18:06:18 -06:00
Ghommie 3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Winter Flare ee55170b3f Fixed Meat Crates 2019-11-28 18:30:43 -05:00
Ghommie c8d3856d73 Sanity 2019-11-28 20:34:41 +01:00
Ghommie f2d6e6b78f Allows people to squeeze it into another container. 2019-11-28 20:31:30 +01:00
Lin a5b5fb729a Merge pull request #9959 from Ghommie/Ghommie-cit397
patching some combat mode edge cases and issues.
2019-11-28 19:16:44 +00:00
Lin 46c02af86e Merge pull request #9948 from Ghommie/Ghommie-cit393
Morgues no longer go "ammunition depleted"
2019-11-28 19:12:25 +00:00
Ghommie 9bef7edd0f Rags are no longer transparent reagent containers. 2019-11-28 19:59:34 +01:00
Ghommie 74baa00634 Ports "#44787" 2019-11-28 19:37:46 +01:00
Putnam3145 09897b4ece Merge pull request #9943 from dapnee/Infiltrate-I-barely-know-her
Ports AI console focus loss fix and fixes an error in my trimline code
2019-11-28 05:37:36 -08:00
Useroth 85a6d588a8 [fix] Extradimensional oranges now actually grow properly and give proper seeds. 2019-11-28 09:26:52 +01:00
Ghommie 60b8688674 Ports "Fixes transit tube barricade spam" 2019-11-28 07:10:00 +01:00
Ghommie e884f606c4 wait, what the fuck! 2019-11-28 05:41:49 +01:00
Ghommie 6194dddf42 I'll hold on this until I port the conveyor_construct conversion to stacks. 2019-11-28 05:40:26 +01:00
Ghommie 0ad89bd9de Merging, tweaking or otherwise removing a few of the stupidest cargo packs. 2019-11-28 05:34:56 +01:00
kevinz000 4551a795e4 Update game_options.dm 2019-11-27 21:20:33 -07:00
kevinz000 9fef2343a7 Update game_options.dm 2019-11-27 21:20:12 -07:00
kevinz000 4719de2830 Update scripture_applications.dm 2019-11-27 21:19:51 -07:00
kevinz000 f776db7ab1 Update game_options.dm 2019-11-27 21:16:42 -07:00
GrayRachnid b6df1126bb Can't I make a PR without having to make 2 commits to fix my mistakes oh my god 2019-11-27 22:52:21 -05:00
Ghommie b66832809e Fixing that tiny gap in human examine. 2019-11-28 04:37:16 +01:00
Unknown 33854e8fd8 Adds a huge amount of Christmas clothes 2019-11-27 20:07:39 -07:00
Ghommie 4a3a7c841a Removes literally atrocious polka dotted accessories. 2019-11-28 03:54:38 +01:00
Linzolle 829cc3d81c Revert "Merge pull request #9613 from Linzolle/hat-toss"
This reverts commit d67b7f620d, reversing
changes made to dabfba8a0d.
2019-11-27 20:23:33 -06:00
Ghommie 1795072f94 Mistakes were made. 2019-11-28 02:47:09 +01:00
Ghommie efcf79aab0 teachin' 🅱️ how to swim 2019-11-28 02:32:43 +01:00
Ghommie 13b9158a44 Ports "Plasmamen get plasma in their box" 2019-11-28 02:30:03 +01:00
Ghommie dd9116ee70 Ports elements: Lightweight shared/global components. 2019-11-28 01:47:20 +01:00
GrayRachnid ad6684380c You can now stack stuff pretty high 2019-11-27 18:39:11 -05:00
GrayRachnid 6a13801c1a I assume this is what ghommie meant 2019-11-27 18:34:36 -05:00
lolman360 dc1c17226d Merge branch 'master' into HeadCorgi 2019-11-28 08:45:19 +11:00
GrayRachnid 47e3cd346f Fixes codewords and MKUltra enthrall hearing. 2019-11-27 16:36:19 -05:00
Ghommie a5298dac7e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310 2019-11-27 21:44:56 +01:00
Ghommie af0110db40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-11-27 21:16:20 +01:00
Ghommie 792f1947a7 Fixes limbs' set_disabled. 2019-11-27 19:45:27 +01:00
Ghommie f9680130f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-11-27 18:48:20 +01:00
Ghommie 252c37f421 whops 2 2019-11-27 08:31:21 +01:00
Ghommie b432ec4f33 Whops 2019-11-27 08:25:13 +01:00
Ghommie a89eccbac5 Ports custom reagent icecreams, plus some fixes. 2019-11-27 08:16:17 +01:00
Ghommie 3f077df500 redundant. 2019-11-27 06:40:32 +01:00
Ghommie d1d201ff26 Sanity check. 2019-11-27 06:39:09 +01:00