tkdrg cd14959f06 Merge pull request #6970 from Carn/#6881 ...

Resolves #6881 - oxyloss rate

2015-01-11 15:30:35 -03:00

..

admin

Revert "[FEATURE] Emergency Response Team"

2015-01-10 19:55:30 -03:00

assembly

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

2015-01-04 01:52:14 +00:00

awaymissions

Fixes conflicts

2014-12-30 15:12:09 +03:00

client

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

2015-01-04 01:52:14 +00:00

clothing

Revert "[FEATURE] Emergency Response Team"

2015-01-10 19:55:30 -03:00

crafting

fixed compile errors

2014-12-24 21:03:22 -08:00

detectivework

Standardizes attack messages to always show the attacker first (when there is an attacker).

2014-11-24 01:49:34 +01:00

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

events

Fixes mimic spawning in nullspace if the overridden machinery was qdel'ed.

2015-01-10 00:06:53 +01:00

flufftext

further changes to the ranged stun system

2015-01-01 22:22:03 -08:00

food&drinks

Makes butcher's cleaver a child of kitchen knife

2015-01-05 17:23:03 -05:00

holiday

Spookoween should be mucho bettero now

2014-11-04 19:11:23 +01:00

hydroponics

Merge pull request #6818 from Ergovisavi/more_pod_cloning

2015-01-06 22:53:41 -03:00

library

Defines allowed books in main bookcase define

2014-12-31 23:08:23 -05:00

mining

Fixes the holosign projector making signs when put into storage, generalizes can_be_placed_into and improves the check in objects that use it.

2015-01-07 01:09:58 -07:00

mob

Merge pull request #6970 from Carn/#6881

2015-01-11 15:30:35 -03:00

nano

SubSystem rewrite

2014-12-31 13:25:41 +00:00

paperwork

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

2015-01-04 01:52:14 +00:00

power

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

2015-01-04 01:52:14 +00:00

projectiles

Merge pull request #6917 from Nienhaus/FoxV2

2015-01-10 20:38:58 -03:00

reagents

Revert "[FEATURE] Emergency Response Team"

2015-01-10 19:55:30 -03:00

recycling

Merge pull request #6324 from Razharas/GenShit

2014-12-31 17:24:15 -03:00

research

Merge pull request #6747 from paprka/gunchangesv2baby

2015-01-08 16:09:37 -08:00

scripting

Updates/fixes to NTSL

2015-01-03 17:43:43 -08:00

security levels

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

2014-10-05 13:48:11 +02:00

shuttle

Map Update

2015-01-04 01:45:02 +00:00

surgery

Makes butcher's cleaver a child of kitchen knife

2015-01-05 17:23:03 -05:00

telesci

SubSystem rewrite

2014-12-31 13:25:41 +00:00