Robustin 7a4a7c3272 Merge branch 'master' of https://github.com/tgstation/-tg-station into gangguns2 ...

# Conflicts:
#	icons/obj/turrets.dmi

2017-05-16 17:37:00 -04:00

..

admin

Cleans up some Initializes (#27174)

2017-05-13 07:35:18 -06:00

assembly

Changes a bunch of hrefs to the proper defines (#26760)

2017-05-02 01:19:51 -06:00

atmospherics

Cleans up some Initializes (#27174)

2017-05-13 07:35:18 -06:00

awaymissions

Ports radios to Initialize (#27262)

2017-05-15 13:06:31 -03:00

cargo

Merge pull request #27218 from Cruix/selltech

2017-05-14 21:42:26 -03:00

chatter

…

client

Conflicts plus changes the text to match it being a date instead of age

2017-05-08 19:57:28 -03:00

clothing

Ports radios to Initialize (#27262)

2017-05-15 13:06:31 -03:00

crafting

Adds a few new recipes created with plastic sheets (#27257)

2017-05-15 09:02:24 -03:00

detectivework

Fixes detective scanner not being able to ranged scan, adds range/viewcheck vars (#26846)

2017-05-04 19:54:31 -03:00

emoji

…

error_handler

persistent investigate and game logs separated by round ID

2017-04-27 22:10:51 +10:00

events

Goats eat glowshrooms

2017-05-13 10:47:23 +01:00

flufftext

Moves playsound_local() to mob and gets rid of a useless proc. (#26726)

2017-05-01 20:01:55 -06:00

food_and_drinks

Adds Several Butter-filled Foods (#27169)

2017-05-13 07:38:41 -06:00

games

…

holiday

…

holodeck

Initialize Refactor (#25981)

2017-04-27 09:02:29 +12:00

html_interface

…

hydroponics

Adds Bonfire Grills (#27250)

2017-05-16 11:27:08 -03:00

jobs

Fixes engraved messages (#27186)

2017-05-14 21:50:16 +02:00

language

Fixes language_holder's Destroy (#27204)

2017-05-14 21:44:12 -03:00

library

Fixes engraved messages (#27186)

2017-05-14 21:50:16 +02:00

lighting

Fixes nested lights not working properly

2017-05-08 14:16:46 -07:00

mapping

Fixes some things not using log_world

2017-05-08 10:23:19 -04:00

mining

Adds a disk slot to the ORM, to allow the uploading of new smelter designs (#27224)

2017-05-15 09:04:41 -03:00

mob

Adjusts ear/eye protection based on missing organs (#27291)

2017-05-16 09:07:35 +02:00

modular_computers

Consistency fixes

2017-05-09 03:07:09 +03:00

ninja

…

orbit

…

paperwork

Fixes an overlays runtime (#27180)

2017-05-13 07:33:55 -06:00

power

Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition (#27085)

2017-05-16 08:50:46 +02:00

procedural_mapping

…

projectiles

more gang guns

2017-05-12 16:04:44 -04:00

reagents

Adds a few new recipes created with plastic sheets (#27257)

2017-05-15 09:02:24 -03:00

recycling

Merge pull request #26386 from ChangelingRain/initialnew

2017-04-27 10:15:10 +12:00

research

Adds a disk slot to the ORM, to allow the uploading of new smelter designs (#27224)

2017-05-15 09:04:41 -03:00

ruins

Remaps seed vault, adds bees and changes cherry to cherry bomb in random seed spawn (#27206)

2017-05-14 21:45:25 -03:00

security_levels

Merge pull request #26386 from ChangelingRain/initialnew

2017-04-27 10:15:10 +12:00

shuttle

Fixes rcds working on transit space (#27258)

2017-05-15 09:05:47 -03:00

space_transition

…

spells

[READY]fixes certain things having a 0 cooldown, makes spells recharged by processing instead of spawn. (#27242)

2017-05-15 19:39:50 +12:00

station_goals

…

stock_market

…

surgery

Adjusts ear/eye protection based on missing organs (#27291)

2017-05-16 09:07:35 +02:00

tgui

Moves languages to a holder datum, gives mind its own language holder (#26776)

2017-05-05 15:12:27 +02:00

tooltip

…

uplink

Adds a really stupid syndicate bible, with a great sprite by JStheguy (#27192)

2017-05-16 16:54:00 -03:00

vehicles

…

VR

Removal of checks II

2017-05-01 19:01:16 +01:00

zombie

Merge pull request #26527 from QualityVan/mutanthands

2017-04-29 14:03:53 +12:00