Commit Graph

1034 Commits

Author SHA1 Message Date
Letter N
1095142a5f Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-26 10:58:12 +08:00
DeltaFire
146135f059 Merge pull request #13836 from silicons/statpanel
refactors statpanel a bit to send topics to client instead of item which bypasses problematic /Topic overrides entirely
2020-12-24 18:29:33 +01:00
Letter N
792c9ad752 actualy important because of glidesize 2020-12-23 14:16:29 +08:00
DeltaFire
d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
2020-12-22 17:40:33 +01:00
DeltaFire
65c14cf289 Merge pull request #13537 from silicons/permissions
support update for event manager permissions
2020-12-22 16:12:03 +01:00
silicons
13f9bbef01 paramlist 2020-12-21 21:36:12 -07:00
silicons
9b83ae564a e 2020-12-21 21:31:55 -07:00
silicons
221a98d27b how'd this ever work 2020-12-21 21:25:00 -07:00
silicons
000e525157 ok 2020-12-21 21:11:54 -07:00
silicons
e87cc27803 modifications 2020-12-15 07:21:06 -07:00
silicons
413bd23d0a dnr prevention 2020-12-13 23:07:12 -07:00
silicons
5c830d4d44 Merge remote-tracking branch 'citadel/master' into respawn_system_2 2020-12-13 02:34:57 -07:00
silicons
24c09edd03 stuff 2020-12-12 11:12:45 -07:00
Putnam3145
f0e51d666c Merge pull request #13617 from timothyteakettle/loadout-json
loadout 2: electric boogaloo
2020-12-11 18:11:56 -08:00
silicons
45a7c68da1 wow 2020-12-11 15:05:00 -07:00
Timothy Teakettle
132a3c9526 color non polychromic items 2020-12-08 19:29:34 +00:00
timothyteakettle
81eaa8a2b9 woops 2020-12-06 23:51:03 +00:00
timothyteakettle
16b98adb9f no more debug 2020-12-06 23:40:00 +00:00
timothyteakettle
a84f1648f4 Update preferences_savefile.dm 2020-12-06 22:57:57 +00:00
Timothy Teakettle
e413fcb091 more fixes 2020-12-06 22:14:35 +00:00
Timothy Teakettle
53a434cfb1 suggested change 2020-12-06 20:07:50 +00:00
timothyteakettle
61cc33d995 Merge remote-tracking branch 'upstream/master' into loadout-json 2020-12-06 17:26:04 +00:00
timothyteakettle
0f540884eb Merge branch 'master' into loadout-json 2020-12-06 17:24:24 +00:00
timothyteakettle
5566c00a69 fixes 2020-12-06 17:24:12 +00:00
timothyteakettle
a478da678e bugfixes 2020-12-06 15:50:33 +00:00
timothyteakettle
cbbcc0c386 fix the migration 2020-12-06 00:16:56 +00:00
silicons
b721cf3128 Update preferences.dm 2020-12-03 05:41:56 -07:00
silicons
0f9734b1f7 Merge pull request #13698 from timothyteakettle/communication-hotkeys
ports rebindable communication hotkeys from tg
2020-11-28 09:12:40 -07:00
silicons
47c74c3fac sigh 2020-11-27 06:42:55 -07:00
silicons
ead209f507 sigh 2020-11-27 06:31:05 -07:00
silicons
ae756749cc woops 2020-11-27 05:15:40 -07:00
silicons
564766d11d sigh 2020-11-27 00:16:53 -07:00
silicons
5e965d099f COME ON 2020-11-26 23:37:27 -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
timothyteakettle
8a2e996817 migration runtimes 2020-11-24 01:55:36 +00: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
Timothy Teakettle
285208ece3 Merge branch 'master' into communication-hotkeys 2020-11-22 21:30:43 +00: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
uomo91
cfaa988217 Merge master and fix newline conflict. 2020-11-19 17:12:19 -06:00
uomo91
be009f2e54 Better labeling to differentiate log types. 2020-11-18 06:08:14 -06:00
timothyteakettle
60077f028e port 2020-11-17 01:41:19 +00:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
Timothy Teakettle
9cfecfa507 Update preferences_savefile.dm 2020-11-10 23:07:01 +00:00
LetterJay
10c90e06c1 Merge pull request #13661 from timothyteakettle/age-verification
adds in-game age verification as an alternative to access requests
2020-11-08 11:07:05 -06:00
Timothy Teakettle
185939a09f stable version 2020-11-08 16:49:49 +00:00
Timothy Teakettle
7a82f53e75 attempte fixes 2020-11-08 16:45:32 +00:00
Timothy Teakettle
d358a170fa fixes 2020-11-08 14:32:10 +00:00