Joan Lung ff4863b188 Merge pull request #18002 from phil235/CocoonAbuseFix ...

Fixes exploit with cocooning a dragged mob.

2016-05-29 13:19:27 -04:00

..

admin

Removes SHUTTLE_* defines being numeric

2016-05-26 18:16:45 +01:00

assembly

Fix an antipattern when using canUseTopic

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

atmospherics

Layers are now defines (#17949)

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

awaymissions

Layers are now defines (#17949)

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

cargo

Adds stat tracking to cargo

2016-05-17 06:29:42 +01: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

Refactors NOREACT flag; minor cig refactor

2016-05-26 10:12:59 +01:00

crafting

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

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

detectivework

…

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

…

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

Shuttle manipulator (#17436)

2016-05-26 15:15:19 +02: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

Fixes Gibtonite both defusing AND exploding in rare conditions. (#17970)

2016-05-28 12:18:40 -05:00

mob

Merge pull request #18002 from phil235/CocoonAbuseFix

2016-05-29 13:19:27 -04: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 #17922 from Xhuis/momentous_face

2016-05-28 15:58:16 -04:00

procedural_mapping

Renames files under code/ with naughty characters

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

projectiles

fixel projectiles (#18032)

2016-05-29 14:18:16 +02:00

reagents

fix

2016-05-28 14:44:25 -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

Shuttle manipulator (#17436)

2016-05-26 15:15:19 +02:00

security_levels

Renames files under code/ with naughty characters

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

shuttle

Rounds no longer end instantly

2016-05-26 16:43:24 +01:00

space_transition

Renames files under code/ with naughty characters

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

spells

fixes some of the crap maybe

2016-05-28 11:08:46 -05:00

stock_market

…

surgery

Fixes merge conflicts

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

telesci

…

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