Commit Graph

29357 Commits

Author SHA1 Message Date
LetterN fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) 2021-11-16 16:10:12 +08:00
LetterN cca584b2df should finally fix dragging other people into cryo 2021-11-16 08:37:48 +08:00
LetterN 01ebc25f7f fixes vending BSOD and reverts cryopod regressio 2021-11-15 10:37:10 +08:00
LetterN 90b6ba4b8d oh 2021-11-14 10:21:56 +08:00
LetterN eb98848a9f wires this code to the PROPER prefs 2021-11-14 09:23:08 +08:00
LetterN 8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
LetterN 4ec1f216ff cryofix 2021-11-12 08:48:24 +08:00
silicons c11d769388 Update _lists.dm 2021-11-09 20:17:34 -07:00
LetterN 9a24f89780 THE fix 2021-11-10 10:33:15 +08:00
Putnam3145 0b0a7192f9 removes the "REM" macro 2021-11-09 16:35:32 -08:00
silicons 5b5eca2beb Merge pull request #15322 from SandPoot/crayon-precision
Crayon precision mode
2021-11-09 09:56:03 -08: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
Putnam3145 da138b1b37 why did i think i could remove this 2021-11-07 16:47:57 -08: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
Lin a17d730ed8 Merge pull request #15336 from timothyteakettle/marking-fix
fixes red panda head marking
2021-11-07 00:42:59 +00:00
Lin 3d19f6d292 Merge pull request #15334 from Putnam3145/another-lung-fix
More lung fixes
2021-11-05 16:52:00 +00:00
Timothy Teakettle 8ef2ec4ac8 Update body_markings.dm 2021-11-05 15:38:25 +00:00
Putnam3145 b2459a26a3 Merge pull request #15306 from keronshb/dynamicadjustments
Adjusts Dynamic requirements to be more lienent (less 24/7 traitor and maybe a chance for something else holy shit)
2021-11-04 16:27:58 -07:00
Putnam3145 798f1ae879 and fixes suffocation with literally 0 gas 2021-11-04 09:04:48 -07:00
Putnam3145 f83cd7b57d Lung changes: reckoning 2021-11-04 08:52:50 -07:00
Lin 74c6e05dd7 Merge pull request #15318 from silicons/evil
removes some evil defines from the code
2021-11-04 04:32:48 +00:00
Putnam3145 aba3720f22 Merge pull request #15319 from Citadel-Station-13/silicons-patch-3
readds gps to bdm
2021-11-01 17:08:33 -07:00
SandPoot d92a290960 Update crayons.dm 2021-11-01 01:50:30 -03:00
SandPoot 05717c7ae3 Upload files 2021-11-01 01:24:47 -03:00
Lin b6ad2f6a6b Merge pull request #15312 from keronshb/evergreen
The grinch can no longer steal Christmas.
2021-10-30 14:08:59 -07:00
DrPainis 5cb1388f11 Makes moving NOT give you nutrition anymore. (#15316)
* makes moving not make you fat anymore

* same as the previous commit, but even less coding
2021-10-30 18:00:13 +02:00
keronshb b58d3f14a3 More adjustments 2021-10-30 10:24:58 -04:00
silicons eb7fd90d3f Update blood_drunk_miner.dm 2021-10-30 03:31:57 -07:00
LetterN f9ce0759a3 indentation moment 2021-10-30 14:25:44 +08:00
LetterN 89f7cf1c32 i apparently didnt commit this? 2021-10-30 13:46:54 +08:00
silicons a32eabb7ae fix 2021-10-29 22:44:01 -07:00
LetterN 1fc778f70a soundloop fix. also it gets deleted (woo) 2021-10-30 13:16:31 +08:00
silicons 186b552103 merge 2021-10-29 21:50:58 -07:00
LetterN ec85d5575d sus login 2021-10-30 12:23:35 +08:00
LetterN a057139c33 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-10-30 11:54:20 +08:00
LetterN 99019166e4 i think it works
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
silicons 319c5e23fe Merge pull request #15309 from LetterN/revert-15244-tgui-alerts-and-what-not
Revert "TGUI alerts, lists, inputs"
2021-10-29 20:27:46 -07:00
silicons 739da5d69b Merge pull request #15313 from DeltaFire15/codemoment
Fixes dragging things over prone individuals
2021-10-29 17:43:13 -07:00
Lin 5054ea87ce Merge pull request #15310 from keronshb/jaqincinerator
No Frollo you can't burn Jacq in the cremator with hellfire (plus two other grief prevention additions)
2021-10-28 21:29:50 -07:00
keronshb 133225c083 Removes required enemies 2021-10-28 23:48:50 -04:00
keronshb 02eb4685a9 Some adjustments 2021-10-28 23:44:02 -04:00
DeltaFire 451025af28 fix 2021-10-29 01:42:28 +02:00
keronshb e531c7b452 Fix 2021-10-28 18:48:26 -04:00
keronshb b2a890269a Fixes destroy 2021-10-28 15:44:08 -04:00
keronshb 29a39ed9ea Indestructable change 2021-10-28 15:30:00 -04:00
keronshb 6dcf4fae9f No stealing christmas 2021-10-28 11:28:59 -04:00
keronshb 468b4a11ff More buffs 2021-10-28 11:26:18 -04:00
LetterN f7b898a2a9 frontend 2021-10-28 17:34:52 +08:00