Shadowlight213 86cbe14d15 Conflict fixes

2016-05-19 20:42:26 -07:00

..

admin

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

2016-05-15 17:19:14 -04:00

assembly

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

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

atmospherics

Merge pull request #17445 from bgobandit/ayygentb

2016-05-19 18:14:18 -05:00

awaymissions

Merge pull request #17284 from MMMiracles/spookyjookie

2016-05-13 20:22:56 -04: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

Conflict fixes

2016-05-19 20:42:26 -07:00

clothing

Explorer Gear

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

crafting

Merge pull request #17762 from Bawhoppen/somefixesIguess

2016-05-19 04:31:25 -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

makes emoji parsing return the text if they runtime

2016-03-16 21:28:36 -07:00

events

Makes space dust event less invisible. (#17720)

2016-05-18 23:56:43 -05:00

flufftext

Revert "Move some stuff from different layers to different planes"

2016-04-29 16:07:23 -05:00

food&drinks

The gibber produces gibs again.

2016-05-18 15:08:25 -04: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

Merge pull request #17218 from phil235/FixTalkingInPipes

2016-04-29 20:34:03 -05:00

html_interface

Fixed 'in' precedence errors.

2015-12-29 17:16:09 -07:00

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

Revert "Move some stuff from different layers to different planes"

2016-04-29 16:07:23 -05:00

mining

Conflict fixes

2016-05-19 20:42:26 -07:00

mob

Conflict fixes

2016-05-19 20:42:26 -07: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

Fixes containment fields randomly not linking (#17734)

2016-05-18 13:00:34 -05:00

procedural mapping

Machine/computer boards and frames refactor (#17300)

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

projectiles

Merge pull request #17765 from Thunder12345/patch-1

2016-05-19 10:28:04 -05:00

reagents

two tiny fixes (#17658)

2016-05-16 10:03:57 -05: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

Fixes typos and errors I made.

2016-04-25 22:29:17 +02:00

shuttle

Adds stat tracking to cargo

2016-05-17 06:29:42 +01:00

space transition

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

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

Conflict fixes

2016-05-19 20:42:26 -07:00

telesci

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

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

tgui

Rename get_ui_data -> ui_data, remove useless shuffle from wires

2016-02-05 17:09:40 -06:00

tooltip

update operative tooltip style(matches syndicate uplink theme)

2016-03-27 19:04:18 -04:00

uplink

KA rebalance; brings back holding a satchel

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

vehicles

Same things but with structures now.

2016-04-24 20:38:33 +02:00