Cheridan 789e5369df Merge pull request #17419 from phil235/Dismemberment ...

Dismemberment

2016-05-06 18:42:48 -05:00

..

admin

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

2016-05-05 21:57:10 +02:00

assembly

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

atmospherics

Implements freezie floors and buffs frostoil (#17081)

2016-05-01 17:26:46 +10:00

awaymissions

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

2016-05-05 21:57:10 +02:00

cargo

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

2016-05-05 21:57:10 +02:00

client

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

clothing

Fixes lizard body markings appearing behind the bodypart layer.

2016-05-07 01:00:00 +02:00

crafting

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

2016-05-05 21:57:10 +02:00

detectivework

…

emoji

…

events

Makes a really shitty lord of the rings reference

2016-05-05 00:40:06 -05:00

flufftext

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

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

food&drinks

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

2016-05-05 21:57:10 +02:00

games

moar

2016-05-01 08:29:19 -04:00

holiday

…

holodeck

Merge pull request #17218 from phil235/FixTalkingInPipes

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

html_interface

…

hydroponics

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

2016-05-05 21:57:10 +02:00

jobs

helmet standard issue

2016-05-01 13:36:11 -07:00

library

…

lighting

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

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

mining

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

mob

Merge pull request #17419 from phil235/Dismemberment

2016-05-06 18:42:48 -05:00

ninja

Merge pull request #17245 from nullbear/c4-path

2016-05-01 16:41:07 +10:00

paperwork

Merge pull request #17282 from coiax/brobot-is-an-artist

2016-05-03 01:55:01 -05:00

power

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

2016-05-05 21:57:10 +02:00

procedural mapping

Fixes #17196

2016-05-02 12:37:37 +02:00

projectiles

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

2016-05-05 21:57:10 +02:00

reagents

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

2016-05-05 21:57:10 +02:00

recycling

invisibility = 100 and 101 now use defines.

2016-04-29 01:00:05 +02:00

research

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

2016-05-05 21:57:10 +02:00

ruins

Walker tendrils strip mobs before gibbing now

2016-05-02 14:38:41 -05:00

security levels

…

shuttle

Merge pull request #17269 from Core0verload/supplytimer

2016-05-02 00:01:46 -05:00

space transition

…

spells

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

stock_market

fixes a typo

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

surgery

Fixes lizard body markings appearing behind the bodypart layer.

2016-05-07 01:00:00 +02:00

telesci

Merge pull request #17218 from phil235/FixTalkingInPipes

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

tgui

…

tooltip

…

uplink

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

2016-05-05 21:57:10 +02:00

vehicles

…