Commit Graph

29637 Commits

Author SHA1 Message Date
Putnam3145 dc22e02a1b Removes minesweeper 2021-10-01 23:08:08 -07:00
WanderingFox95 83987db48a Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-10-01 18:51:46 +02:00
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
Hatterhat 1d005db9a8 THE YEEHAW UPDATE 2021-09-30 23:10:33 -05:00
keronshb deaab16e55 Ninja hijack in dynamic 2021-09-30 23:49:51 -04:00
keronshb 65d2bf3d33 Better round end report 2021-09-30 19:00:00 -04:00
keronshb 4e91dde6b0 Timer fix and dead list removal 2021-09-30 14:50:04 -04:00
keronshb fa193aabfa End Report threat 2021-09-30 14:43:13 -04: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
Putnam3145 a0a9089ce0 Removes "play on same board" from minesweeper (#15217) 2021-09-29 18:52:05 +02:00
silicons 0a75925df9 wack 2021-09-29 06:02:17 -07:00
raspy-on-osu c7020972ae init 2021-09-28 21:09:34 -04:00
SandPoot b23b88524d Upload files 2021-09-28 22:03:17 -03: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
silicons 5ff4a2ace5 Merge pull request #15180 from LetterN/achives-
Achivement & Clowncar update
2021-09-28 00:15:52 -07:00
silicons cd579124cb Merge pull request #15188 from buffyuwu/clothingupdate1
ports/adds more edited clothing
2021-09-28 00:15:23 -07:00
silicons 06771cd47a Merge pull request #15189 from zeroisthebiggay/minkraft
a new maintenance ambience
2021-09-28 00:15:16 -07: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
silicons d6e7a096e6 Merge pull request #15206 from zeroisthebiggay/metaprison
meta station prison remapping
2021-09-28 00:13:13 -07: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
silicons dd6e2d7240 Merge pull request #15202 from Hatterhat/saiga-ballin
CCS stock safety
2021-09-28 00:12:54 -07: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
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
keronshb 5868c90fe8 Wizard fixes 2021-09-27 22:28:44 -04:00
silicons 0ec7e92f82 that too 2021-09-27 17:44:14 -07:00
silicons b064d73b95 that too 2021-09-27 17:43:42 -07:00
silicons 697ea7ad93 fix 2021-09-27 17:40:53 -07:00
keronshb eb548eb9b3 Fixes antag prefs breaking 2021-09-27 20:03:42 -04: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
Jordan Brown 2db0511d0d Removes a dead var 2021-09-27 12:20:37 -04:00
WanderingFox95 4e87044845 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-27 18:15:34 +02:00
Hatterhat 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
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
Putnam3145 c169a0408a more ashwalker lung adjustments 2021-09-26 13:13:22 -07:00
keronshb 5da5ac396c Head blacklist for antag 2021-09-26 14:29:46 -04: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
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
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
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