Commit Graph
34621 Commits
Author SHA1 Message Date
Detective Google 6ec28cd914 some cog touchups 2020-06-14 16:26:19 -05:00
Timothy Teakettle 1568c83837 Update medbot.dm 2020-06-14 21:58:50 +01:00
CitadelStationBot c7f6393bda Automatic changelog generation for PR #12516 [ci skip] 2020-06-14 14:54:33 -05:00
LinandGitHub 47adbd3e90 Merge pull request #12516 from kevinz000/vv_fix
Fixes VV not allowing proper access to datums in associative lists. Upgrades SDQL2 printout for the 3rd? 4th? 5th? time
2020-06-14 14:54:29 -05:00
CitadelStationBot 0570d5321e Automatic changelog generation for PR #12502 [ci skip] 2020-06-14 14:37:15 -05:00
LinandGitHub 894e6c7459 Merge pull request #12502 from kevinz000/shaps_is_once_again_based
Port - Lets you tape knives to cleanbots. You know, if you really want to. #47590/tgstation/Ryll-Ryll
2020-06-14 14:37:10 -05:00
CitadelStationBot cc3005cecd Automatic changelog generation for PR #12515 [ci skip] 2020-06-14 14:36:07 -05:00
LinandGitHub 923cb248d2 Merge pull request #12515 from kevinz000/roomba
Zoombas
2020-06-14 14:36:03 -05:00
CitadelStationBot 21f983c182 Automatic changelog generation for PR #12519 [ci skip] 2020-06-14 14:29:23 -05:00
LinandGitHub bd50f3a143 Merge pull request #12519 from Citadel-Station-13/kevinz000-patch-19
fixes plushies sprite loading
2020-06-14 14:29:19 -05:00
Timothy Teakettle 1c2366cc3d update files to tgs 2020-06-14 18:16:01 +01:00
Detective Google a7948b1a3e empty commit to reroll bots 2020-06-13 22:36:35 -05:00
Detective Google 6b6c5c6ecd don't go gently into the night, sweet prince. 2020-06-13 22:25:18 -05:00
Detective Google fa5bae14f1 no 100% chance doomsday :^) 2020-06-13 22:14:23 -05:00
Changelogs 065ca5d2fa Automatic changelog compile [ci skip] 2020-06-14 00:08:42 +00:00
kevinz000andGitHub fd076ec7bb Update cleanbot.dm 2020-06-13 16:19:32 -07:00
kevinz000andGitHub f2e905cb83 Update lobotomy.dm 2020-06-13 16:06:18 -07:00
kevinz000andGitHub 433b42957c Update severe.dm 2020-06-13 14:14:00 -07:00
kevinz000andGitHub 6bfdb762d4 Update tackle.dm 2020-06-13 14:13:01 -07:00
kevinz000andGitHub 398651626d Update plushes.dm 2020-06-13 13:31:33 -07:00
kevinz000andGitHub db9a96a4ed webedit moment 2020-06-13 13:24:28 -07:00
kevinz000andGitHub c2d0763aac Update defines.txt 2020-06-13 13:21:53 -07:00
kevinz000andGitHub b81b2bc044 Delete plushie_config.txt 2020-06-13 13:21:13 -07:00
kevinz000andGitHub 6230e11f16 Update plushes.dm 2020-06-13 13:19:32 -07:00
kevinz000andGitHub 2544f6c5a4 Update severe.dm 2020-06-13 13:17:16 -07:00
kevinz000andGitHub 49feb22b4d Update tackle.dm 2020-06-13 13:15:53 -07:00
kevinz000andGitHub 9229c1dc0d Update lobotomy.dm 2020-06-13 13:12:54 -07:00
kevinz000andGitHub 278dfab74a Update plushes.dm 2020-06-13 13:10:14 -07:00
kevinz000 8162303bad Merge remote-tracking branch 'citadel/master' into pp_fix 2020-06-13 12:03:01 -07:00
kevinz000andGitHub 6f1dd34c91 Update plushes.dm 2020-06-13 11:57:11 -07:00
kevinz000 3752aecfdb fix 2020-06-13 11:30:37 -07:00
kevinz000 180b7d31d9 sigh 2020-06-13 09:24:22 -07:00
CitadelStationBot 4a59066e43 Automatic changelog generation for PR #12505 [ci skip] 2020-06-12 21:28:35 -05:00
LinandGitHub d73b2b8635 Merge pull request #12505 from deathride58/morelgbtholidays
Adds more LGBTQIA+ related holidays
2020-06-12 21:28:32 -05:00
CitadelStationBot 7a831f5512 Automatic changelog generation for PR #12510 [ci skip] 2020-06-12 21:27:07 -05:00
GhomandGitHub 834432d59f Merge pull request #12510 from TheObserver-sys/Finally!AUseForPeas!
Finally, A use for peas!
2020-06-13 04:27:04 +02:00
CitadelStationBot a9b979ce90 Automatic changelog generation for PR #12514 [ci skip] 2020-06-12 21:25:53 -05:00
GhomandGitHub 67c9ff4026 Merge pull request #12514 from Citadel-Station-13/kevinz000-patch-18-1
the abstract idea of shadows can no longer be radioactive
2020-06-13 04:25:50 +02:00
kevinz000 3dbfc6ddf2 better support 2020-06-12 18:50:57 -07:00
kevinz000 9a08623308 sigh 2020-06-12 18:39:45 -07:00
kevinz000 e2aab5c1a5 css is really hard folks 2020-06-12 18:01:53 -07:00
kevinz000 e1a1dc61f6 this is ugly and i hate it 2020-06-12 17:50:23 -07:00
kevinz000 78e153cbe4 is this better 2020-06-12 17:32:17 -07:00
kevinz000 8e6dee515a null isn't an object 2020-06-12 17:16:36 -07:00
kevinz000 be6ea51f19 closing 2020-06-12 17:11:29 -07:00
CitadelStationBot f6ebb0b1c3 Automatic changelog generation for PR #12498 [ci skip] 2020-06-12 19:08:13 -05:00
GhomandGitHub 77c428479e changes the inefficient attack message string and threshold. (#12498) 2020-06-12 17:08:10 -07:00
CitadelStationBot 584a1428d5 Automatic changelog generation for PR #12503 [ci skip] 2020-06-12 19:08:03 -05:00
GhomandGitHub 37294fd4b7 Fixing wrong helmet type for old beserker hardsuit (#12503) 2020-06-12 17:07:59 -07:00
CitadelStationBot c32b0387db Automatic changelog generation for PR #12506 [ci skip] 2020-06-12 19:07:51 -05:00