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

fixes conflicts probably

# Conflicts:
#	icons/obj/items.dmi

2016-04-28 12:03:31 -07:00

..

admin

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

2016-04-26 21:49:51 +02:00

assembly

…

atmospherics

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

2016-04-24 21:22:37 +02:00

awaymissions

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

2016-04-26 21:49:51 +02:00

cargo

What's it gonna be, loyalty to me? Or loyalty to your country?

2016-04-24 23:24:42 -07:00

client

Merge pull request #16914 from MrStonedOne/clientversionconfig

2016-04-27 19:29:11 -04:00

clothing

adds skull helmet.

2016-04-26 13:35:00 -07:00

crafting

Merge pull request #17108 from Bawhoppen/sandbagsz

2016-04-27 20:23:21 -04:00

detectivework

Removing some comments I had left in.

2016-04-24 21:12:04 +02:00

emoji

…

events

processor overload requires 20 players

2016-04-26 01:05:15 -06:00

flufftext

…

food&drinks

Fixes typos and errors I made.

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

games

First commit of this big PR

2016-04-24 20:26:24 +02:00

holiday

Added animal overlay to drone filters (#17009)

2016-04-24 16:51:16 +01:00

holodeck

First commit of this big PR

2016-04-24 20:26:24 +02:00

html_interface

…

hydroponics

Merge pull request #17157 from Core0verload/botany_nerf_II

2016-04-28 18:21:09 +03:00

jobs

makes sec gloves way more obvious

2016-04-17 21:06:26 -07:00

library

First commit of this big PR

2016-04-24 20:26:24 +02:00

lighting

Make the loader use ChangeTurf() for turfs.

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

mining

Adds survival pod windows to the code

2016-04-28 10:57:39 -06:00

mob

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

2016-04-28 12:03:31 -07:00

ninja

Second commits.

2016-04-24 20:37:00 +02:00

paperwork

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

2016-04-26 21:49:51 +02:00

power

Fixes typos and errors I made.

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

procedural mapping

…

projectiles

Merge pull request #17115 from KorPhaeron/gun_fix

2016-04-27 02:52:22 -05:00

reagents

You can now analyze blobs to check material effects, blob type, and health

2016-04-27 10:24:47 -05:00

recycling

Fixes typos and errors I made.

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

research

Merge pull request #17163 from phil235/ImprinterFix

2016-04-27 12:41:16 -05:00

ruins

Removes ash walker underwear

2016-04-21 03:10:50 -05:00

security levels

Fixes typos and errors I made.

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

shuttle

You can now use your PDA on the emergency shuttle console.

2016-04-26 21:43:11 +02:00

space transition

…

spells

Code review

2016-04-24 16:29:17 +01:00

stock_market

…

surgery

Adds a few organ verbs

2016-04-14 18:53:08 -07:00

telesci

Second commits.

2016-04-24 20:37:00 +02:00

tgui

…

tooltip

…

uplink

Crate being 30 player minimum is stupid

2016-04-14 13:47:40 -03:00

vehicles

Same things but with structures now.

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