Commit Graph

1079 Commits

Author SHA1 Message Date
silicons
8989394742 Merge pull request #14270 from LetterN/rustsql
Removes bsql 2
2021-03-03 00:53:46 -07: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
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
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
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
silicons
3b441bfd28 kay 2021-02-13 19:03:27 -07:00
silicons
77f4e08727 AAAAAAAAA 2021-02-13 18:57:30 -07:00
Timothy Teakettle
d858c420aa Update preferences_savefile.dm 2021-02-10 23:18:53 +00: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
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
Letter N
cd5d558fad safety? what's that?
* maybe table-breaking change
2021-01-04 11:57:12 +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
Letter N
56789c5924 firsthit-lib_machines 2020-12-31 16:46:40 +08: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