shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,412 Commits 5 Branches 0 Tags
37e26833a68e8236e3940ba43a11ddef7a01405a
Commit Graph

168 Commits

Author SHA1 Message Date
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
Putnam
06c66617e6 m o r e traitor objectives 2020-01-19 18:58:10 -08:00
Putnam
d287835d14 Made quirk blacklisting antag-sided 2020-01-18 21:29:27 -08:00
Putnam
3dc3f28748 Moved cold-blooded to negative, made it cost -2 2020-01-18 18:41:04 -08:00
Putnam
48fadffbfb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-10 17:57:03 -08:00
Ghommie
825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
Putnam
244d46ee41 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-08 17:08:01 -08:00
Putnam
cd35e516ac back by popular demand: maso/nympho 2020-01-07 17:01:14 -08:00
Putnam
2859e6e5ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cold-blooded 2020-01-06 02:07:09 -08:00
Putnam
72dded26f2 cold-blooded trait 2020-01-06 02:06:19 -08:00
Putnam
fba7a8abb0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-05 19:12:28 -08:00
Putnam
d75a525b3c let's fix arousal huh 2020-01-05 19:10:48 -08:00
Ghommie
592422ee70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-05 22:53:00 +01:00
Ghom
ca8d93ad17 Merge branch 'master' into alcohol-intolerance 2020-01-04 23:17:55 +01:00
Ghommie
49f1176170 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-30 16:06:16 +01:00
kevinz000
74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options 
Lewd chem sanity pass/"ERP preferences"
 2019-12-30 00:09:18 -08:00
Putnam
88222c0901 uh, actually did that 2019-12-24 23:58:22 -08:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghom
aea2b8865e Merge pull request #10120 from Citadel-Station-13/night_vision 
Night vision trait but it just boosts barely-lit visibility
 2019-12-21 15:30:32 +01:00
Putnam
758e66ac2d yeah alcohol intolerance 2019-12-20 16:46:38 -08:00