Commit Graph

1103 Commits

Author SHA1 Message Date
silicons 8510542260 Update autobunker.dm 2021-04-20 04:55:00 -07: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 d9a2316825 fix 2021-03-20 12:13:28 -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 8c3c259850 pepegasort 2021-03-07 14:11:09 +08:00
Letter N 754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
silicons 8989394742 Merge pull request #14270 from LetterN/rustsql
Removes bsql 2
2021-03-03 00:53:46 -07:00
Timothy Teakettle 9c3f7cbad6 no 2021-03-01 21:05:32 +00: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
MarinaGryphon cc0f79f772 Fixes #14341 2021-02-28 19:05:10 -06: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
Letter N 0bb5ec3316 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-21 09:55:36 +08:00
Putnam ecc1ff26bb Slightly more logging, whoops added pref 2021-02-18 21:27:59 -08:00
Letter N 7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N 037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
SmArtKar b2b7b4ca9a Fucking finally 2021-02-18 14:17:43 +03:00
silicons e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
2021-02-17 01:30:13 -07:00
Letter N 3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
Letter N de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
silicons 3b441bfd28 kay 2021-02-13 19:03:27 -07:00
silicons 77f4e08727 AAAAAAAAA 2021-02-13 18:57:30 -07:00
Letter N a2419f760a Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-12 13:18:09 +08:00
Letter N 8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
Timothy Teakettle d858c420aa Update preferences_savefile.dm 2021-02-10 23:18:53 +00:00
Letter N f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
TyrianTyrell d1b7b191d2 Update preferences_savefile.dm 2021-02-04 15:14:20 -05:00
TyrianTyrell 7ffbc07e03 Update preferences.dm 2021-02-04 15:08:32 -05:00
TyrianTyrell 26d911a643 Update preferences.dm 2021-02-04 15:07:52 -05:00
SmArtKar b0c63ea547 Fuck you and your persistence system 2021-02-03 16:43:05 +03:00
TyrianTyrell e47fdeab5d Fixed typo 2021-02-01 09:10:34 -05:00
TyrianTyrell db548a4cfa Removed antag languages 2021-02-01 09:03:27 -05:00
TyrianTyrell 6c49becd2e Update preferences.dm 2021-02-01 05:52:44 -05:00
TyrianTyrell c8f797d69c Update preferences_savefile.dm 2021-02-01 05:45:14 -05:00
TyrianTyrell 6ad09c3de1 Update preferences.dm 2021-02-01 05:42:42 -05:00
silicons 1d72a574b2 Merge pull request #14093 from timothyteakettle/rename-redescribe-loadout
loadout part 3: custom names and descriptions
2021-01-27 19:09:41 -07:00
Letter N 125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
timothyteakettle 837e766306 fixes sanitization 2021-01-19 01:04:01 +00:00
Timothy Teakettle b956df2226 name description implement 2021-01-18 21:59:00 +00:00
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