Tigercat2000 58103757cc Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ...

Conflicts:
	code/game/gamemodes/newobjective.dm
	code/game/gamemodes/objective.dm

2016-08-10 14:16:42 -07:00

..

cache

Fixes negated conditions

2016-08-01 14:25:38 -07:00

diseases

Fixes negated conditions

2016-08-01 14:25:38 -07:00

helper_datums

Integrates the z level manager with the space transition system

2016-07-29 19:11:36 -07:00

ruins

…

spells

Update horsemask.dm

2016-08-06 11:32:54 +01:00

weather

Removes most hard-coded z level checks

2016-07-31 21:29:03 -07:00

wires

Plastic Explosives Update

2016-07-13 22:04:23 -04:00

action.dm

Adds in Headphones

2016-08-06 19:55:08 -04:00

ai_law_sets.dm

…

ai_laws.dm

Mass replace

2016-07-07 19:34:02 -07:00

beam.dm

…

browser.dm

Mass replace

2016-07-07 19:34:02 -07:00

cargoprofile.dm

Plastic Explosives Update

2016-07-13 22:04:23 -04:00

computerfiles.dm

…

datacore.dm

Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..."

2016-08-08 23:26:51 -04:00

datumvars.dm

Adds no-class mode to bicon proc

2016-07-29 09:00:07 -04:00

gas_mixture.dm

…

hud.dm

…

material_container.dm

…

mind.dm

special_role/objective refactor

2016-08-01 21:29:19 -07:00

mixed.dm

…

modules.dm

…

periodic_news.dm

…

progressbar.dm

Mass replace

2016-07-07 19:34:02 -07:00

recipe.dm

Mass replace

2016-07-07 19:34:02 -07:00

ruins.dm

…

spell.dm

Merge branch 'master' of github.com:ParadiseSS13/Paradise into space_allocation

2016-08-10 11:02:05 -07:00

supplypacks.dm

More Reagent Refactoring

2016-07-19 14:06:41 -04:00

uplink_item.dm

The fact this is inconsistent hurts me.

2016-08-04 11:29:26 -05:00

vision_override.dm

…