c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01: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
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
9effbb1e33
Removed increase/decrease blood var.
2019-06-13 01:58:26 +01:00
18292d4fc6
Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13
2019-06-13 01:46:10 +01:00
fab603fabe
Removed hypnotherapy quirk
2019-06-13 01:44:48 +01:00
f3a3e4c47a
Removed hypnotherapy quirk
2019-06-13 01:31:28 +01:00
a9aa913860
Added remove() for bloodpressure
2019-06-13 01:24:50 +01:00
13853ac6bf
removes family gavel, readds briefcase
2019-06-10 10:16:32 -04:00
400ad0b03b
added family gavel
2019-06-10 09:55:23 -04:00
9f80fbe68b
Coloring gloves? Not on my watch!
2019-06-10 05:20:54 -04:00
4eccc12205
Why are we here? Just to suffer?
2019-06-10 04:56:24 -04:00
628482e53b
Merge branch 'master' into FriendlyEmpathy
2019-06-08 23:45:37 +01:00
d3d2b8d898
should be ready.
2019-06-06 19:24:20 +02:00
ed7d0575b2
Ass Blast USA
2019-06-03 14:40:57 -07:00
a3e60843bc
Renamed blood trait and spelt minutes right.
2019-06-02 22:35:16 +01:00
e607cd3c7d
Fixes para's abilities to use other vehicles.
2019-06-02 19:11:34 +01:00
59e5372abd
Made it so prosthetics can't replace legs. Compiled and tested.
2019-06-02 18:40:56 +01:00
f8586c9699
Adds Friendly and empahty quirk from tg.
2019-06-01 18:51:25 +01:00
7990a20ea6
We don't have wheelchairs? Heresy. Plus fixes to work on citcode. Csafe
2019-06-01 17:20:04 +01:00
44d13818f0
Inital paralysis. ( https://github.com/tgstation/tgstation/pull/41140 )
2019-06-01 16:52:58 +01:00
71eb285472
Few tweaks and fixes to last commits.
2019-05-29 20:04:52 +01:00
ae35366e97
Some fixes before bed.
2019-05-29 05:41:12 +01:00
336ba8dbad
Tidying code.
2019-05-29 02:33:15 +01:00
4607a2b6c3
Compile safe. Today's fixes.
2019-05-27 05:39:52 +01:00
f7655cad25
All compiling errors fixed, except for a few weird ones that I need help
2019-05-11 15:40:06 +01:00
1f78520b68
Adds a new trait that makes you immune from the "positive" effects of hexacrocin and crocin.
2019-04-24 20:13:21 -07:00
9e020eedf7
Update good.dm
2019-04-03 22:44:30 -04:00
124505a4fb
Update good.dm
2019-03-28 23:31:13 -04:00
bdffc9e10c
Merge pull request #8003 from Trilbyspaceclone/morefamstuff
...
More heirloom stuff for Lawyer, Cap and Chap
2019-02-27 16:18:25 -08:00
70b2619bba
Update negative.dm
2019-02-22 21:59:37 -05:00
6f39038bf4
As requested
2019-02-22 11:03:25 -05:00
f9d5c6eec9
[Ready]Adds 2 new quirks! Quick step and Light Sensitivity ( #7933 )
...
* Fixing updater
* Adds the quirk
* Lilly dosnt know how to code this stuff
Watch it brake everything and cry 101
* IDK what im doing
This will likely be speggie code
* correct names are a thing
* Adds light sensitivity
* Adds the debuff
* mite need to ask for helps
* Not used somehow
* Laughs in failer
* H -> h
* Update species.dm
* Speed
* Update species.dm
* Apply suggestions from code review - Ghommie
He got me
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com >
* Update code/modules/mob/living/carbon/human/species.dm
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com >
* Apply suggestions from code review
Rag the grate
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com >
* Update negative.dm
2019-02-22 06:11:16 -08:00
601c80999e
Update negative.dm
2019-02-14 20:53:21 -05:00
81250ae377
Merge branch 'master' into morefamstuff
2019-02-14 20:38:54 -05:00
bb37a9679c
Update negative.dm
2019-02-14 20:35:03 -05:00
fa34212e60
[Ready] Fixes mute trait ( #7959 )
...
* Fuck it lets not have the trait broken
* Update negative.dm
* Update negative.dm
* Update negative.dm
2019-01-27 00:35:16 -08:00
Fermi