Commit Graph

30 Commits

Author SHA1 Message Date
Linzolle
1e2a4f606c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-08 14:17:00 -06:00
Ghommie
5aed21a6f0 It's just list tabbing, gray. 2019-11-29 07:43:31 +01:00
Lin
6aa6eaafe6 Merge branch 'master' into abductor-update 2019-11-15 23:24:51 +00:00
kevinz000
2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
kappa-sama
17d8998fef emergent gameplay 2019-11-13 16:58:51 -05:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Linzolle
9250b1c103 big uppdate season 2019-10-23 21:08:47 -05:00
Ghommie
3291b9c47a Porting in donut fixes, beepsky smash and Neurotoxin reworks. 2019-06-28 23:17:12 +02:00
Trilbyspaceclone
8d7297c178 Update traumas.dm 2019-05-02 20:07:18 -04:00
Trilbyspaceclone
21d4c0614d Update traumas.dm 2019-05-02 18:50:24 -04:00
Trilbyspaceclone
16dff1969e Update traumas.dm 2019-05-02 18:32:33 -04:00
Trilbyspaceclone
44e02f7f6a Update traumas.dm 2019-05-02 17:40:39 -04:00
Trilbyspaceclone
bf36beb395 Update traumas.dm 2019-04-29 22:20:01 -04:00
Trilbyspaceclone
a6d825ae4a Update traumas.dm 2019-01-13 13:44:18 -05:00
Trilbyspaceclone
b64a15d672 ... 2019-01-10 23:17:28 -05:00
Trilbyspaceclone
12bbdba4f0 medical name -> cats 2019-01-10 23:17:02 -05:00
Trilbyspaceclone
d7f7659a2b Drunk cats dont make good coders 2019-01-10 22:59:12 -05:00
Trilbyspaceclone
b48bb178c2 le sigh 2019-01-10 22:40:43 -05:00
Trilbyspaceclone
0e0e79a291 Fine 2019-01-10 22:11:49 -05:00
Trilbyspaceclone
2c9c2c5c5f Adds the items and such 2019-01-10 21:59:47 -05: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
09512a6001 Controllers 2018-09-11 02:04:10 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
CosmicScientist
5d1b06c2e3 Bird and Chasm phobias (#36430)
CosmicScientist

add: Top Nanotrasen scientists have diagnosed two new phobias! Birds and chasms! Good luck Chief Engineers and Miners.


Modified fear of doctors to include plague doctor suit. Who isn't afraid of Medieval medicine?
2018-04-08 16:24:34 -05:00
Emmett Gaines
0832bb62c3 Unit test to make sure all subsystems which initialize call parent 2018-03-20 08:02:17 -05:00
CitadelStationBot
e3831a684f [MIRROR] Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#5892)
* Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#36143)

* -Replaces alien brain necropolis chest loot with new artifact
-Adds new artifact to necropolis chests loot, the Rod of Asclepius
-Adds corresponding status effect and defines

* Update necropolis_chests.dm

fixed spelling

* Spelling FIx

*disperses

* Fixed spelling, lowered the boost to the owner, added oxy heals, and refactored some of the code

* Adds some form of sprites (Still subject to change)

* Adds new sprites, fixes slime people taking toxin damage, and adds the rod to list of snake phobia objects.

* Nerfed clone healing and simple animal healing, fixed healing while dead as well as added a death event, tweaked the sprites, and cleaned up some code.

* Fixed grammar and cleaned up some code.

* Further cleaned up code because Cobby is mean.

* FURTHER cleaned up code
p.s. please send help, Cobby is holding me hostage

* Replaces alien brain necropolis chest loot with new artifact [MERGE READY]
2018-03-10 07:43:42 -06:00
MMMiracles
5493339c7d Adds Tinfoil Hats (#35665)
* adds a tinfoil hat to protect you from government conspiracies and aliens

* qutoes ples

* In the sheets of my sterilized room
In your comfy bed, air-conditioned car
There are vapors and toxins to get you all
In the water you drink, in the air that you breath
In the soil under your shoe

* conspiracy phobia, nodrop on hat once equipped, also CONTRAST

* a single comma

* cyberboss changes

* |=

* central typo fix
2018-02-25 18:11:48 -06:00
Anonmare
b9f3dd587a Adds several new phobias (#35436)
[Changelogs]: Adds four five several new phobias to the ones you might receive, careful, you don't want to be a cultist afraid of your own God now, do you?

cl
add: Nanotrasen psychologists have identified new phobias emerging amongst the workforce. Nanotrasen's surgeon general advises all personnel to just buck up and deal with it.
/cl

[why]: Because I think it would be fun and makes traumas more... Traumatising?
2018-02-19 22:09:17 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00