Commit Graph

26074 Commits

Author SHA1 Message Date
silicons
9f4e0ac4df woops 2020-11-26 23:38:39 -07:00
silicons
5e965d099f COME ON 2020-11-26 23:37:27 -07:00
silicons
e7c02de01e k 2020-11-26 23:16:25 -07:00
timothyteakettle
2c01acd5f5 important 2020-11-26 22:52:58 +00:00
DeltaFire
21734b5d63 there we go 2020-11-26 23:04:39 +01:00
DeltaFire
566d74bd77 E 2020-11-26 16:12:08 +01:00
silicons
46baf7372d Update permissionedit.dm 2020-11-25 22:47:25 -07:00
silicons
211019903e Merge pull request #13709 from Hatterhat/thanks-aleks
funny hands no longer survive off of their host
2020-11-25 22:23:46 -07:00
silicons
a20f14b937 Merge pull request #13705 from Putnam3145/buff-rad-collector
Buffs rad collectors
2020-11-25 22:23:17 -07:00
silicons
8fa69c458b Merge pull request #13707 from DeltaFire15/synthetic-alcohol-intolerance
Makes synthetics inherently immune to alcohol
2020-11-25 22:23:05 -07:00
silicons
a78ebb1f08 Merge pull request #13702 from Putnam3145/harness-tweak
Makes gear harness no longer cover chest/groin.
2020-11-25 22:22:43 -07:00
silicons
a0330d46db Merge pull request #13703 from Putnam3145/none-dynamic-with-left-beef
Makes dynamic no longer show "none" in the vote.
2020-11-25 22:22:31 -07:00
silicons
bba5cef9be Merge pull request #13697 from Putnam3145/brain-trauma-again
Makes spontaneous brain trauma require min 5 players.
2020-11-25 22:22:20 -07:00
silicons
f301ed4f8f Merge pull request #13689 from DeltaFire15/apc-power-fuckery
Fixes APC recharge power use
2020-11-25 22:21:57 -07:00
silicons
fa516b1097 Merge pull request #13685 from uomo91/adminlogging
Ports: Admins can now see chronological order of events in logging tabs.
2020-11-25 22:21:34 -07:00
silicons
2be21324bc Merge pull request #13686 from Arturlang/tgui_whitescreenfix_port
Ports tgui whitescreen fixes
2020-11-25 22:21:27 -07:00
silicons
60a0db7730 oh thanks
Co-authored-by: DeltaFire15 <46569814+DeltaFire15@users.noreply.github.com>
2020-11-25 22:20:50 -07:00
timothyteakettle
e8c2b7d2a6 gas mask adjusting 2020-11-26 01:03:00 +00:00
DeltaFire
67303ce7be Update medbot.dm 2020-11-26 00:19:47 +01:00
DeltaFire
b487c7cb57 actually 2020-11-25 23:53:33 +01:00
DeltaFire
f4bef53633 only care about robots if oxydam 2020-11-25 23:41:18 +01:00
DeltaFire
69127ebec6 e 2020-11-25 18:06:08 +01:00
DeltaFire
24b712c71e better way to do this 2020-11-25 15:42:43 +01:00
Hatterhat
2de9b55703 uuuuuuuuuuuugh 2020-11-25 02:26:23 -06:00
DeltaFire
282a5d6ab2 aaactually lets just make robots immune in general 2020-11-24 20:32:42 +01:00
DeltaFire
a3208d1ac8 synth alcohol immunity 2020-11-24 20:27:34 +01:00
DeltaFire
ac20bb7d8c fixes up a tiiny cell charge oversight 2020-11-24 19:43:14 +01:00
Putnam
a7fc05a1c7 Buffs rad collectors. 2020-11-24 06:43:17 -08:00
Putnam
b000ea6a25 Attempts to make emotes part of the local filter. 2020-11-24 06:02:34 -08:00
Putnam
17aa88fa8d Makes gear harness no longer cover chest/groin. 2020-11-24 01:14:38 -08:00
Putnam
cdcba275d7 Makes dynamic no longer show none in the vote. 2020-11-24 01:13:41 -08:00
timothyteakettle
8a2e996817 migration runtimes 2020-11-24 01:55:36 +00:00
silicons
cf3c4d9d89 Update living.dm 2020-11-23 00:28:17 -07:00
silicons
8f36a1d2ec okay 2020-11-22 15:20:52 -07:00
silicons
89d18c681d buffed again 2020-11-22 15:16:40 -07:00
silicons
18bdda1273 fix 2020-11-22 15:01:19 -07:00
silicons
13ebceb670 why did i do this 2020-11-22 14:56:02 -07:00
silicons
c7e60191df whew 2020-11-22 14:44:05 -07:00
Timothy Teakettle
5075aec151 webedit adds spaces for some reason 2020-11-22 21:43:15 +00:00
Timothy Teakettle
a976d42305 Revert "webedit adds spaces for some reason"
This reverts commit 8d41c15b75.
2020-11-22 21:42:36 +00:00
Timothy Teakettle
8d41c15b75 webedit adds spaces for some reason 2020-11-22 21:42:14 +00:00
silicons
5ae410790b locking 2020-11-22 14:40:57 -07:00
Timothy Teakettle
285208ece3 Merge branch 'master' into communication-hotkeys 2020-11-22 21:30:43 +00:00
silicons
37e26833a6 wew 2020-11-22 14:16:14 -07:00
Timothy Teakettle
5de801ac40 communication hotkeys 2020-11-22 21:08:58 +00:00
silicons
c7396632db Merge pull request #13582 from timothyteakettle/i-hate-mcolor
adds advanced colouring mode: allows you to individually colour mutant parts
2020-11-22 13:33:28 -07:00
silicons
0554ccbba4 fix 2020-11-22 13:32:48 -07:00
silicons
fbdc339653 Update living.dm 2020-11-22 13:31:36 -07:00
Artur
84b299912a Merge remote-tracking branch 'origin/master' into tgui_whitescreenfix_port 2020-11-22 13:29:26 +02:00
silicons
31fa58a9e9 fix 2020-11-22 02:48:37 -07:00