Anonymous 95d9ff2328 Merge branch 'master' into cit_mood ...

Handled Conflict with tgstation.dme

2018-03-16 17:09:57 +03:00

..

components

Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)

2018-03-14 16:49:40 -05:00

mood_events

Adds check if item is sharp

2018-03-13 15:48:26 +03:00

mutations

fixes swarmer event disable regression, modularizes flyperson-only hulk

2018-01-04 13:00:44 -05:00

status_effects

[READY FOR MERGE] The Giant Combat Reworks - Part 1: Goodbye stuns, hello staminacrit (#5463)

2018-03-11 13:32:44 -07:00

traits

Moves code into modular folder

2018-03-07 16:11:48 +03:00

wires

Buffs door security. (#5574)

2018-02-18 19:20:26 -06:00

uplink_items_cit.dm

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00