Commit Graph
42980 Commits
Author SHA1 Message Date
keronshb f4ba3aa688 Merge remote-tracking branch 'upstream/master' 2021-05-21 13:04:16 -04:00
Changelogs 7fe075873c Automatic changelog compile [ci skip] 2021-05-21 00:28:37 +00:00
CitadelStationBot 743a4f02d6 Automatic changelog generation for PR #14738 [ci skip] 2021-05-20 13:33:53 -05:00
LinandGitHub 67ea47998c Merge pull request #14738 from Putnam3145/fix-activity-again
Makes antags actually get activity properly
2021-05-20 13:33:51 -05:00
Changelogs f3024d48ea Automatic changelog compile [ci skip] 2021-05-20 00:27:46 +00:00
LinandGitHub acb2177a85 Merge pull request #14732 from Citadel-Station-13/silicons-patch-32
adds _contents() wrapper for SELECT SDQL2 statements
2021-05-19 14:50:18 -05:00
CitadelStationBot a8b5484b48 Automatic changelog generation for PR #14733 [ci skip] 2021-05-19 14:49:03 -05:00
LinandGitHub 0c77834c56 Merge pull request #14733 from qweq12yt/misc-fixes
[Fix] Even More bug fixing
2021-05-19 14:49:00 -05:00
keronshb e6952d43f5 Merge remote-tracking branch 'upstream/master' 2021-05-19 11:47:30 -04:00
CitadelStationBot 3a28e8a7ed Automatic changelog generation for PR #14653 [ci skip] 2021-05-19 09:03:02 -05:00
siliconsandGitHub d0bb22da5f Merge pull request #14653 from timothyteakettle/rp-markings-attempt-two
ports rp's marking system
2021-05-19 08:02:59 -06:00
Changelogs d2c947c414 Automatic changelog compile [ci skip] 2021-05-19 00:27:25 +00:00
Putnam fc31453587 Makes antags actually get activity properly 2021-05-18 16:27:07 -07:00
siliconsandGitHub 18a2182c9a Merge pull request #14720 from zeroisthebiggay/chungus
i fail color theory; makes vegasbunny ears brighter
2021-05-18 17:09:22 -06:00
CitadelStationBot d4b9c514a1 Automatic changelog generation for PR #14725 [ci skip] 2021-05-18 18:09:16 -05:00
siliconsandGitHub 3dc78fa64d Merge pull request #14725 from zeroisthebiggay/baystation
now approaching: Baystation
2021-05-18 17:09:13 -06:00
CitadelStationBot 5fb4cb2003 Automatic changelog generation for PR #14730 [ci skip] 2021-05-18 18:09:07 -05:00
siliconsandGitHub 28c0d2c3cf Merge pull request #14730 from shellspeed1/plumbing-pod
Empty mining capsule pod for all those fun projects which need space.
2021-05-18 17:09:05 -06:00
CitadelStationBot d0c20597f1 Automatic changelog generation for PR #14731 [ci skip] 2021-05-18 18:09:00 -05:00
siliconsandGitHub 898d1d2c7f Merge pull request #14731 from WanderingFox95/WanderingFox95-Efink
The E-Fink (Yes, really)
2021-05-18 17:08:58 -06:00
CitadelStationBot a515911b07 Automatic changelog generation for PR #14727 [ci skip] 2021-05-18 17:44:38 -05:00
siliconsandGitHub 58df45ee3f Merge pull request #14727 from zeroisthebiggay/patch-10
more drink mixture flavortext
2021-05-18 16:44:35 -06:00
CitadelStationBot 66a7201539 Automatic changelog generation for PR #14726 [ci skip] 2021-05-18 17:44:27 -05:00
siliconsandGitHub 80bb2b235b Merge pull request #14726 from zeroisthebiggay/carshalash
ports Amaretto from TG
2021-05-18 16:44:24 -06:00
Changelogs 79051c3e8e Automatic changelog compile [ci skip] 2021-05-18 00:30:35 +00:00
qweq12yt ba20b5b8aa fix emag shuttle order 2021-05-17 18:48:01 -03:00
qweq12yt 9dd372ed11 fix void cloak going to the void 2021-05-17 17:33:23 -03:00
siliconsandGitHub 780a579c7b Update SDQL_2_wrappers.dm 2021-05-17 12:20:15 -07:00
Timothy Teakettle da7c1ddb0a bold statement for someone who didnt test their code 2021-05-17 19:04:51 +01:00
WanderingFox95andGitHub 15053d8064 Backwards Blade Slash. Yeah really. 2021-05-17 12:41:18 +02:00
WanderingFox95andGitHub 502092f284 changed sound path 2021-05-17 12:40:37 +02:00
WanderingFox95andGitHub 57d22c6962 Typo 2021-05-17 12:36:12 +02:00
WanderingFox95andGitHub 7cbe105061 Efink 2021-05-17 12:34:38 +02:00
WanderingFox95andGitHub 499111edf8 Efink 2021-05-17 12:33:39 +02:00
WanderingFox95andGitHub 1d56b9ceda E-Fink 2021-05-17 12:31:46 +02:00
WanderingFox95andGitHub a947ec1322 Recipes 2021-05-17 12:30:01 +02:00
WanderingFox95andGitHub 6a78b3555f Inhands 2021-05-17 12:26:48 +02:00
WanderingFox95andGitHub 957f9ddf23 E-fink Icon 2021-05-17 12:24:54 +02:00
Timothy Teakettle 6d13f09c3d Update preferences.dm 2021-05-17 11:20:47 +01:00
Timothy Teakettle 4cb0eb3418 Update preferences.dm 2021-05-17 10:59:26 +01:00
shellspeed1 5d873cd215 lets see if this fixed that 2021-05-17 01:33:19 -07:00
shellspeed1 d76a0eed04 woops forgot map merge, lets fix that 2021-05-17 01:26:36 -07:00
shellspeed1 e4e5d8f5cd adds an pod for projects 2021-05-17 00:59:10 -07:00
LinandGitHub a9cf6a1818 Merge pull request #14724 from bunny232/master
(not urgent) Deletes a extra nav beacon I left in while fixing the meta bots
2021-05-16 14:05:43 -05:00
Timothy Teakettle 80d287abca index magic moment 2021-05-16 03:10:35 +01:00
Changelogs 340571832b Automatic changelog compile [ci skip] 2021-05-16 00:30:09 +00:00
zeroisthebiggayandGitHub a0b83950ae Update drinks_recipes.dm 2021-05-15 12:03:04 -04:00
zeroisthebiggayandGitHub 03c2f752fa Update drinks_recipes.dm 2021-05-15 11:51:43 -04:00
zeroisthebiggayandGitHub 2bc5edede0 Update drinks_recipes.dm 2021-05-15 09:51:48 -04:00
zeroisthebiggayandGitHub 8166167a45 Update drinks_recipes.dm 2021-05-15 09:44:21 -04:00