 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 |
|
|
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
|
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 |
|
|
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
|
6ad09c3de1
|
Update preferences.dm
|
2021-02-01 05:42:42 -05: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 |
|
|
Letter N
|
cd5d558fad
|
safety? what's that?
* maybe table-breaking change
|
2021-01-04 11:57:12 +08: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
|
d80920a500
|
oops! all 0s!
|
2020-12-28 17:10:28 +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
|
c3e9cdd9a5
|
finale
|
2020-12-26 23:09:19 +00:00 |
|
|
timothyteakettle
|
6ecfda1256
|
Update preferences.dm
|
2020-12-23 23:14:08 +00: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 |
|
|
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 |
|