Commit Graph

44064 Commits

Author SHA1 Message Date
CitadelStationBot
e3d7b3adc5 Automatic changelog generation for PR #14951 [ci skip] 2021-08-03 15:10:09 -05:00
Putnam3145
d046357418 Merge pull request #14951 from timothyteakettle/leg-split
[TESTMERGE FIRST HOLY SHIT FUCK] fixes every single leg sprite in the entire game
2021-08-03 13:10:06 -07:00
CitadelStationBot
ab8b7cd57f Automatic changelog generation for PR #14977 [ci skip] 2021-08-03 12:15:46 -05:00
Lin
d6b4b3b1f4 Merge pull request #14977 from BlueWildrose/hollowedhead
Fixes brainless sprite being an error sprite
2021-08-03 12:15:43 -05:00
Changelogs
ab95de0bff Automatic changelog compile [ci skip] 2021-08-03 00:26:25 +00:00
CitadelStationBot
fb11ddc8df Automatic changelog generation for PR #14817 [ci skip] 2021-08-02 19:11:22 -05:00
silicons
2192d8a87e Merge pull request #14817 from zeroisthebiggay/endit
[READY] tempgun rebalance (it's not a nerf don't worry)
2021-08-02 17:11:20 -07:00
Changelogs
f869d28254 Automatic changelog compile [ci skip] 2021-08-02 00:24:00 +00:00
BlueWildrose
0735ec66b3 Fixes brainless sprite being an error sprite 2021-08-01 06:33:08 -07:00
CitadelStationBot
08cbeeaf33 Automatic changelog generation for PR #14973 [ci skip] 2021-07-31 23:25:44 -05:00
Putnam3145
9ed9fbcc73 Merge pull request #14973 from TripleShades/pubbyyyy
[FAST MERGE] Pubby Deco Fix
2021-07-31 21:25:40 -07:00
TripleShades
dfff5339c9 Update water.dm 2021-07-31 00:23:09 -04:00
TripleShades
652ffe22a2 Update water.dm 2021-07-30 23:58:11 -04:00
TripleShades
7d7525825d deco waterrrr 2021-07-30 23:51:57 -04:00
TripleShades
b682d886e9 Update PubbyStation.dmm 2021-07-30 23:44:15 -04:00
TripleShades
52659ffe53 Update PubbyStation.dmm 2021-07-30 23:38:36 -04:00
TripleShades
4eb8b2701d Update PubbyStation.dmm 2021-07-30 23:10:28 -04:00
TripleShades
4dd67d35e4 Update PubbyStation.dmm 2021-07-30 23:00:55 -04:00
Changelogs
4f7fb6f245 Automatic changelog compile [ci skip] 2021-07-31 00:23:32 +00:00
CitadelStationBot
6760ff4c76 Automatic changelog generation for PR #14972 [ci skip] 2021-07-30 00:42:22 -05:00
silicons
ed191b9513 Merge pull request #14972 from MrJWhit/farts
Random Boxstation Fixes (Space edition)
2021-07-29 22:42:19 -07:00
CitadelStationBot
40c2ad4512 Automatic changelog generation for PR #14957 [ci skip] 2021-07-30 00:40:56 -05:00
silicons
5e868e9808 Merge pull request #14957 from TripleShades/pubbyyyy
Pubby Deco
2021-07-29 22:40:54 -07:00
CitadelStationBot
1f740fa58c Automatic changelog generation for PR #14879 [ci skip] 2021-07-30 00:39:44 -05:00
silicons
c5438c73be Merge pull request #14879 from WanderingFox95/WanderingFox95-IcemoonRuinsOnLavaland
[Review/Testmerge] Icemoon Ruins but on Lavaland!
2021-07-29 22:39:42 -07:00
Changelogs
37148d34fd Automatic changelog compile [ci skip] 2021-07-29 00:22:44 +00:00
CitadelStationBot
d24d712a68 Automatic changelog generation for PR #14964 [ci skip] 2021-07-28 14:31:31 -05:00
Lin
79456d8d63 Merge pull request #14964 from EmeraldSundisk/omega719
Round 1 of initial fixes/changes for OmegaStation.
2021-07-28 14:31:28 -05:00
MrJWhit
70a23bebf2 Update BoxStation.dmm 2021-07-28 02:15:31 -04:00
MrJWhit
b232baf568 random fixes 2021-07-28 02:11:15 -04:00
silicons
5f4e05934a Merge pull request #14969 from Putnam3145/reenable-tests
Reenable unit tests + auxmos update (so unit tests don't lie)
2021-07-27 20:22:27 -07:00
Putnam3145
639630b4fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into reenable-tests 2021-07-27 19:05:00 -07:00
Changelogs
d450f6da71 Automatic changelog compile [ci skip] 2021-07-28 00:24:32 +00:00
Changelogs
9720b01c32 Automatic changelog compile [ci skip] 2021-07-27 00:22:27 +00:00
CitadelStationBot
aa0732684b Automatic changelog generation for PR #14954 [ci skip] 2021-07-26 15:09:46 -05:00
Lin
560dc048cf Merge pull request #14954 from Putnam3145/poor-fastmos
Poor man's fastmos: just do diffusion faster 4head (+ auxmos update)
2021-07-26 15:09:43 -05:00
CitadelStationBot
675845fff8 Automatic changelog generation for PR #14967 [ci skip] 2021-07-26 15:09:09 -05:00
Lin
b1bdc8bf99 Merge pull request #14967 from Putnam3145/fix-space-loop-lord
Makes HE pipe min temp diff 0.01 instead of 20
2021-07-26 15:09:06 -05:00
Putnam3145
f8335f34f9 just removes the multi-surgery test for now. 2021-07-25 20:26:32 -07:00
Putnam3145
52d6828881 please. 2021-07-25 20:15:06 -07:00
Putnam3145
cbdcf4dfa5 we don't have tinker_nanites 2021-07-25 20:04:57 -07:00
Putnam3145
9a62fed735 /proc/ 2021-07-25 19:55:48 -07:00
Putnam3145
95d2adb996 a bunch of async and waitfor 2021-07-25 19:51:27 -07:00
Putnam3145
cd2a710a23 there's too many errors caused by these two 2021-07-25 19:36:23 -07:00
Putnam3145
23bf72c29f stop doing this. 2021-07-25 19:18:33 -07:00
Putnam3145
bba0ba2c7c some more unit test fixes 2021-07-25 19:09:19 -07:00
Putnam3145
975582380b always search when you change paths 2021-07-25 18:52:01 -07:00
Putnam3145
ebb8d278a1 Runtime fix; need to update auxmos or it's lies 2021-07-25 18:45:17 -07:00
Putnam3145
f1560cb807 fixing a bunch of unit test/runtime issues 2021-07-25 18:40:11 -07:00
Putnam3145
89414f7466 why didn't it save 2021-07-25 18:12:54 -07:00