Commit Graph

111 Commits

Author SHA1 Message Date
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
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
DeltaFire
73925501ae I will now proceed to scream internally
Tabby boi bad
2020-07-21 20:13:30 +02: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
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
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
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
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Putnam3145
ed44b3130c Merge pull request #10172 from Ghommie/Ghommie-cit460
Porting several quirks code updates.
2019-12-17 11:51:03 -08:00
Ghommie
7118210911 GOTTA KEEP THIS AROUND UNTIL OFFSTATION ANTAGS ARE STOPPED FROM BEING QUIRK'D.
WIZARDS GOTTA CHANT THEIR MAGICK SOMEHOW.
2019-12-15 23:07:18 +01:00
Ghommie
6593b2a5a7 Fixes some quirks not being properly removed when deleted. 2019-12-15 23:02:41 +01:00
Ghommie
b39ae815f3 Porting several quirks code updates. 2019-12-13 16:12:04 +01:00
kevinz000
fda64df569 Merge pull request #9257 from Thalpy/Blind-quirk-without-anger
[READY] Blind quirk without anger
2019-10-10 02:19:17 -07:00
Fermi
79e85e2cfa Fixes some runtimes 2019-10-04 03:53:02 +01:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Fermi
1e454ff1a7 Merge branch 'pr/25' into Blind-quirk-without-anger 2019-09-08 03:29:22 +01:00
Fermi
1fb07e286a Removing reviewer comments incase of fullmerge. 2019-08-08 19:53:07 +01:00
EgoSumStultus
4a800e1431 blind quirk 2019-07-21 23:48:53 -07:00
Fermi
10109d0fe5 Merge branch 'pr/18' 2019-06-23 19:15:07 +01:00
Fermi
b309490190 Forgot to ctrl+s 2019-06-23 19:02:53 +01:00
Fermi
8992dbfa4d Commented out hypnoquirk and edited it so that it functions differently 2019-06-23 18:59:15 +01:00
kevinz000
082d6c75a9 Merge pull request #8688 from Ghommie/Ghommie-cit67
Ports in bee plushes.
2019-06-23 06:45:49 -07:00
Fermi
713d849c03 Merge remote-tracking branch 'upstream/master' 2019-06-19 21:02:30 +01:00
Ghommie
f963ca050b thanks, badcoder trilby 2019-06-18 23:49:20 +02:00
Fermi
d092dd1da0 Testing hypnoquirk 2019-06-17 12:47:23 +01:00
Fermi
dd7421f130 Missed one. 2019-06-17 12:05:21 +01:00
Thalpy
fb70b97d5b Tweaks hypnoquirk as the discord seems to really want it. 2019-06-16 20:24:36 +01:00
Thalpy
98fc55e9f8 Merge branch 'master' into Wheelchairs 2019-06-16 17:33:57 +01:00
Fermi
6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
Fermi
9effbb1e33 Removed increase/decrease blood var. 2019-06-13 01:58:26 +01:00
Fermi
18292d4fc6 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-06-13 01:46:10 +01:00
Fermi
fab603fabe Removed hypnotherapy quirk 2019-06-13 01:44:48 +01:00