Markolie 61daab92f2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/modules/mob/living/carbon/human/appearance.dm

2016-10-25 18:31:39 +02:00

..

cache

Fixes negated conditions

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

diseases

Integrates UIDs into View Variables

2016-09-08 19:04:50 -04:00

helper_datums

Moves many uses of log_to_dd to log_runtime, to make the output

2016-08-24 09:55:19 -07:00

ruins

Hopefully final

2016-06-08 18:30:26 +02:00

spells

Fix spells, shadow/Diona QoL improvements (HUD icons)

2016-10-25 18:11:09 +02:00

weather

Added Legion megafauna, updated weather and some minor other refactors/changes.

2016-10-24 02:16:45 +02:00

wires

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

action.dm

Part three: The Hierophant. Also minor fixes for the other bosses.

2016-10-24 21:39:40 +02:00

ai_law_sets.dm

Replace format code

2016-04-14 03:21:23 +09:00

ai_laws.dm

Mass replace

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

beam.dm

Tesla Update/Rebalance

2016-04-30 06:44:01 -04:00

browser.dm

Mass replace

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

cargoprofile.dm

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04:00

computerfiles.dm

…

datacore.dm

Conflict resolution.

2016-08-18 03:28:03 -04:00

datumvars.dm

Lay groundwork for megafauna, and add Ashdragon.

2016-10-23 23:15:57 +02:00

gas_mixture.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

hud.dm

Fixes

2016-06-09 21:36:23 -05:00

material_container.dm

Adds tranquillite

2016-03-06 01:49:30 -05:00

mind.dm

Identity theft objective set fix, tank examine fix, proccall null return fix

2016-10-21 17:51:38 +02: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

Hopefully final

2016-06-08 18:30:26 +02:00

spell.dm

Add Colossus, add outdoors variable to areas and update fireball targeting

2016-10-25 04:10:52 +02:00

statclick.dm

Spaces to tabs

2016-08-15 20:24:55 -07:00

supplypacks.dm

Removed all the commented sections after testing.

2016-09-09 17:53:11 +10:00

uplink_item.dm

Merge pull request #5646 from Fox-McCloud/grenade-tweak

2016-10-10 20:54:23 -04:00

vision_override.dm

…