Robustin eb7f2ddc99 Merge branch 'master' of https://github.com/tgstation/tgstation into GG3 ...

# Conflicts:
#	icons/obj/guns/projectile.dmi

2017-05-21 17:54:44 -04:00

..

admin

Merge pull request #27450 from lzimann/fucking

2017-05-21 08:56:17 -04:00

assembly

Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344)

2017-05-17 22:54:54 -05:00

atmospherics

Since you can properly scrub Freon now, it doesn't destroy itself. (#27396)

2017-05-21 15:24:43 -06:00

awaymissions

Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344)

2017-05-17 22:54:54 -05:00

cargo

Merge pull request #27218 from Cruix/selltech

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

chatter

…

client

World.dm Refactor (#27268)

2017-05-18 21:53:46 +10:00

clothing

Merge pull request #27283 from Robustin/gangclothes

2017-05-20 19:36:51 -04:00

crafting

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

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

detectivework

…

emoji

…

error_handler

…

events

Slight improvement

2017-05-17 23:31:26 +03:00

fields

[READY]Peacekeeper cyborg projectile dampening fields, attempt three (#27234)

2017-05-18 10:53:55 -06:00

flufftext

…

food_and_drinks

Fixes obtaining blob chems (#27370)

2017-05-18 10:32:43 -06:00

games

…

holiday

…

holodeck

…

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

Merge pull request #26677 from coiax/codespeak

2017-05-17 22:04:16 -04: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

Two more types of Legion and makes environment_smash levels into defines (#27160)

2017-05-21 19:51:52 +12:00

mob

Changed law 3 (#27452)

2017-05-21 06:07:24 -04:00

modular_computers

Consistency fixes

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

ninja

Ninja Refactor (#27316)

2017-05-18 10:21:26 -06:00

orbit

…

paperwork

Merge pull request #27407 from tgstation/lzimann-patch-1

2017-05-19 22:34:17 -04:00

power

Fixes gravity generator admin spam

2017-05-18 10:44:43 -04:00

procedural_mapping

…

projectiles

Merge branch 'master' of https://github.com/tgstation/tgstation into GG3

2017-05-21 17:54:44 -04:00

reagents

Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344)

2017-05-17 22:54:54 -05:00

recycling

…

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

Gives lavaland syndicates the syndicate faction. (#27335)

2017-05-18 09:50:20 +02:00

security_levels

…

shuttle

Two more types of Legion and makes environment_smash levels into defines (#27160)

2017-05-21 19:51:52 +12:00

space_transition

…

spells

Update aimed.dm

2017-05-17 23:39:44 -07:00

station_goals

…

stock_market

…

surgery

Merge pull request #26677 from coiax/codespeak

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

tgui

…

tooltip

…

uplink

Adds modified syringe guns (#27276)

2017-05-19 08:24:37 -03:00

vehicles

Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344)

2017-05-17 22:54:54 -05:00

VR

…

zombie

…