cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,298 Commits 55 Branches 0 Tags
95b8cd3956c3375acd3e76589b24082ba0f3d023
Commit Graph

149 Commits

Author SHA1 Message Date
Fermi
1e454ff1a7 Merge branch 'pr/25' into Blind-quirk-without-anger 2019-09-08 03:29:22 +01:00
Ghommie
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
BlackMajor
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
Fermi
1fb07e286a Removing reviewer comments incase of fullmerge. 2019-08-08 19:53:07 +01:00
Ghommie
6623dd4896 As if they'd care anyway. 2019-07-24 02:03:52 +02:00
Ghommie
3bd0ba0275 Cleaning up Arousal code & co. 2019-07-23 06:39:53 +02:00
EgoSumStultus
4a800e1431 blind quirk 2019-07-21 23:48:53 -07:00
kevinz000
adf2166c57 t 2019-07-08 12:31:15 -07:00
Fermi
fa9ae6d2e7 Feedback regarding trait 2019-06-25 23:52:38 +01: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
Thalpy
f3a3e4c47a Removed hypnotherapy quirk 2019-06-13 01:31:28 +01:00
Thalpy
a9aa913860 Added remove() for bloodpressure 2019-06-13 01:24:50 +01:00
Sishen
13853ac6bf removes family gavel, readds briefcase 2019-06-10 10:16:32 -04:00
Sishen
400ad0b03b added family gavel 2019-06-10 09:55:23 -04:00
Sishen
9f80fbe68b Coloring gloves? Not on my watch! 2019-06-10 05:20:54 -04:00
Sishen
4eccc12205 Why are we here? Just to suffer? 2019-06-10 04:56:24 -04:00
Thalpy
628482e53b Merge branch 'master' into FriendlyEmpathy 2019-06-08 23:45:37 +01:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
BurgerLua
ed7d0575b2 Ass Blast USA 2019-06-03 14:40:57 -07:00
Fermi
a3e60843bc Renamed blood trait and spelt minutes right. 2019-06-02 22:35:16 +01:00
Fermi
e607cd3c7d Fixes para's abilities to use other vehicles. 2019-06-02 19:11:34 +01:00
Fermi
59e5372abd Made it so prosthetics can't replace legs. Compiled and tested. 2019-06-02 18:40:56 +01:00
Fermi
f8586c9699 Adds Friendly and empahty quirk from tg. 2019-06-01 18:51:25 +01:00
Fermi
7990a20ea6 We don't have wheelchairs? Heresy. Plus fixes to work on citcode. Csafe 2019-06-01 17:20:04 +01:00
Fermi
44d13818f0 Inital paralysis. (https://github.com/tgstation/tgstation/pull/41140) 2019-06-01 16:52:58 +01:00
Thalpy
71eb285472 Few tweaks and fixes to last commits. 2019-05-29 20:04:52 +01:00
Fermi
ae35366e97 Some fixes before bed. 2019-05-29 05:41:12 +01:00
Fermi
336ba8dbad Tidying code. 2019-05-29 02:33:15 +01:00
Fermi
4607a2b6c3 Compile safe. Today's fixes. 2019-05-27 05:39:52 +01:00
Fermi
f7655cad25 All compiling errors fixed, except for a few weird ones that I need help 2019-05-11 15:40:06 +01:00
BurgerLua
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
Trilbyspaceclone
9e020eedf7 Update good.dm 2019-04-03 22:44:30 -04:00
Trilbyspaceclone
124505a4fb Update good.dm 2019-03-28 23:31:13 -04:00
kevinz000
bdffc9e10c Merge pull request #8003 from Trilbyspaceclone/morefamstuff 
More heirloom stuff for Lawyer, Cap and Chap
 2019-02-27 16:18:25 -08:00
Trilbyspaceclone
70b2619bba Update negative.dm 2019-02-22 21:59:37 -05:00
Trilbyspaceclone
6f39038bf4 As requested 2019-02-22 11:03:25 -05:00
Trilbyspaceclone
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