Commit Graph

187 Commits

Author SHA1 Message Date
timothyteakettle
39c09a60b8 initial commit 2021-07-13 23:45:31 +01:00
DeltaFire
b105a3c831 Merge pull request #14347 from timothyteakettle/language-tab
the speech panel pr
2021-03-16 20:31:58 +01:00
HeroWithYay
5ee6f23841 Safty isn't a word and even if it was this wouldn't be how you use it in a sentence. 2021-03-14 03:39:31 +13:00
Timothy Teakettle
fa765ec4c3 nope 2021-03-01 20:58:21 +00:00
Putnam
cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
Lin
98736a7a37 Merge pull request #14207 from TyrianTyrell/master
Multilingual fix? (Has since been tested.)
2021-02-13 16:41:10 -06:00
TyrianTyrell
a4bb96f614 Update good.dm 2021-02-12 07:02:14 -05:00
TyrianTyrell
5769cc106b Update good.dm 2021-02-10 13:56:56 -05:00
TyrianTyrell
e5fea58776 Update good.dm 2021-02-08 07:32:22 -05:00
silicons
86066450f3 Merge pull request #14179 from TyrianTyrell/master
Signed language (Requested changes complete)
2021-02-06 11:42:24 -07:00
TyrianTyrell
fb592b70a1 Update negative.dm 2021-02-04 15:10:12 -05:00
TyrianTyrell
44366a4a2e Currently removing phobia picking 2021-02-04 15:04:17 -05:00
TyrianTyrell
678d0c950f Update negative.dm 2021-02-01 05:48:34 -05:00
TyrianTyrell
9bda74c58d Update good.dm 2021-02-01 05:34:45 -05:00
silicons
085540af3c Update negative.dm 2021-01-17 15:21:31 -07:00
silicons
3d8bae8cef Update _quirk.dm 2021-01-17 15:20:37 -07:00
Blue Wildrose
1d296e2816 addtimer proc instead of sleep 2020-12-25 20:18:02 -07:00
Blue Wildrose
147f148c78 Nyctophobia quirk: Effect now triggers in 0.2 seconds instead of instantly 2020-12-25 19:05:13 -07:00
DeltaFire
a3208d1ac8 synth alcohol immunity 2020-11-24 20:27:34 +01:00
Timothy Teakettle
385bd57940 reworks family heirlooms, adds heirlooms that can be based off your species (#13444)
* corgi tracker

* better heirloom system

* typo
2020-10-10 12:15:39 +02:00
timothyteakettle
ffcceb687f fuck2 2020-08-24 03:23:45 +01:00
timothyteakettle
237a3fc682 fuck 2020-08-24 03:22:42 +01:00
timothyteakettle
cd7293a9a2 limbs 2020-08-24 03:19:36 +01:00
silicons
add9d5d0a0 Merge pull request #12889 from timothyteakettle/quirks-are-dumb
minor quirk changes
2020-08-05 15:13:52 -07:00
SiliconMain
8f1a8adcfd Update negative.dm 2020-07-26 04:15:39 -05:00
Timothy Teakettle
c6de85bae4 yes i too like sec being blind 2020-07-24 15:24:02 +01:00
silicons
9222933d77 Merge pull request #12816 from timothyteakettle/wound-port
ports part 1 of tg wounds
2020-07-23 10:25:25 -07:00
DeltaFire
73925501ae I will now proceed to scream internally
Tabby boi bad
2020-07-21 20:13:30 +02:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
TheSpaghetti
16957d78e9 Makes the grammar bad again.
For some reason the fixed grammar didn't compile.
2020-07-18 18:11:48 -04:00
TheSpaghetti
b2e9579217 Fixes typos in the light sensitivity trait.
It was bothering me.
2020-07-17 00:48:45 -04:00
timothyteakettle
584e74590f port1 2020-07-17 02:01:33 +01:00
TheSpaghetti
4b615b8a6f It should actually work now.
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2020-07-14 02:20:27 -04:00
TheSpaghetti
cb8725d08d ok maybe it is 2020-07-12 17:20:08 -04:00
TheSpaghetti
a3531383d3 "monophobia = new" isn't needed 2020-07-12 15:29:32 -04:00
TheSpaghetti
0200c4ca1f Fixed the double period.
Whoops.
2020-07-12 13:13:25 -04:00
TheSpaghetti
d8aa20b4e9 Adds monophobia quirk 2020-07-12 13:11:06 -04:00
Timothy Teakettle
02f46322ad port examine 2020-07-09 18:32:45 +01:00
Ghom
85186a9714 Porting updates related to material datums. (#12317)
* Porting updates related to material datums.

* art_type

* oh oh
2020-05-25 14:21:00 -07:00
Putnam3145
1a6107a518 Removed nymphomania, plus code cleanup (#11641) 2020-03-27 14:03:05 +01:00
Ghommie
8af3d0e2fa Fixing a little issue with the musician trait etcetera. 2020-03-16 00:09:03 +01:00
Ghommie
a817bd6115 Porting the musician and curator beacons. 2020-03-07 00:12:50 +01:00
Detective Google
4c10c830bf Merge remote-tracking branch 'upstream/master' into psych+paramedic 2020-02-20 22:17:55 -06:00
Detective Google
a8f863f901 changes - sprites 2020-02-20 22:17:47 -06:00
Ghom
8365fec82e Update negative.dm 2020-02-08 00:05:23 +01:00
Putnam
53cad493a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul 2020-02-03 03:17:23 -08:00
kevinz000
3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527
Ported further runtime fixes by AnturK.
2020-01-28 17:57:26 -07:00
kevinz000
f199b720aa Merge pull request #10689 from Ghommie/Ghommie-cit524
Even more runtime fixes.
2020-01-25 05:54:20 -07:00
Ghommie
856ef236f3 Further runtime fixes by AnturK. 2020-01-24 23:01:30 +01:00
Ghommie
1ba4c19c64 A couple more. 2020-01-24 03:50:44 +01:00