Commit Graph
10135 Commits
Author SHA1 Message Date
SandPoot 5b85c260a7 Upload files 2021-11-15 01:34:30 -03:00
LetterN 01ebc25f7f fixes vending BSOD and reverts cryopod regressio 2021-11-15 10:37:10 +08:00
DeltaFire 3f9ad6a954 should do this instead 2021-11-14 22:44:43 +01:00
DeltaFire 50c7d4914f reebe loading (woo) 2021-11-14 22:25:39 +01:00
DeltaFire 88789e1bbe one 2021-11-14 22:06:52 +01:00
DeltaFire 6224da71a3 contents_explosion
at least this one had less overrides.
2021-11-14 21:41:42 +01:00
DeltaFire 6aa906395c not a gaius reference
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
DeltaFire 7d2ff194d1 this WILL fail CI
hnnnngh
2021-11-14 20:48:41 +01:00
LetterN eb98848a9f wires this code to the PROPER prefs 2021-11-14 09:23:08 +08:00
LinandGitHub 91adaf84b6 Merge pull request #15330 from keronshb/dynamiclog
Dynamic messages admins if it fails to hijack.
2021-11-13 04:50:43 +00:00
DeltaFire b4e6b0785d chemscan
chemscanning (reads: health analyzers mostly) show reagents in grey if not processable due to being invalid
2021-11-12 19:38:10 +01:00
keronshb 632b1b36cc Fixes crayons 2021-11-11 20:10:57 -05: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
keronshb 659d7aa715 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-11 19:35:40 -05:00
Putnam3145 7df63ed6f5 Nerf chonker/temper 2021-11-10 16:20:43 -08:00
keronshb 0aceecee2e w hitsound 2021-11-10 16:49:18 -05:00
LetterN 9a24f89780 THE fix 2021-11-10 10:33:15 +08:00
siliconsandGitHub 5b5eca2beb Merge pull request #15322 from SandPoot/crayon-precision
Crayon precision mode
2021-11-09 09:56:03 -08:00
Putnam3145 b7b69fdeda Fixes power alarm not to be precisely wrong 2021-11-07 09:27:13 -08:00
keronshb 9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04:00
Putnam3145andGitHub 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
LinandGitHub 74c6e05dd7 Merge pull request #15318 from silicons/evil
removes some evil defines from the code
2021-11-04 04:32:48 +00:00
keronshb e20b5f7c92 Dynamicadmins
Messages admins if dynamic fails to hijack
2021-11-03 22:39:20 -04:00
keronshb efd12e4fd5 Changes for merge 2021-11-01 12:07:44 -04:00
SandPootandGitHub d92a290960 Update crayons.dm 2021-11-01 01:50:30 -03:00
SandPoot 05717c7ae3 Upload files 2021-11-01 01:24:47 -03:00
LinandGitHub b6ad2f6a6b Merge pull request #15312 from keronshb/evergreen
The grinch can no longer steal Christmas.
2021-10-30 14:08:59 -07:00
keronshb b58d3f14a3 More adjustments 2021-10-30 10:24:58 -04: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
siliconsandGitHub 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
LinandGitHub 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
keronshb e531c7b452 Fix 2021-10-28 18:48:26 -04:00
keronshb 8978ee10fe Merge remote-tracking branch 'upstream/master' into familyport 2021-10-28 14:41:46 -04:00
keronshb c80d65df73 Merge branch 'master' into familyport 2021-10-28 14:34:20 -04:00
keronshb 6dcf4fae9f No stealing christmas 2021-10-28 11:28:59 -04:00
LetterN f7b898a2a9 frontend 2021-10-28 17:34:52 +08:00
LetterN 49940c373e tgui backend 2021-10-28 12:51:31 +08:00
keronshb e8c56c07ee No burning the spirit of halloween 2021-10-28 00:43:02 -04:00
Letter NandGitHub bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
siliconsandGitHub 9010dc1e41 Merge pull request #15298 from keronshb/whocodedthis
Fixes DSword and Hyper Eu's wounding, and fixes a slowdown bug with Hyper Eu.
2021-10-27 13:35:41 -07:00