Commit Graph
44997 Commits
Author SHA1 Message Date
qweq12yt f34da8b1dc restore auxmos 2021-09-27 18:03:52 -03:00
qweq12yt 4e8b02dd75 restored the serving tray to the autholathes 2021-09-27 17:38:28 -03:00
qweq12yt 0bb9b23537 restore spray bottle sounds 2021-09-27 17:32:07 -03:00
qweq12yt 91a738fb9e fix canisters 2021-09-27 17:17:16 -03:00
qweq12yt 380e62bdb6 replace auxmos 2021-09-27 16:22:19 -03:00
Jordan BrownandGitHub 2db0511d0d Removes a dead var 2021-09-27 12:20:37 -04:00
WanderingFox95andGitHub 4e87044845 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-27 18:15:34 +02:00
CitadelStationBot e893141573 Automatic changelog generation for PR #15210 [ci skip] 2021-09-27 10:49:05 -05:00
zeroisthebiggayandGitHub 41169d4366 helter skelter fixes so it doesn't break comms and does not come with a fucking uplink (#15210)
* .

* .
2021-09-27 17:49:01 +02:00
HatterhatandGitHub d3704b845c Merge branch 'master' into saiga-ballin 2021-09-26 21:41:00 -05:00
keronshb 3bda0e9015 Pirate fix 2021-09-26 21:00:48 -04:00
Changelogs 1992bf7cfb Automatic changelog compile [ci skip] 2021-09-27 00:26:02 +00:00
CitadelStationBot 11e70bf044 Automatic changelog generation for PR #15205 [ci skip] 2021-09-26 15:30:43 -05:00
siliconsandGitHub ec3fbed5bb Merge pull request #15205 from zeroisthebiggay/patch-28
fixes code\modules\mob\living\simple_animal\hostile\plaguerat.dm:139:warning: newmouse: variable defined but not used
2021-09-26 13:30:40 -07:00
keronshb 5da5ac396c Head blacklist for antag 2021-09-26 14:29:46 -04:00
CitadelStationBot 4e2801a0dd Automatic changelog generation for PR #15200 [ci skip] 2021-09-26 12:04:29 -05:00
LinandGitHub 27aaaecb52 Merge pull request #15200 from zeroisthebiggay/patch-27
fixes yet another emeraldsundisk map pr which was not spawning because the Ruin Didn't Actually Exist.
2021-09-26 12:04:27 -05:00
siliconsandGitHub 6c00bb8dce Update living_blocking_parrying.dm (#15208) 2021-09-26 15:41:09 +02:00
zerothebigboy 02c705fd6a lmao 2021-09-25 21:04:49 -04:00
zeroisthebiggayandGitHub be82bd310e Update plaguerat.dm 2021-09-25 19:17:43 -04:00
zeroisthebiggayandGitHub 58df5b70bf Update plaguerat.dm 2021-09-25 19:09:22 -04:00
keronshb af2777a604 Citadel weight adjustments and config 2021-09-25 17:56:15 -04:00
keronshb fb5653e12c Voting fix 2021-09-25 12:59:18 -04:00
Hatterhat e141df3600 weirdchamp 2021-09-24 23:16:46 -05:00
Hatterhat fd6e97b935 grr 2021-09-24 23:08:15 -05:00
zerothebigboy 3e1f5326e3 buggers 2021-09-24 22:25:53 -04:00
Changelogs 53f75ec0cf Automatic changelog compile [ci skip] 2021-09-25 00:26:03 +00:00
CitadelStationBot 410bac5685 Automatic changelog generation for PR #15192 [ci skip] 2021-09-24 19:14:16 -05:00
LinandGitHub c991a3004a Merge pull request #15192 from buffyuwu/accordion
ports a downstream fix of accordions
2021-09-24 19:14:14 -05:00
Hatterhat 784cd2ca7d ballin 2021-09-24 19:12:04 -05:00
keronshb a6bfff92cc Fixes pirates, re adds extended, re adds voting 2021-09-24 19:40:56 -04:00
zerothebigboy e6612e3f15 lol lmao kek wtf 2021-09-24 19:32:08 -04:00
zeroisthebiggayandGitHub 72cb19eb3f Update space.dm 2021-09-24 19:15:32 -04:00
zeroisthebiggayandGitHub 5366a09c8b Update spaceRuinBlacklist.txt 2021-09-24 18:38:58 -04:00
zeroisthebiggayandGitHub c633c95919 Update space.dm 2021-09-24 18:35:49 -04:00
zeroisthebiggayandGitHub 662807042d Update uplink_dangerous.dm 2021-09-23 22:14:09 -04:00
Changelogs 70cdd264dc Automatic changelog compile [ci skip] 2021-09-24 00:26:31 +00:00
keronshb cbe221e18f Adds more blackbox stuff 2021-09-23 19:57:51 -04:00
keronshb c9697f4bbf Fixes dynamic 2021-09-23 19:38:15 -04:00
WanderingFox95andGitHub 0e3a522942 Fix. 2021-09-24 01:02:45 +02:00
WanderingFox95andGitHub 84f1b6a7a4 these too 2021-09-24 01:02:27 +02:00
WanderingFox95andGitHub f2075db4df put these in the wrong place. 2021-09-24 01:02:17 +02:00
WanderingFox95andGitHub 9464ad8061 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-24 00:59:57 +02:00
CitadelStationBot 7623ea9558 Automatic changelog generation for PR #15183 [ci skip] 2021-09-23 12:20:18 -05:00
zeroisthebiggayandGitHub 7ba7f0d1c1 gremlins become shock immune (#15183)
* Update gremlin.dm

* Update gremlin.dm
2021-09-23 19:20:15 +02:00
Putnam3145 a4adf41c7c Ups minimum lavaland temperature 2021-09-22 18:43:45 -07:00
Changelogs fc73e2944f Automatic changelog compile [ci skip] 2021-09-23 00:27:37 +00:00
CitadelStationBot ae4f7076dc Automatic changelog generation for PR #15187 [ci skip] 2021-09-22 14:50:30 -05:00
LinandGitHub f8ac9af6d0 Merge pull request #15187 from KrabSpider/krabgenics
blacklists cryogenics from anomaly spawns
2021-09-22 14:50:28 -05:00
CitadelStationBot e8617448ef Automatic changelog generation for PR #15190 [ci skip] 2021-09-22 14:50:00 -05:00