Commit Graph

558 Commits

Author SHA1 Message Date
Timothy Teakettle
da7c1ddb0a bold statement for someone who didnt test their code 2021-05-17 19:04:51 +01:00
Timothy Teakettle
6d13f09c3d Update preferences.dm 2021-05-17 11:20:47 +01:00
Timothy Teakettle
4cb0eb3418 Update preferences.dm 2021-05-17 10:59:26 +01:00
Timothy Teakettle
80d287abca index magic moment 2021-05-16 03:10:35 +01:00
timothyteakettle
7560898f94 Update preferences.dm 2021-05-10 22:53:27 +01:00
Timothy Teakettle
60673d9c5c AAAAAA 2021-05-10 17:13:24 +01:00
Timothy Teakettle
24774856bc Update preferences.dm 2021-05-10 14:34:22 +01:00
Timothy Teakettle
cfcbaa001b fixes 2021-05-10 14:31:36 +01:00
Timothy Teakettle
6926ea74ab Update preferences.dm 2021-05-10 13:58:53 +01:00
Timothy Teakettle
d479f80f9b linters are literally stupid 2021-05-08 21:19:07 +01:00
timothyteakettle
80599201cf better fix 2021-05-06 22:39:07 +01:00
Timothy Teakettle
bee9d9c047 support for the ridiculous thing i just did 2021-05-05 22:29:21 +01:00
Timothy Teakettle
3c7137f951 what if we didnt break 90% of the game 2021-05-05 18:19:02 +01:00
Timothy Teakettle
ba71bb944a im not crazy but this commit breaks 90% of the game 2021-05-05 18:11:05 +01:00
Timothy Teakettle
1664459b14 squash bugs 2021-05-05 15:26:56 +01:00
timothyteakettle
b2d8c980e4 task failed sucessfully 2021-05-05 00:54:44 +01:00
timothyteakettle
f816bba62a bugfixes 2021-05-05 00:51:52 +01:00
timothyteakettle
fac2b259ac big changes 2 2021-05-03 22:43:45 +01:00
timothyteakettle
f4bb5255ab Revert "big changes"
This reverts commit 7ac50b7ba2.
2021-05-03 22:43:32 +01:00
timothyteakettle
7ac50b7ba2 big changes 2021-05-03 22:43:22 +01:00
Timothy Teakettle
93254f5d9c Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-02 22:20:57 +01:00
Timothy Teakettle
d32770a0fa test 2021-05-02 22:19:41 +01:00
Timothy Teakettle
2daed9250f some bugfixes 2021-05-02 18:30:35 +01:00
Timothy Teakettle
7efadade15 href fix 2021-05-01 20:55:13 +01:00
Timothy Teakettle
8aed1b4236 more color code 2021-05-01 20:37:22 +01:00
Timothy Teakettle
ddc3e3b3b2 Update preferences.dm 2021-05-15 21:24:20 +01:00
Timothy Teakettle
cb98cbd19f colour backend 2021-04-28 22:33:05 +01:00
timothyteakettle
79b73a53a0 working buttons probably 2021-04-28 16:53:12 +01:00
Timothy Teakettle
06e003f49b functionality 2021-04-26 21:58:12 +01:00
Timothy Teakettle
ca3ef3b0f3 X button 2021-04-26 18:02:47 +01:00
Timothy Teakettle
a6a3f99539 rp marking ui 2021-04-25 20:57:02 +01:00
Timothy Teakettle
ec41b301c7 a 2021-04-24 18:55:07 +01:00
Timothy Teakettle
869124bb50 markings 2021-04-24 15:56:57 +01:00
Timothy Teakettle
e89b05cfdd oh dear 2021-04-23 21:13:32 +01:00
SandPoot
5bb6078def upload files 2021-04-22 20:39:21 -03:00
silicons
ee4f019459 Merge pull request #14506 from timothyteakettle/loadout-tab-defines
fixes character previews but does it using defines (thanks zero)
2021-03-27 01:34:16 -06:00
Timothy Teakettle
fa541671d6 yes 2021-03-23 21:44:19 +00:00
silicons
77178c7664 Fix 2021-03-20 12:14:38 -07:00
silicons
d7829db9ca let's make this more clear 2021-03-18 21:55:21 -07:00
silicons
bff668b743 why 2021-03-18 21:53:53 -07:00
Putnam
f3ea1b1a0c Relabeled to "Antag"; unambiguized in 2021-03-16 22:53:55 -07:00
DeltaFire
b105a3c831 Merge pull request #14347 from timothyteakettle/language-tab
the speech panel pr
2021-03-16 20:31:58 +01:00
necromanceranne
bdcd2904e6 Fixes going over the defined limit of roundstart prosthetics 2021-03-09 03:56:51 +11:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Timothy Teakettle
806ad46aa6 no 2021-03-01 20:57:51 +00:00
Timothy Teakettle
329e8e7d38 Merge branch 'master' into language-tab 2021-03-01 20:49:16 +00:00
Letter N
5c39381117 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-23 11:36:05 +08:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
silicons
ae63422727 Merge pull request #14269 from Putnam3145/aphro-readd
More arousal logging; adds back aphro/nympho
2021-02-21 14:50:32 -07:00
Letter N
7c0a63f729 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-21 09:57:22 +08:00