KorPhaeron d4240c5378 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Igotpaid30dollarstodothis ...

# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi

2016-05-31 12:03:01 -05:00

..

admin

Merge pull request #18016 from lzimann/patch-8

2016-05-31 08:29:16 +12:00

assembly

Fix an antipattern when using canUseTopic

2016-05-22 00:23:47 +00:00

atmospherics

Canisters dump their contents when they burn up (#18043)

2016-05-30 18:53:38 -05:00

awaymissions

Ghost sword orbits on button click, added URL, POI

2016-05-28 12:23:24 +01:00

cargo

Toy cargo crate now contains proper stack of space carpet. (#18057)

2016-05-31 02:16:44 -05:00

chatter

improve chatter regex to prevent infinite loop

2016-05-15 20:12:17 +12:00

client

Fixes merge conflicts

2016-05-27 15:36:56 -07:00

clothing

Removal of station hardsuit jetpack

2016-05-29 11:05:16 +01:00

crafting

Re-adds Spear to tablecrafting menu, SLAPCRAFTING IS STILL ALIVE (#17985)

2016-05-29 08:29:21 -05:00

detectivework

A player can change identity. First and Last touch should both register the real name.

2016-05-13 17:34:34 +02:00

emoji

…

events

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

flufftext

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

food_and_drinks

New Absinthe Sprites (#17976)

2016-05-28 16:52:53 -05:00

games

Even more Cards Against Spess tweaks. (#17398)

2016-05-09 15:00:40 -05:00

holiday

Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui

2016-05-28 00:24:58 +01:00

holodeck

Merges Pull and Grab into a single functionality. Pulling someone is now the same as a passive grab. You can start pulling someone with ctrlclick or by using the grab intent with empty hand. Using the grab intent again on the pulled person tries to grab them aggressively, then neck grab, then kill grab.

2016-05-24 01:28:04 +02:00

html_interface

…

hydroponics

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

jobs

Gives the bartender the slim armor variant.

2016-05-28 14:14:41 -07:00

library

Merge pull request #18005 from swankcookie/book_length

2016-05-29 17:05:33 +12:00

lighting

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

mining

You've been down too long in the midnight sea

2016-05-30 23:35:03 -05:00

mob

Fixes infinite slip

2016-05-31 00:54:50 -07:00

ninja

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

paperwork

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

power

Merge pull request #17991 from coiax/fix-17990

2016-05-30 10:55:18 +12:00

procedural_mapping

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

projectiles

Merge pull request #17998 from phil235/ShotgunSawoffFix

2016-05-30 10:55:42 +12:00

reagents

Fixes bug where krokodil addiction wasn't horrific (#18075)

2016-05-31 02:12:43 -05:00

recycling

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

research

Removes gatling gun from R&D (#17629)

2016-05-26 14:50:16 -05:00

ruins

Ghost sword orbits on button click, added URL, POI

2016-05-28 12:23:24 +01:00

security_levels

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

shuttle

Adds admin logging to megafauna movement

2016-05-28 16:26:28 +01:00

space_transition

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

spells

Merge pull request #18018 from Xhuis/general_rabbits

2016-05-29 13:34:58 -05:00

stock_market

…

surgery

Fixes merge conflicts

2016-05-27 15:36:56 -07:00

telesci

dds a proper canUseTopic check to gp (#18072)

2016-05-31 02:10:36 -05:00

tgui

Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui

2016-05-28 00:24:58 +01:00

tooltip

…

uplink

KA rebalance; brings back holding a satchel

2016-05-17 00:38:29 +01:00

vehicles

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

zombie

Infectious zombies are now a full subspecies

2016-05-31 00:15:10 +01:00