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
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
72dded26f2
cold-blooded trait
2020-01-06 02:06:19 -08:00
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
ca8d93ad17
Merge branch 'master' into alcohol-intolerance
2020-01-04 23:17:55 +01:00
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
74edd7b13f
Merge pull request #10243 from Putnam3145/lewdchem-better-options
...
Lewd chem sanity pass/"ERP preferences"
2019-12-30 00:09:18 -08:00
88222c0901
uh, actually did that
2019-12-24 23:58:22 -08:00
e74339ce8b
Jfc that's a lot of work!
2019-12-23 04:24:13 +01:00
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
758e66ac2d
yeah alcohol intolerance
2019-12-20 16:46:38 -08:00
c810145fc1
also adds aphrodisiacs, slaps, all hypno as prefs
2019-12-20 14:47:09 -08:00
f2b46f0951
ROBUST OPTING MECHANICS
2019-12-19 11:14:02 -08:00
ed44b3130c
Merge pull request #10172 from Ghommie/Ghommie-cit460
...
Porting several quirks code updates.
2019-12-17 11:51:03 -08:00
ce5c42f323
Update good.dm
2019-12-15 17:02:00 -07:00
ea84526661
Update good.dm
2019-12-15 16:58:44 -07:00
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
6593b2a5a7
Fixes some quirks not being properly removed when deleted.
2019-12-15 23:02:41 +01:00
b39ae815f3
Porting several quirks code updates.
2019-12-13 16:12:04 +01:00
6cbb0e3ca8
Update good.dm
2019-12-08 19:44:26 -07:00
863b2398ac
Removes the night vision quirk
2019-11-21 06:19:37 -05:00
509fbdf476
initial.
2019-11-07 05:34:02 +01:00
3c6b1109f1
I'm tired.
2019-11-07 00:40:39 +01:00
892b66470b
Fixing several minor runtimes.
2019-11-05 23:07:29 +01:00
79c3700d25
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
2019-10-25 12:42:28 +02:00
e1928a18f1
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
475303bd02
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
2019-10-17 00:50:30 +02:00
fda64df569
Merge pull request #9257 from Thalpy/Blind-quirk-without-anger
...
[READY] Blind quirk without anger
2019-10-10 02:19:17 -07:00
79e85e2cfa
Fixes some runtimes
2019-10-04 03:53:02 +01:00
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
1e454ff1a7
Merge branch 'pr/25' into Blind-quirk-without-anger
2019-09-08 03:29:22 +01:00
2a7b802957
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
2019-08-29 21:01:23 +02:00
13f27c040e
Merge pull request #8848 from Citadel-Station-13/trait_blacklisting
...
Trait blacklisting system: Blacklists Mute and Brain Tumor from ALL heads of staff. Blacklists pacifist + paraplegic from HoS. Blacklists Paraplegic/nolegs from CE. Blacklists phanosthing/no-recognize-faces from HoP
2019-08-18 15:33:08 +12:00
1fb07e286a
Removing reviewer comments incase of fullmerge.
2019-08-08 19:53:07 +01:00
6623dd4896
As if they'd care anyway.
2019-07-24 02:03:52 +02:00
3bd0ba0275
Cleaning up Arousal code & co.
2019-07-23 06:39:53 +02:00
4a800e1431
blind quirk
2019-07-21 23:48:53 -07:00
adf2166c57
t
2019-07-08 12:31:15 -07:00
fa9ae6d2e7
Feedback regarding trait
2019-06-25 23:52:38 +01:00
10109d0fe5
Merge branch 'pr/18'
2019-06-23 19:15:07 +01:00
b309490190
Forgot to ctrl+s
2019-06-23 19:02:53 +01:00
8992dbfa4d
Commented out hypnoquirk and edited it so that it functions differently
2019-06-23 18:59:15 +01:00
082d6c75a9
Merge pull request #8688 from Ghommie/Ghommie-cit67
...
Ports in bee plushes.
2019-06-23 06:45:49 -07:00
713d849c03
Merge remote-tracking branch 'upstream/master'
2019-06-19 21:02:30 +01:00
f963ca050b
thanks, badcoder trilby
2019-06-18 23:49:20 +02:00
d092dd1da0
Testing hypnoquirk
2019-06-17 12:47:23 +01:00
dd7421f130
Missed one.
2019-06-17 12:05:21 +01:00
fb70b97d5b
Tweaks hypnoquirk as the discord seems to really want it.
2019-06-16 20:24:36 +01:00
98fc55e9f8
Merge branch 'master' into Wheelchairs
2019-06-16 17:33:57 +01:00
6b9becce71
Merge branch 'pr/14'
2019-06-14 21:29:04 +01:00
Ghommie