shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,302 Commits 5 Branches 0 Tags
3dca4dd3796d94de37a394d9423826903c75d59f
Commit Graph

72 Commits

Author SHA1 Message Date
kevinz000
082d6c75a9 Merge pull request #8688 from Ghommie/Ghommie-cit67 
Ports in bee plushes.
 2019-06-23 06:45:49 -07:00
Ghommie
f963ca050b thanks, badcoder trilby 2019-06-18 23:49:20 +02:00
Fermi
dd7421f130 Missed one. 2019-06-17 12:05:21 +01:00
Thalpy
98fc55e9f8 Merge branch 'master' into Wheelchairs 2019-06-16 17:33:57 +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
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
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
Trilbyspaceclone
601c80999e Update negative.dm 2019-02-14 20:53:21 -05:00
Trilbyspaceclone
81250ae377 Merge branch 'master' into morefamstuff 2019-02-14 20:38:54 -05:00
Trilbyspaceclone
bb37a9679c Update negative.dm 2019-02-14 20:35:03 -05:00
Trilbyspaceclone
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
Ragolution
f981618f7e oops 2019-01-09 17:21:58 -05:00
Ragolution
ff51bf470f git still being weird 2019-01-09 10:10:44 -05:00
Ragolution
7cca2e7fe9 uhhh 
is this something that should be done because i have no idea
 2019-01-09 10:08:34 -05:00
Ragolution
39d75b93b1 Git acting fucky 2019-01-09 09:43:24 -05:00
Ragolution
ae94b2378a Merge branch 'master' into TrilbyTraitTypos 2019-01-09 09:41:52 -05:00
Ragolution
ecf2ed5639 Grammar adjusts for negative traits. 
Improves grammar, spelling and legibility for Mute and Phobia traits. Also adds verbosity for their descriptions and acquisition/loss messages.
 2019-01-09 09:36:16 -05:00
Trilbyspaceclone
889216c8f6 [Ready] New Mute quirk as well as Paper bin and crayon box to load-outs! - Requested by Suru (#7867) 
* Fixing updater

* Update negative.dm

* Update backpack.dm

* Update negative.dm

* Update negative.dm
 2019-01-08 02:38:54 -08:00
Trilbyspaceclone
9961d0e321 More heirlooms! Also changes Mime/Clown's (#7793) 
* More heirlooms

* Update negative.dm

WIP

* makes the knife

* dusty

* Makes everone happy

* grammer
 2018-12-13 11:52:48 -08:00
Trilbyspaceclone
0419301ab0 Adds in Phobia quirk and Mime Phobia! Good grammar and no conflicts (Maybe) (#7602) 
* Phobia quirk.

* Adds in the words

* Should be good now

SHOULD

* Should work now that I added the missing comma!

It will propy fail anyways
 2018-10-03 20:36:45 -07:00
Poojawa
b6430559e9 datums 2018-09-11 02:49:41 -05:00
kevinz000
2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
Jordan Brown
f2124aa3cf Merge pull request #38180 from AutomaticFrenzy/patch/heirloom-clone 
Fix family heirloom being lost on cloning
 2018-06-01 09:51:08 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
CitadelStationBot
270d71d095 [MIRROR] New Trait: Drunken Resilience (#6926) 
* New Trait: Drunken Resilience (#38076)

* drunk healing

* balance, bugfix

* more consistent wording

* removed random chance and tweaked values

* rounding values

* 0 to FALSE, slightly lowered top values

* New Trait: Drunken Resilience
 2018-05-27 17:16:43 -07:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
LetterJay
ea9b3622fd Merge branch 'master' into upstream-merge-37476 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2018-05-20 23:11:16 -05:00
LetterJay
a0b6b4e7d8 Update _trait.dm 2018-05-20 04:30:25 -05:00
LetterJay
8efc7711a7 Merge branch 'master' into upstream-merge-37423 2018-05-16 12:17:57 -05:00
LetterJay
0877bdd4e5 Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646 
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
 2018-05-15 00:47:59 -05:00
LetterJay
e164668c5e Update negative.dm 2018-05-12 21:37:26 -05:00
Iamgoofball
d0a5aaa4ee family heirlooms properly open the bag upon spawning if they're in the bag (#37754) 2018-05-11 17:30:49 -05:00
XDTM
ec3516ea19 [s] Hallucinations 4.0 2018-05-09 16:15:58 -05:00