phil235 194398cbbd Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor ...

# Conflicts:
#	code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
#	code/game/objects/effects/portals.dm

2016-09-29 01:44:27 +02:00

..

diseases

Merge pull request #20583 from kevinz000/_blames_virology_for_failure_to_git_gud

2016-09-24 19:49:49 +12:00

helper_datums

getrev wrong var patch

2016-09-27 19:01:14 +10:00

martial

Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.

2016-09-27 22:33:08 +02:00

ruins

The Hierophant (#19921)

2016-09-05 10:05:35 +12:00

status_effects

Converts Vanguard to a status effect (#20208)

2016-08-31 09:29:45 +12:00

weather

fixes being able to hide in lockers to ignore weather effects (#20447)

2016-09-13 08:13:23 -05:00

wires

Station Blueprints now contain wire legend (#20559)

2016-09-23 10:24:57 +12:00

action.dm

The Hierophant (#19921)

2016-09-05 10:05:35 +12:00

ai_laws.dm

Adds "law 666" for cyborg devils. (#19646)

2016-08-03 10:18:37 +12:00

beam.dm

…

browser.dm

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

datacore.dm

Fixes kill objectives

2016-08-22 21:58:08 +02:00

datumvars.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

dna.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

dog_fashion.dm

Color variables for scarves/beanie fix (#19438)

2016-07-25 10:23:34 +02:00

gas_overrides.dm

Removes reagent gas, Misc changes, REAGENT CODE OPTIMIZATION

2016-09-02 15:04:51 -07:00

hud.dm

Removes Hand of God gamemode.

2016-09-18 13:32:26 +02:00

martial.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

material_container.dm

Made biogenerator recipes into research datums.

2016-07-31 10:47:36 -04:00

mind.dm

Removes Hand of God gamemode.

2016-09-18 13:32:26 +02:00

mutations.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

outfit.dm

yet more fixes

2016-09-24 00:01:06 -04:00

progressbar.dm

…

recipe.dm

CHEMICAL GAS & Reworks

2016-08-31 19:35:39 -07:00

ruins.dm

Ruin budget system (#17366)

2016-05-08 23:03:42 +10:00

shuttles.dm

Fixes two more bugs (I should really test my maps)

2016-06-30 00:17:31 -07:00

votablemap.dm

…