Commit Graph

44847 Commits

Author SHA1 Message Date
Hatterhat
02abdd4eef oh i forgot to commit this before i made the pr 2021-09-30 23:22:45 -05:00
Hatterhat
87e1b80000 adds vareditable clip delay 2021-09-30 23:16:19 -05:00
Putnam3145
826ccbe40c Merge pull request #15214 from qweq12yt/grab-bag-bug-fixing
[Fix] Grab bag bug fixing
2021-09-29 18:56:17 -07:00
Changelogs
0011796994 Automatic changelog compile [ci skip] 2021-09-30 00:29:02 +00:00
CitadelStationBot
4c06ca4be9 Automatic changelog generation for PR #15216 [ci skip] 2021-09-29 13:18:13 -05:00
Hatterhat
469387881f live eggs? in 2021? (#15216)
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2021-09-29 20:18:11 +02:00
CitadelStationBot
ed7118d721 Automatic changelog generation for PR #15217 [ci skip] 2021-09-29 11:52:08 -05:00
Putnam3145
a0a9089ce0 Removes "play on same board" from minesweeper (#15217) 2021-09-29 18:52:05 +02:00
Changelogs
c5d0cfccc6 Automatic changelog compile [ci skip] 2021-09-29 00:25:59 +00:00
CitadelStationBot
caf68e62f5 Automatic changelog generation for PR #15218 [ci skip] 2021-09-28 11:01:53 -05:00
silicons
0a97913ce1 Merge pull request #15218 from zeroisthebiggay/NI
fixes a floating fire extinguisher on meta prison thanks kevinz for pressing the wrong button dork
2021-09-28 09:01:50 -07:00
zerothebigboy
8aef919c19 NI 2021-09-28 03:17:46 -04:00
CitadelStationBot
d71d87e40d Automatic changelog generation for PR #15199 [ci skip] 2021-09-28 02:17:26 -05:00
silicons
770942e35d Merge pull request #15199 from zeroisthebiggay/patch-26
removes motivation player lock; halves the motivation's price; allows motivation to discount.
2021-09-28 00:17:23 -07:00
CitadelStationBot
f8de7d1677 Automatic changelog generation for PR #15180 [ci skip] 2021-09-28 02:15:55 -05:00
silicons
5ff4a2ace5 Merge pull request #15180 from LetterN/achives-
Achivement & Clowncar update
2021-09-28 00:15:52 -07:00
CitadelStationBot
b2dcbd3d92 Automatic changelog generation for PR #15188 [ci skip] 2021-09-28 02:15:26 -05:00
silicons
cd579124cb Merge pull request #15188 from buffyuwu/clothingupdate1
ports/adds more edited clothing
2021-09-28 00:15:23 -07:00
CitadelStationBot
2feced78c7 Automatic changelog generation for PR #15189 [ci skip] 2021-09-28 02:15:18 -05:00
silicons
06771cd47a Merge pull request #15189 from zeroisthebiggay/minkraft
a new maintenance ambience
2021-09-28 00:15:16 -07:00
CitadelStationBot
473d768a9d Automatic changelog generation for PR #15191 [ci skip] 2021-09-28 02:14:44 -05:00
silicons
f317e510f7 Merge pull request #15191 from keronshb/ninjaadjustment
Puts the ninja status back into the status window and restores the energy charge meter.
2021-09-28 00:14:42 -07: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
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 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