Commit Graph

1052 Commits

Author SHA1 Message Date
silicons
2525334bb0 smooth movement twaeks 2021-01-09 15:30:56 -08:00
silicons
9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
Timothy Teakettle
d459f6db91 Update looc.dm 2021-01-09 21:30:18 +00:00
silicons
bd3761d39e proper smooth movement 2021-01-08 10:51:48 -08:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Timothy Teakettle
dc44102d8b fix 2021-01-01 22:39:16 +00:00
Timothy Teakettle
974f46cb22 attempt to fix 2021-01-01 22:36:35 +00:00
Timothy Teakettle
813e0f4c79 Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items 2021-01-01 22:30:04 +00:00
Timothy Teakettle
a4a2765735 Update client_procs.dm 2020-12-30 16:56:03 +00:00
Timothy Teakettle
7224d3ad17 oops! all runtimes! 2020-12-29 16:13:44 +00:00
Timothy Teakettle
74928c0451 data issue 2020-12-28 22:21:44 +00:00
Timothy Teakettle
d80920a500 oops! all 0s! 2020-12-28 17:10:28 +00:00
Timothy Teakettle
50fd36efa5 oops! all runtime! 2020-12-28 17:04:48 +00:00
Timothy Teakettle
b0fdbd3b1d Update preferences.dm 2020-12-28 17:01:55 +00:00
Timothy Teakettle
b03bd6fe8e Update preferences.dm 2020-12-27 22:03:28 +00:00
Timothy Teakettle
67741b7561 Update preferences_savefile.dm 2020-12-27 20:09:32 +00:00
Timothy Teakettle
c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
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
timothyteakettle
6ecfda1256 Update preferences.dm 2020-12-23 23:14:08 +00: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