Commit Graph

44812 Commits

Author SHA1 Message Date
zerothebigboy 8aef919c19 NI 2021-09-28 03:17:46 -04:00
CitadelStationBot 3ba22fa181 Automatic changelog generation for PR #15206 [ci skip] 2021-09-28 02:13:16 -05:00
silicons d6e7a096e6 Merge pull request #15206 from zeroisthebiggay/metaprison
meta station prison remapping
2021-09-28 00:13:13 -07:00
CitadelStationBot fd5603fad2 Automatic changelog generation for PR #15204 [ci skip] 2021-09-28 02:13:04 -05:00
silicons b7476491d3 Merge pull request #15204 from Hatterhat/clip-delay
shotgun shell clips now have melee click delay (0.8s) with this one weird trick
2021-09-28 00:13:02 -07:00
CitadelStationBot 4afeb89591 Automatic changelog generation for PR #15202 [ci skip] 2021-09-28 02:12:56 -05:00
silicons dd6e2d7240 Merge pull request #15202 from Hatterhat/saiga-ballin
CCS stock safety
2021-09-28 00:12:54 -07:00
CitadelStationBot f630010c22 Automatic changelog generation for PR #15201 [ci skip] 2021-09-28 02:12:47 -05:00
silicons 78d461b58a Merge pull request #15201 from zeroisthebiggay/slur
fixes monkey shuttle brig
2021-09-28 00:12:45 -07:00
CitadelStationBot b6b100db23 Automatic changelog generation for PR #15197 [ci skip] 2021-09-28 01:31:23 -05:00
silicons 3607bbf363 Merge pull request #15197 from Putnam3145/up-min-lavaland-temp
Ups minimum lavaland temperature
2021-09-27 23:31:20 -07:00
CitadelStationBot 27fc1e8cfd Automatic changelog generation for PR #15203 [ci skip] 2021-09-28 01:31:05 -05:00
silicons cefef5b0bc Merge pull request #15203 from zeroisthebiggay/buggers
Fixing (cult) slurring and stuttering never going away from non-carbon mobs.
2021-09-27 23:31:03 -07:00
silicons 6827ec7343 Merge pull request #15213 from Cyberboss/patch-4
Removes a dead var
2021-09-27 23:30:38 -07:00
Changelogs 505b86afbe Automatic changelog compile [ci skip] 2021-09-28 00:26:37 +00:00
Jordan Brown 2db0511d0d Removes a dead var 2021-09-27 12:20:37 -04:00
CitadelStationBot e893141573 Automatic changelog generation for PR #15210 [ci skip] 2021-09-27 10:49:05 -05:00
zeroisthebiggay 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
Hatterhat d3704b845c Merge branch 'master' into saiga-ballin 2021-09-26 21:41:00 -05: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
silicons 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
CitadelStationBot 4e2801a0dd Automatic changelog generation for PR #15200 [ci skip] 2021-09-26 12:04:29 -05:00
Lin 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
silicons 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
zeroisthebiggay be82bd310e Update plaguerat.dm 2021-09-25 19:17:43 -04:00
zeroisthebiggay 58df5b70bf Update plaguerat.dm 2021-09-25 19:09:22 -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
Lin 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
zerothebigboy e6612e3f15 lol lmao kek wtf 2021-09-24 19:32:08 -04:00
zeroisthebiggay 72cb19eb3f Update space.dm 2021-09-24 19:15:32 -04:00
zeroisthebiggay 5366a09c8b Update spaceRuinBlacklist.txt 2021-09-24 18:38:58 -04:00
zeroisthebiggay c633c95919 Update space.dm 2021-09-24 18:35:49 -04:00
Changelogs 70cdd264dc Automatic changelog compile [ci skip] 2021-09-24 00:26:31 +00:00
CitadelStationBot 7623ea9558 Automatic changelog generation for PR #15183 [ci skip] 2021-09-23 12:20:18 -05:00
zeroisthebiggay 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
Lin 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
Lin 4e9e98367f Merge pull request #15190 from buffyuwu/canvas
adds art supplies to the fun vendor
2021-09-22 14:49:57 -05:00
buffyuwu 2522b84667 ports a downstream fix of accordions
while fixing this downstream at fortuna i realized we hadn't fixed this upstream whee
2021-09-22 01:56:13 -04:00
Changelogs 989888fb24 Automatic changelog compile [ci skip] 2021-09-22 00:26:18 +00:00