Xhuis 2bb832ca9c Conflicts II

2016-05-22 15:04:48 -04:00

..

admin

Tweaks

2016-05-15 17:51:55 -04:00

assembly

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

2016-05-07 12:33:06 +02:00

atmospherics

[s] Simple animals can no longer drag-drop people into cryo or sleepers. (#17689)

2016-05-16 18:47:52 -05:00

awaymissions

Merge pull request #17284 from MMMiracles/spookyjookie

2016-05-13 20:22:56 -04:00

cargo

Merge pull request #17654 from coiax/fix-17624

2016-05-15 14:59:42 +02:00

chatter

improve chatter regex to prevent infinite loop

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

client

Fixes announcement prefs, fixes SOUND_ANNOUNCEMENTS (#17626)

2016-05-14 00:55:50 +02:00

clothing

Explorer Gear

2016-05-18 00:31:48 -05:00

crafting

Respect the freeze

2016-05-18 00:37:03 -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

Unborks the greentext being too greentextful (#17699)

2016-05-16 20:35:33 -05:00

flufftext

…

food&drinks

Moved crayon code out of toys.dm and into crayons.dm

2016-05-10 22:53:47 +02:00

games

Even more Cards Against Spess tweaks. (#17398)

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

holiday

Turns tablecrafting into personal crafting (#17341)

2016-05-09 18:14:48 +02:00

holodeck

…

html_interface

…

hydroponics

SLIP-SANITY (#17096)

2016-05-10 22:52:05 -05:00

jobs

Explorer Gear

2016-05-18 00:31:48 -05:00

library

Adds new objective for devils to have X people on station be sintouched. (#17616)

2016-05-17 21:37:08 +01:00

lighting

…

mining

Explorer Gear

2016-05-18 00:31:48 -05:00

mob

Conflicts II

2016-05-22 15:04:48 -04:00

ninja

Ghost role event code cleanup (#17206)

2016-05-09 17:10:11 +02:00

paperwork

Merge pull request #17615 from lordpidey/paperFix

2016-05-17 20:29:36 +02:00

power

Conflicts II

2016-05-18 17:52:04 -04:00

procedural mapping

Machine/computer boards and frames refactor (#17300)

2016-05-08 12:11:18 +02:00

projectiles

Merge pull request #17698 from coiax/mehki-did-it

2016-05-18 18:03:12 +02:00

reagents

Conflicts II

2016-05-16 18:17:33 -04:00

recycling

Replaced istype(loc, /mob) with ismob(loc)

2016-05-14 19:17:12 -05:00

research

Merge pull request #17619 from phil235/FixRnDThrow

2016-05-13 17:36:51 -04:00

ruins

Adds new items to the mining vendors. (#17362)

2016-05-11 22:19:47 -05:00

security levels

…

shuttle

Adds two alternate shuttles (#17592)

2016-05-14 19:06:25 -05:00

space transition

…

spells

Adds new objective for devils to have X people on station be sintouched. (#17616)

2016-05-17 21:37:08 +01:00

stock_market

fixes a typo

2016-04-30 07:31:26 -04:00

surgery

Specflag'd Dismemberment (#17469)

2016-05-15 22:05:42 +02:00

telesci

Adds new items to the mining vendors. (#17362)

2016-05-11 22:19:47 -05:00

tgui

…

tooltip

…

uplink

KA rebalance; brings back holding a satchel

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

vehicles

…