Markolie 3298f7edce Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates ...

# Conflicts:
#	icons/obj/objects.dmi

2017-02-08 19:25:47 +01:00

..

cache

Fixes negated conditions

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

diseases

Hunger Rework

2016-11-28 13:17:46 -05:00

helper_datums

addresses mrrowl comments

2016-12-11 23:11:21 -05:00

ruins

…

spells

Minor fixes, prevent ABSTRACT items from being summoned

2017-02-07 23:54:50 +01: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

…

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

fixes, comfrey, and aloe

2017-01-23 05:25:42 -05:00

computerfiles.dm

…

datacore.dm

Sharper character creation preview images, tails/body accessories now show up in ID photos.

2016-11-25 17:55:57 -05:00

datumvars.dm

On Varedit Fixes

2017-02-07 08:44:50 -05:00

gas_mixture.dm

…

hud.dm

…

material_container.dm

Botany Rework

2017-01-21 18:28:03 -05:00

mind.dm

Merge pull request #6342 from uraniummeltdown/clingmemory

2017-02-07 09:21:32 -05:00

mixed.dm

…

modules.dm

…

periodic_news.dm

…

progressbar.dm

Mass replace

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

recipe.dm

more adjustments and fixes

2017-01-23 05:56:17 -05:00

ruins.dm

…

shuttles.dm

ALL HAIL LEMONS

2016-09-22 02:00:04 -04:00

spell.dm

Tiger's comments

2017-01-22 19:15:26 +01:00

statclick.dm

Tightens the permissions on debug, DI panel, view variables

2017-01-08 22:51:38 -08:00

supplypacks.dm

Merge pull request #6343 from Fox-McCloud/reagent-tank-thingy

2017-02-07 19:58:28 -08:00

uplink_item.dm

even more work

2017-01-22 08:11:31 -05:00

vision_override.dm

…