Commit Graph
34806 Commits
Author SHA1 Message Date
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
Detective Google 46805bc872 more progress 2020-06-22 20:11:18 -05:00
Detective Google a8b6bb7957 step 2; de-looting the caves 2020-06-22 19:46:48 -05:00
Detective Google dc81519380 whoops me forget to hit save first 2020-06-22 19:29:01 -05:00
Detective Google d4dd1a162a loot-yeet #1; wizard academy 2020-06-22 19:28:47 -05:00
dapnee 1b8ab9799d Update cola.dm
adds wataur to cola machine
2020-06-22 18:17:21 -06:00
Detective Google 09051189a3 fixes one of the icon states for the diagnostic hud eyepatch 2020-06-22 18:37:28 -05:00
Detective-GoogleandGitHub 29ab16c3ed Update mechfabricator_designs.dm 2020-06-22 18:27:58 -05:00
dapnee a899bde0ba Let's try again
aaaaaaaaa
2020-06-22 15:25:42 -06:00
dapnee e63f6aed42 Merge remote-tracking branch 'upstream/master' into meme 2020-06-22 15:15:28 -06:00
Detective Google 7d8da1df0b empty commit to reroll bots 2020-06-22 16:03:08 -05:00
Detective Google 099f594a30 SMESes should now work with self-charging cells (tg#51240) 2020-06-22 15:56:51 -05:00
Detective Google 715b1f85da prevents shunted AIs from doomsdaying (tg#51284) 2020-06-22 15:53:55 -05:00
Detective Google da68163c80 ghosts now appear at round-end 2020-06-22 15:43:32 -05:00
Detective Google 472ed97b8c port tg#51713 2020-06-22 15:32:23 -05:00
siliconsandGitHub 78df740d19 Update debuffs.dm 2020-06-22 13:24:36 -07:00
dapnee 0f15b0ce84 hey look, I'm finished with a single meme item
hahaha
2020-06-21 18:49:58 -06:00
LinandGitHub a0a4007332 Merge pull request #12567 from Citadel-Station-13/kevinz000-patch-5
Slime color changing now has 65536 possible colors instead of 256
2020-06-21 19:37:54 -05:00
dapnee cfff6677b4 wataur
hahaha, imagine if this worked
2020-06-21 18:14:34 -06:00
Changelogs dc75f56378 Automatic changelog compile [ci skip] 2020-06-22 00:08:41 +00:00
CitadelStationBot 2920a89791 Automatic changelog generation for PR #12557 [ci skip] 2020-06-21 18:33:02 -05:00
LinandGitHub 2cd18f3dba Merge pull request #12557 from silicons/life
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
2020-06-21 18:32:58 -05:00
CitadelStationBot 80ec5b12f8 Automatic changelog generation for PR #12561 [ci skip] 2020-06-21 16:11:13 -05:00
siliconsandGitHub 99a7c49e52 Merge pull request #12561 from shellspeed1/Ports-kyro-chems
Ports IV bags from TG
2020-06-21 14:11:10 -07:00
CitadelStationBot 94cfb4ba22 Automatic changelog generation for PR #12488 [ci skip] 2020-06-21 16:10:49 -05:00
siliconsandGitHub 8cd81ff89b Merge pull request #12488 from Ghommie/Ghommie-cit813
Porting Cargo small-order support, cargo goodies packs, beating vendors for loot/squish.
2020-06-21 14:10:45 -07:00
siliconsandGitHub 753fcbb84a Merge pull request #12556 from Detective-Google/bald-bald-bald-bald-bald-bald-bald
Ports the reworked snowcabin and beach away missions
2020-06-21 14:10:29 -07:00
Timothy Teakettle 983aac10a2 fixes it properly 2020-06-21 17:39:36 +01:00
Anonymous 9e7b884e86 Adds remaining TOSOrvikepi 2020-06-21 13:25:23 +03:00
Anonymous 384e951b1c Merge branch 'master' into orvilike_bonus 2020-06-21 12:03:28 +03:00
DeltaFire 82d21e4824 smol fix 2020-06-21 03:44:12 +02:00
Changelogs 36c46c3c4c Automatic changelog compile [ci skip] 2020-06-21 00:08:22 +00:00
shellspeed1 06f0d42ee9 makes chem packs slightly cheaper 2020-06-20 16:53:39 -07:00