Commit Graph

1221 Commits

Author SHA1 Message Date
silicons 697ea7ad93 fix 2021-09-27 17:40:53 -07:00
silicons ae513d3114 feautre 2021-09-17 21:58:26 -07:00
LetterN 791da1b9b4 mafia update. 2021-09-11 11:38:15 +08:00
silicons ead04910c2 Update preferences_savefile.dm (#15108) 2021-09-09 18:23:01 +02:00
silicons 69bd477a72 Merge pull request #15039 from keronshb/gradiantport
Ports Colorist Quirk and Hair Gradients Preferences
2021-09-08 20:41:00 -07:00
Lin 9b888c7b01 Merge pull request #15059 from timothyteakettle/language-fixies
fixes losing your additional language upon changing species
2021-09-02 16:37:43 -05:00
timothyteakettle a33a7ed249 fix 2021-09-01 17:54:14 +01:00
SandPoot b2ef076043 Upload files 2021-08-26 16:44:36 -03:00
keronshb 7070a848b6 Item Highlight Port 2021-08-22 00:21:06 -04:00
Artur 4b2bffdff0 Actually makes it work by /obj/screen --> /atom/movable/screen 2021-07-29 14:06:18 +03:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
silicons 24c2ab8b8c Merge pull request #14940 from timothyteakettle/trash-eating
adds a neutral trash eating quirk
2021-07-18 15:07:29 -07:00
SandPoot 3cb44d41a3 upload files 2021-07-14 00:35:30 -03:00
timothyteakettle 39c09a60b8 initial commit 2021-07-13 23:45:31 +01:00
silicons 40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
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
Timothy Teakettle 022003dc7c funny comment 2021-05-08 02:05:20 +01:00
Timothy Teakettle 42d8d83ca2 Update preferences_savefile.dm 2021-05-08 01:52:55 +01:00
Timothy Teakettle 149cdeb9fd Update preferences_savefile.dm 2021-05-08 01:34:43 +01:00
Timothy Teakettle 5e271c239f conflict resolving caused runtimes 2021-05-08 01:31:44 +01:00
Timothy Teakettle 5bc33c222a Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-08 01:28:23 +01:00
Timothy Teakettle 108ff3d2f4 Merge branch 'rp-markings-attempt-two' of https://github.com/timothyteakettle/Citadel-Station-13 into rp-markings-attempt-two 2021-05-08 01:27:22 +01:00
timothyteakettle 0fb72497ff color fix 2021-05-07 16:46:40 +01:00
timothyteakettle bef9473fa1 more migration fixes and general bugfixes 2021-05-07 16:10:20 +01:00
timothyteakettle 3b07164fb4 Update preferences_savefile.dm 2021-05-07 00:56:27 +01:00
timothyteakettle f5e2d3de2c Update preferences_savefile.dm 2021-05-07 00:44:44 +01:00
timothyteakettle eab47bb6ae Update preferences_savefile.dm 2021-05-07 00:43:33 +01:00
timothyteakettle 440a6633ea Update preferences_savefile.dm 2021-05-07 00:37:33 +01:00
timothyteakettle e95e4ed106 Update preferences_savefile.dm 2021-05-06 23:39:41 +01:00
timothyteakettle 80599201cf better fix 2021-05-06 22:39:07 +01:00
Timothy Teakettle a269e8bf03 migration fix 2021-05-06 01:51:17 +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