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

# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	code/_globalvars/mapping.dm
#	code/game/objects/effects/landmarks.dm

2016-12-30 00:17:56 +01:00

..

cache

…

diseases

Ports over the status effect unification

2016-10-23 15:45:35 -07:00

helper_datums

addresses mrrowl comments

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

ruins

…

spells

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

2016-12-23 19:32:19 +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

…

beam.dm

…

browser.dm

…

cargoprofile.dm

Switches reset_view to reset_perspective

2016-12-21 17:59:08 -08: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

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

2016-12-23 19:32:19 +01:00

gas_mixture.dm

…

hud.dm

…

material_container.dm

…

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

…

recipe.dm

further tweaks

2016-10-25 16:46:41 -04:00

ruins.dm

…

shuttles.dm

ALL HAIL LEMONS

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

spell.dm

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

2016-12-23 19:32:19 +01:00

statclick.dm

…

supplypacks.dm

Merge pull request #5764 from Markolie/teg2

2016-10-30 19:56:26 -04:00

uplink_item.dm

- 180 Reverse, Mines now banned from surplus

2016-12-20 10:09:38 +00:00

vision_override.dm

…