Commit Graph

10522 Commits

Author SHA1 Message Date
Hatterhat d27150331a fast hands 2019-11-11 18:59:31 -06:00
Ghommie 388a7579b9 A few minor clock cult improvements. 2019-11-12 01:49:36 +01:00
Ghommie 29114de3f1 The actual waterflower, am I funny yet? 2019-11-12 00:47:36 +01:00
Ghommie 19a511929d and "Replaces the slime extract in the clown biodome with a superlube sprayer." 2019-11-11 23:39:03 +01:00
Ghommie 42d9e3cf51 Porting Robustin's Syndicate Infiltrator PR 2019-11-11 18:49:18 +01:00
TrilbySpaceClone 6e328ea1b1 art of the deal 2019-11-11 07:26:12 -05:00
Ghommie e0afed1f8e QoL dullahan ahealing. 2019-11-11 00:39:19 +01:00
Ghommie 4c1eba0d81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-11-10 23:52:48 +01:00
Ghommie e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
Ghommie 1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
kevinz000 c4849ead74 Merge pull request #9727 from BlackMajor/Yeehaw
Fixes ED209 Assemblies sometimes advancing to an invalid build stage.
2019-11-10 11:46:03 -07:00
kevinz000 39e55edcb3 Merge pull request #9734 from Ghommie/Ghommie-cit324
Ports CEV-eris delivery packages sprites, also dunking old syndie cybernetics box sprite.
2019-11-10 11:45:47 -07:00
kevinz000 07447917de Merge pull request #9744 from Seris02/meteorhallucinations
makes meteor hallucinations have an ETA now
2019-11-10 11:44:41 -07:00
kevinz000 95b98a5133 Merge pull request #9746 from Ghommie/Ghommie-cit328
Ports "Cleans up the new alt clicking functionality" from /tg/
2019-11-10 11:43:41 -07:00
kevinz000 48fb3a0f08 Merge pull request #9694 from kappa-sama/hosnowflake
Buffs security, nerfs antags
2019-11-10 11:40:41 -07:00
kevinz000 92455b5b8c Merge pull request #9695 from Ghommie/Ghommie-cit311
Unmodularize and update pAI/Intellicards very slighty.
2019-11-10 11:40:14 -07:00
kevinz000 814321beeb Merge pull request #9696 from Ghommie/Ghommie-cit312
clock welder overlay fix.
2019-11-10 11:39:54 -07:00
kevinz000 d1f6483687 Merge pull request #9704 from Ghommie/Ghommie-cit314
Minor ninja tweaks and stealth nerf.
2019-11-10 11:31:25 -07:00
kevinz000 e0626d12b1 Merge pull request #9707 from BonniePandora/Weldhelmets
Port Welding Hard Hats from /tg/
2019-11-10 11:30:54 -07:00
kevinz000 487e1806e7 Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3
Adds 8 more sci crates to cargo
2019-11-10 11:30:33 -07:00
kevinz000 7b6604108f Merge pull request #9713 from Trilbyspaceclone/sprite-issues
Makes catnip have sprites
2019-11-10 11:28:49 -07:00
kevinz000 23cd6b7604 Merge pull request #9714 from Ghommie/Ghommie-cit315
Fixing a few throw_at calls and modular computer processors Init.
2019-11-10 11:28:26 -07:00
kevinz000 1493863533 Merge pull request #9716 from Ghommie/Ghommie-cit317
Porting objective code refactor (ergo fixing abductors/abductees objective by updating the code)
2019-11-10 11:27:04 -07:00
kevinz000 c46b425402 Merge pull request #9719 from Ghommie/Ghommie-cit318
Renames is_hot and is_sharp to get_temperature and get_sharpness, just like how ol tg did.
2019-11-10 11:26:06 -07:00
kevinz000 4fc10d436d Merge pull request #9721 from Ghommie/Ghommie-cit319
Unmodularize secway and turfs
2019-11-10 11:25:50 -07:00
kevinz000 3570df6084 Merge pull request #9726 from Ghommie/Ghommie-cit323
Fixing several minor runtimes.
2019-11-10 11:10:16 -07:00
BlackMajor 2c9af44ce3 Merge pull request #9724 from Ghommie/Ghommie-cit322
Fixes free real estate paraplegic trait and bolas.
2019-11-10 17:10:45 +13:00
Ghommie 279c22b781 lentext to length. 2019-11-09 23:17:04 +01:00
Ghommie d2b1ce4181 Unused. 2019-11-09 23:05:16 +01:00
Ghommie 9591bb5471 porting "global to static" 2019-11-09 22:53:56 +01:00
Ghommie 297ee03175 Ports "Cleans up the new alt clicking functionality" from /tg/ 2019-11-08 19:25:09 +01:00
Seris02 a5a483fb8a makes meteor hallucinations have an ETA now 2019-11-08 19:55:27 +08:00
BlackMajor aaff0bf9e7 Merge pull request #9705 from kappa-sama/patch-4
thanks major
2019-11-08 14:17:59 +13:00
BlackMajor a6bbe75c36 Merge pull request #9611 from Citadel-Station-13/supply-passive-gen
Adds passive point generation to cargo. Nerfs miasma selling. Increases mindshield crate price.
2019-11-08 14:17:17 +13:00
Ghommie b2b1390bd3 Ports techweb backend refactor & co. 2019-11-07 05:07:38 +01:00
TrilbySpaceClone 0662245d80 corrections 2019-11-06 22:52:44 -05:00
Ghommie ae6e50b081 resprited delivery packages. 2019-11-06 18:27:33 +01:00
BlackMajor 026f9758b9 Actually wait that's way simpler 2019-11-06 12:55:25 +13:00
BlackMajor 960de09a96 Oh there's even more 2019-11-06 12:49:50 +13:00
BlackMajor 9efddbe580 thank you dark souls 2019-11-06 12:47:21 +13:00
Ghommie 97dd0bd70c Yes. 2019-11-05 23:13:10 +01:00
Ghommie 892b66470b Fixing several minor runtimes. 2019-11-05 23:07:29 +01:00
Ghommie ae9ff92d33 Fixes free real estate paraplegic trait and bolas. 2019-11-05 18:03:50 +01:00
Anonymous 0849ea365f Merge branch 'master' into assu 2019-11-05 15:45:04 +03:00
Winter Flare 4b6d9848ff Update assistant.dm 2019-11-05 01:44:15 -05:00
Winter Flare 74b5961a8d Removed an unneeded line, added gas masks 2019-11-05 01:43:38 -05:00
Winter Flare 87695c0a21 Moved some stuff around, added some more.
Moved Strange Objects and Sunglasses into silly.dm, modified a few of the bounty prices.
2019-11-05 00:22:22 -05:00
Ghommie 9cac543a2b Unmodularize secway and turfs 2019-11-05 05:47:25 +01:00
Ghommie a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Trilbyspaceclone 09cd439f85 so dumb that github suggestions brake " 2019-11-04 17:24:37 -05:00