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

..

admin

Adds "Man up" verb for admins. (#6296)

2018-04-10 17:34:45 -07:00

antagonists

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

arousal

kek

2018-04-02 19:53:36 -07:00

cargo

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

client

Merge branch 'master' into upstream-merge-37476

2018-05-20 23:11:16 -05:00

clothing

Merge pull request #6078 from Commandersand/LOADOUT

2018-05-02 17:29:44 +00:00

crafting

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

custom_loadout

Merge branch 'master' into upstream-merge-37476

2018-05-20 23:11:16 -05:00

events

Oh that blob (#5934)

2018-03-16 03:21:34 -07:00

food_and_drinks/snacks

Filet-O-Adisa

2018-03-05 06:51:48 -06:00

jobs

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

keybindings

Removes ADS + other combat mode tweaks, makes adjuststaminabuffer() affect borg cells, adds sprinting for borgs (#6498)

2018-04-27 07:41:31 -07:00

mentor

Gives a prompt for people to see who is replying to an mhelp (#5963)

2018-03-19 21:27:41 -05:00

mining

modularizes mining shuttle console id lock

2018-01-04 13:17:40 -05:00

mob

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

power

makes lighting a little fancier (#5576)

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

projectiles

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

reagents

Hypospray kits and reworks! (#5907)

2018-03-21 15:28:06 -05:00

recycling/disposal

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

research

removes code bloat

2018-03-24 14:21:14 +08:00

uplink

The Great Trigonometric Sprite Replacement, Phase 1!

2018-02-25 20:10:39 +08:00

vore

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00