Commit Graph
34738 Commits
Author SHA1 Message Date
siliconsandGitHub 9c70fa2136 Update configuration.dm 2020-06-24 20:40:57 -07:00
CitadelStationBot 7967424036 Automatic changelog generation for PR #12600 [ci skip] 2020-06-24 22:27:20 -05:00
siliconsandGitHub cd893c60a2 Merge pull request #12600 from Ghommie/Ghommie-cit820
Fixing the snore-pocalypse, and another not so critical issue.
2020-06-24 20:27:16 -07:00
Changelogs 0b180bd1eb Automatic changelog compile [ci skip] 2020-06-25 00:08:04 +00:00
CitadelStationBot e3380c4f70 Automatic changelog generation for PR #12588 [ci skip] 2020-06-24 16:36:10 -05:00
GhomandGitHub 0f3cd7bbd8 Merge pull request #12588 from Citadel-Station-13/Linzolle-patch-1
organs now decay while dead again
2020-06-24 23:36:07 +02:00
CitadelStationBot d832ec14c6 Automatic changelog generation for PR #12599 [ci skip] 2020-06-24 16:35:15 -05:00
GhomandGitHub 11e2e780bb Merge pull request #12599 from Funce/memo-qdel
Add proper deletion to mentor SQL queries
2020-06-24 23:35:11 +02:00
GhomandGitHub 7f00bd54aa Merge pull request #12597 from Citadel-Station-13/silicons-patch-2
adds .json to valid log types for log browsing
2020-06-24 23:33:19 +02:00
Ghommie c0e0226d3c faction check. 2020-06-24 23:18:03 +02:00
Ghommie fe3932a36e Fixing the snore-pocalypse, and another not so critical issue. 2020-06-24 23:08:40 +02:00
Funce 669120ee72 Add proper deletion to mentor SQL queries 2020-06-25 09:05:09 +12:00
siliconsandGitHub 03c9762dcf Update files.dm 2020-06-24 12:11:49 -07:00
CitadelStationBot 38207a6e73 Automatic changelog generation for PR #12581 [ci skip] 2020-06-24 10:44:51 -05:00
siliconsandGitHub 39b58f0057 Merge pull request #12581 from Detective-Google/shunties
prevents shunted AIs from doomsdaying (tg#51284)
2020-06-24 08:44:48 -07:00
CitadelStationBot 03a1ac73ef Automatic changelog generation for PR #12584 [ci skip] 2020-06-24 10:44:42 -05:00
siliconsandGitHub ee0173185b Merge pull request #12584 from Detective-Google/my-face-when-I-sledgehammer-away-missions-uwu
Kicks away mission loot in the teeth
2020-06-24 08:44:38 -07:00
CitadelStationBot 4846227d46 Automatic changelog generation for PR #12582 [ci skip] 2020-06-24 10:44:23 -05:00
siliconsandGitHub e562cef202 Merge pull request #12582 from Detective-Google/gamer-smes
SMESes should now work with self-charging cells (tg#51240)
2020-06-24 08:44:19 -07:00
CitadelStationBot 25f5967c4c Automatic changelog generation for PR #12575 [ci skip] 2020-06-24 10:44:11 -05:00
siliconsandGitHub ac06f037e5 Merge pull request #12575 from dapnee/meme
Wataur Bottle
2020-06-24 08:44:08 -07:00
CitadelStationBot 22926f6266 Automatic changelog generation for PR #12580 [ci skip] 2020-06-24 10:43:59 -05:00
siliconsandGitHub 7d0d5e0b82 Merge pull request #12580 from Detective-Google/ghosts
ghosts now appear at round-end (tg#51572
2020-06-24 08:43:55 -07:00
CitadelStationBot 3b4bc8ec5b Automatic changelog generation for PR #12571 [ci skip] 2020-06-24 10:43:33 -05:00
siliconsandGitHub 3cad6221ca Merge pull request #12571 from Detective-Google/medigygax
Adds the medical-spec gygax
2020-06-24 08:43:30 -07:00
CitadelStationBot b1b74bd291 Automatic changelog generation for PR #12570 [ci skip] 2020-06-24 10:43:07 -05:00
siliconsandGitHub 9f6d0ba10b Merge pull request #12570 from NopemanMcHalt/orvilike_bonus
Adds Kepi and Orvilike Kepi
2020-06-24 08:43:03 -07:00
CitadelStationBot 07c7432f43 Automatic changelog generation for PR #12568 [ci skip] 2020-06-24 09:05:47 -05:00
GhomandGitHub 2b59621833 Merge pull request #12568 from Linzolle/chemmaster
fix analyze function on chem master
2020-06-24 16:05:43 +02:00
LinandGitHub b303c1ebdd hm yes 2020-06-24 02:13:53 +00:00
Linzolle a0d45d49e4 recompile 2020-06-23 20:54:19 -05:00
Linzolle 15be6217bd Merge branch 'master' of github.com:Citadel-Station-13/Citadel-Station-13 into chemmaster 2020-06-23 20:49:12 -05:00
Changelogs 76841b79bc Automatic changelog compile [ci skip] 2020-06-24 00:08:20 +00:00
CitadelStationBot 4a955fde25 Automatic changelog generation for PR #12574 [ci skip] 2020-06-23 17:28:03 -05:00
GhomandGitHub db7c3b1ee3 Merge pull request #12574 from DeltaFire15/random-item-whoopsie
Buying a 'random uplink item' can no longer force objective / class changes
2020-06-24 00:28:00 +02:00
Detective Google 54bad0c600 aeugh 2020-06-22 20:48:33 -05:00
Detective Google 28b0fb41e6 updates config on the repo to match changes (keeps everything blacklisted repo-side tho) 2020-06-22 20:39:14 -05:00
CitadelStationBot ac54e6e17b Automatic changelog generation for PR #12565 [ci skip] 2020-06-22 20:36:20 -05:00
GhomandGitHub b69a31fef1 Merge pull request #12565 from timothyteakettle/some-small-fixes
two small fixes
2020-06-23 03:36:16 +02:00
dapnee 147fd2d953 imagine forgetting a comma
oop
2020-06-22 19:35:27 -06:00
Detective Google 5b0886a150 and that's all folks (for now) 2020-06-22 20:32:12 -05:00
Detective Google a406927c95 euthanizes spacebattle, helps wildwest a little (it's still shit) 2020-06-22 20:31:14 -05:00
GhomandGitHub 89fa7d6d2f Merge pull request #12577 from Citadel-Station-13/silicons-patch-1
removes snore spam
2020-06-23 03:29:01 +02:00
CitadelStationBot 3cac624f14 Automatic changelog generation for PR #12572 [ci skip] 2020-06-22 20:27:15 -05:00
GhomandGitHub 1ade833952 Merge pull request #12572 from DeltaFire15/no-free-nullcrates
Disables the stray syndicate crate event
2020-06-23 03:27:12 +02:00
Detective Google 98756b3bc7 snowdin is wack 2020-06-22 20:24:19 -05:00
CitadelStationBot 4c451d3e14 Automatic changelog generation for PR #12579 [ci skip] 2020-06-22 20:22:15 -05:00
GhomandGitHub 121ec32a2f Merge pull request #12579 from Detective-Google/aeugh
port tg#51713 (no more infinite singulo lattices on da ice)
2020-06-23 03:22:12 +02:00
CitadelStationBot 1033421fd2 Automatic changelog generation for PR #12583 [ci skip] 2020-06-22 20:20:49 -05:00
GhomandGitHub c16381b570 Merge pull request #12583 from Detective-Google/eyepatch
fixes one of the icon states for the diagnostic hud eyepatch
2020-06-23 03:20:46 +02:00