Commit Graph

45259 Commits

Author SHA1 Message Date
DeltaFire 7d2ff194d1 this WILL fail CI
hnnnngh
2021-11-14 20:48:41 +01:00
Changelogs dacaa637ec Automatic changelog compile [ci skip] 2021-11-14 00:28:22 +00:00
CitadelStationBot dc5128446a Automatic changelog generation for PR #15330 [ci skip] 2021-11-12 22:50:45 -06:00
Lin 91adaf84b6 Merge pull request #15330 from keronshb/dynamiclog
Dynamic messages admins if it fails to hijack.
2021-11-13 04:50:43 +00:00
CitadelStationBot 70be87ed0e Automatic changelog generation for PR #15353 [ci skip] 2021-11-12 22:46:47 -06:00
Lin ac4bb92cec Merge pull request #15353 from TripleShades/pubby
PubbyStation Fixes and Touch-ups aka SALT
2021-11-13 04:46:45 +00:00
Lin 9f443c9285 Merge pull request #15362 from Putnam3145/teg-fix
Makes TEG generate heat based on actual heat transfer (again)
2021-11-13 04:42:53 +00:00
Lin dbee2f0a8a Merge pull request #15363 from Putnam3145/fix-freezer-math
Changes freezer/heater "efficiency" display on examine to something meaningful
2021-11-13 04:41:53 +00:00
TripleShades 083f49ff12 Update PubbyStation.dmm 2021-11-12 19:50:52 -05:00
Changelogs 04ef81dc0d Automatic changelog compile [ci skip] 2021-11-13 00:25:58 +00:00
TripleShades 3ebca5a737 Update PubbyStation.dmm 2021-11-12 19:22:20 -05:00
CitadelStationBot 0a597dcfbc Automatic changelog generation for PR #15354 [ci skip] 2021-11-12 18:01:11 -06:00
Lin d431254427 Merge pull request #15354 from Putnam3145/fix-stupid
Nerf chonker in cuban pete arcade game
2021-11-13 00:01:08 +00:00
Putnam3145 71e6676e9a ( 2021-11-11 17:53:00 -08:00
Putnam3145 a3b6ac7b54 Fixes freezer display + fixing bad math 2021-11-11 17:46:48 -08:00
Putnam3145 be9f550261 removed gross extra space 2021-11-11 17:43:38 -08:00
Putnam3145 25687a81f0 Makes TEG generate heat based on heat again 2021-11-11 17:38:49 -08:00
Changelogs 007d347d82 Automatic changelog compile [ci skip] 2021-11-12 00:28:31 +00:00
Lin 9388a2962f Merge pull request #15352 from Citadel-Station-13/silicons-patch-4
typecache filter list microoptimization
2021-11-11 21:25:53 +00:00
Changelogs cae2d7faa0 Automatic changelog compile [ci skip] 2021-11-11 00:27:24 +00:00
Putnam3145 7df63ed6f5 Nerf chonker/temper 2021-11-10 16:20:43 -08:00
CitadelStationBot e1ad3a8c8e Automatic changelog generation for PR #15300 [ci skip] 2021-11-10 17:40:38 -06:00
Lin efa73d987c Merge pull request #15300 from DrPainis/patch-2
Fixes racial blood colors.
2021-11-10 23:40:35 +00:00
TripleShades 97512a2ba5 Update PubbyStation.dmm 2021-11-10 17:20:28 -05:00
TripleShades 54187da577 Update PubbyStation.dmm 2021-11-10 17:09:36 -05:00
silicons c11d769388 Update _lists.dm 2021-11-09 20:17:34 -07:00
CitadelStationBot a34be5122b Automatic changelog generation for PR #15351 [ci skip] 2021-11-09 21:16:49 -06:00
silicons 34e64d744c Merge pull request #15351 from Putnam3145/rem-reagents-effect-metabolism
removes the "REM" macro
2021-11-09 19:16:47 -08:00
Putnam3145 0b0a7192f9 removes the "REM" macro 2021-11-09 16:35:32 -08:00
Changelogs dd9e443656 Automatic changelog compile [ci skip] 2021-11-10 00:27:15 +00:00
CitadelStationBot 9e14469e09 Automatic changelog generation for PR #15340 [ci skip] 2021-11-09 11:57:07 -06:00
silicons 9ca95e9313 Merge pull request #15340 from Ethan4303/fdmm-patch-72342162-Ethan4303
Fixes some lambda stuff
2021-11-09 09:57:04 -08:00
CitadelStationBot b3c40e4195 Automatic changelog generation for PR #15322 [ci skip] 2021-11-09 11:56:05 -06:00
silicons 5b5eca2beb Merge pull request #15322 from SandPoot/crayon-precision
Crayon precision mode
2021-11-09 09:56:03 -08:00
Lin 88ebd1601a Merge pull request #15342 from dapnee/oopy
Adding trash piles to meta and also maybe not everyone should be able to get into xenobio
2021-11-09 03:37:31 +00:00
CitadelStationBot 4fd44feea0 Automatic changelog generation for PR #15346 [ci skip] 2021-11-08 21:37:05 -06:00
Lin 93eb2ae444 Merge pull request #15346 from Putnam3145/last-lung-fix-bluh
Fixes simultaneous suffocate/overbreathe
2021-11-09 03:37:03 +00:00
CitadelStationBot 391beb5a97 Automatic changelog generation for PR #15345 [ci skip] 2021-11-08 21:31:33 -06:00
Lin 0576dbbd9a Merge pull request #15345 from Putnam3145/fix-power-alarms
Fixes power alerts not to work precisely incorrectly
2021-11-09 03:31:31 +00:00
Changelogs fe8f23a0d0 Automatic changelog compile [ci skip] 2021-11-09 00:26:54 +00:00
Putnam3145 da138b1b37 why did i think i could remove this 2021-11-07 16:47:57 -08:00
Changelogs 84f242a440 Automatic changelog compile [ci skip] 2021-11-08 00:27:46 +00:00
Putnam3145 aa619e8a3a Fixes simultaneous suffocate/overbreathe 2021-11-07 15:33:08 -08:00
Putnam3145 3c8bab34b2 Also makes destroying the APC show an alert properly. 2021-11-07 09:29:15 -08:00
Putnam3145 b7b69fdeda Fixes power alarm not to be precisely wrong 2021-11-07 09:27:13 -08:00
CitadelStationBot 63d5078428 Automatic changelog generation for PR #15336 [ci skip] 2021-11-06 19:43:01 -05:00
Lin a17d730ed8 Merge pull request #15336 from timothyteakettle/marking-fix
fixes red panda head marking
2021-11-07 00:42:59 +00:00
CitadelStationBot 1cc8cc0e28 Automatic changelog generation for PR #15337 [ci skip] 2021-11-06 19:42:21 -05:00
Lin 92a97d7c19 Merge pull request #15337 from timothyteakettle/partypod-sprite
fixes party pod sprite
2021-11-07 00:42:17 +00:00
Changelogs ed80b98147 Automatic changelog compile [ci skip] 2021-11-07 00:27:56 +00:00