Commit Graph
25486 Commits
Author SHA1 Message Date
kevinz000andGitHub 8920930679 Merge pull request #9765 from dapnee/let's-fix-lockers
Ports Closet & Crate Initialization Fixes
2019-11-12 23:57:39 -07:00
CitadelStationBot 5e38fd4465 Automatic changelog generation for PR #9772 [ci skip] 2019-11-13 00:56:04 -06:00
kevinz000andGitHub a16219d97a Merge pull request #9772 from DeltaFire15/weh
Adds eight new plushies to the game while integrating kevs' plush PR
2019-11-12 23:56:01 -07:00
CitadelStationBot f520bdef5c Automatic changelog generation for PR #9779 [ci skip] 2019-11-13 00:52:04 -06:00
kevinz000andGitHub 2325cf1547 Merge pull request #9779 from Ghommie/Ghommie-cit341
A few clock cult improvements.
2019-11-12 23:51:58 -07:00
Ghommie 2b8b8882fb You are actually rifght, that's bad. 2019-11-12 15:49:20 +01:00
DeltaFire 4d4d495765 Hmm I wonder if anyone would notice if I smuggled another plush into this PR
What it says on the tin, got asked via dms to add another plush to my PR so here we go.
Char is Minty.
2019-11-12 15:32:06 +01:00
Ghommie a18bcd05d7 makes it compile. 2019-11-12 02:38:45 +01:00
Ghommie 0b7437359a Dynamic. 2019-11-12 01:57:33 +01:00
Ghommie 388a7579b9 A few minor clock cult improvements. 2019-11-12 01:49:36 +01:00
DeltaFire 421be859fb Ok nice typo gang 2019-11-11 21:08:32 +01:00
DeltaFire 51aacedb9f Little fix 2019-11-11 18:17:07 +01:00
DeltaFire 3d2986fd06 Fixes the sin plush sprite + MORE PLUSHIES
What it says on the label, fixes the sin plushie sprite as the size was wrong previously and adds two more lizzers

Also fixes a typo weh
2019-11-11 17:32:06 +01:00
DeltaFire 1c6c188033 Exo plush
Adds a AI plushie for exo since this PR is slowly getting filled with plushies
guaranteered non-malf!
2019-11-11 01:05:16 +01:00
DeltaFire 56720ea99c Merging kevinz's plush PR into mine
Adds the kara plushie, the new skylar sprite and the trillby fix into the code, all without any missing syntax elements! Yay!
2019-11-10 22:27:06 +01:00
Dap 041c35202b Ports Closet & Crate Initialization Fixes
Ports a similarly named pull request (thank you cool cat).
2019-11-10 14:17:34 -07:00
kevinz000andGitHub 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
CitadelStationBot 355ea71705 Automatic changelog generation for PR #9734 [ci skip] 2019-11-10 12:45:49 -06:00
kevinz000andGitHub 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
kevinz000andGitHub d9fd6cd176 Merge pull request #9735 from Ghommie/Ghommie-cit325
Unmodularizing 2/3 of the sounds folder.
2019-11-10 11:45:28 -07:00
CitadelStationBot 9f1f300b22 Automatic changelog generation for PR #9744 [ci skip] 2019-11-10 12:44:43 -06:00
kevinz000andGitHub 07447917de Merge pull request #9744 from Seris02/meteorhallucinations
makes meteor hallucinations have an ETA now
2019-11-10 11:44:41 -07:00
CitadelStationBot 17a2a1fb6e Automatic changelog generation for PR #9745 [ci skip] 2019-11-10 12:44:19 -06:00
kevinz000andGitHub 76e31a2799 Merge pull request #9745 from Ghommie/Ghommie-cit327
rad flags fixes.
2019-11-10 11:44:17 -07:00
CitadelStationBot 1aac141fa2 Automatic changelog generation for PR #9746 [ci skip] 2019-11-10 12:43:44 -06:00
kevinz000andGitHub 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
CitadelStationBot 660aff7b3e Automatic changelog generation for PR #9694 [ci skip] 2019-11-10 12:40:43 -06:00
kevinz000andGitHub 48fb3a0f08 Merge pull request #9694 from kappa-sama/hosnowflake
Buffs security, nerfs antags
2019-11-10 11:40:41 -07:00
CitadelStationBot 84d2113e36 Automatic changelog generation for PR #9695 [ci skip] 2019-11-10 12:40:17 -06:00
kevinz000andGitHub 92455b5b8c Merge pull request #9695 from Ghommie/Ghommie-cit311
Unmodularize and update pAI/Intellicards very slighty.
2019-11-10 11:40:14 -07:00
CitadelStationBot 8d307b00a2 Automatic changelog generation for PR #9696 [ci skip] 2019-11-10 12:39:57 -06:00
kevinz000andGitHub 814321beeb Merge pull request #9696 from Ghommie/Ghommie-cit312
clock welder overlay fix.
2019-11-10 11:39:54 -07:00
kevinz000andGitHub e8219dd9f7 Merge pull request #9697 from Poojawa/patch-1
Better Health Analyzer formatting
2019-11-10 11:35:07 -07:00
kevinz000andGitHub c3dd0ad388 Merge pull request #9700 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/lodash.merge-4.6.2
Bump lodash.merge from 4.6.1 to 4.6.2 in /tgui
2019-11-10 11:32:51 -07:00
kevinz000andGitHub 152938f0b1 Merge pull request #9701 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/mixin-deep-1.3.2
Bump mixin-deep from 1.3.1 to 1.3.2 in /tgui
2019-11-10 11:32:27 -07:00
kevinz000andGitHub c3ff605b5c Merge pull request #9702 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/lodash-4.17.15
Bump lodash from 4.17.11 to 4.17.15 in /tgui
2019-11-10 11:32:12 -07:00
CitadelStationBot a7c34c4865 Automatic changelog generation for PR #9704 [ci skip] 2019-11-10 12:31:27 -06:00
kevinz000andGitHub d1f6483687 Merge pull request #9704 from Ghommie/Ghommie-cit314
Minor ninja tweaks and stealth nerf.
2019-11-10 11:31:25 -07:00
kevinz000andGitHub e0626d12b1 Merge pull request #9707 from BonniePandora/Weldhelmets
Port Welding Hard Hats from /tg/
2019-11-10 11:30:54 -07:00
CitadelStationBot 38a37d5fea Automatic changelog generation for PR #9709 [ci skip] 2019-11-10 12:30:35 -06:00
kevinz000andGitHub 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
CitadelStationBot b799cee58f Automatic changelog generation for PR #9710 [ci skip] 2019-11-10 12:29:53 -06:00
kevinz000andGitHub 5bb23126e9 Merge pull request #9710 from Trilbyspaceclone/changelong_messing
Changelong Update - as well as a Pr to close a buch of issues
2019-11-10 11:29:45 -07:00
CitadelStationBot b162c764f4 Automatic changelog generation for PR #9713 [ci skip] 2019-11-10 12:28:51 -06:00
kevinz000andGitHub 7b6604108f Merge pull request #9713 from Trilbyspaceclone/sprite-issues
Makes catnip have sprites
2019-11-10 11:28:49 -07:00
kevinz000andGitHub 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
CitadelStationBot f7e1c65c2c Automatic changelog generation for PR #9715 [ci skip] 2019-11-10 12:27:38 -06:00
kevinz000andGitHub 501dfbb43a Merge pull request #9715 from Ghommie/Ghommie-cit316
Ports CEV-Eris resprited matchbox, also respriting cigar boxes myself.
2019-11-10 11:27:36 -07:00
CitadelStationBot d47d9633d2 Automatic changelog generation for PR #9716 [ci skip] 2019-11-10 12:27:06 -06:00
kevinz000andGitHub 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