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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi

2017-01-11 23:11:29 +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

Hopefully final

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

spells

Add shapeshift spell, human_req/nonabstract_req support and make Ashdrake reward a shapeshift.

2017-01-06 17:02:38 +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

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

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

2017-01-09 22:00:31 +01: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

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

2016-10-24 22:30:16 -04:00

mixed.dm

Fixes Records

2015-12-05 19:01:51 -05:00

modules.dm

scream

2015-10-08 19:22:11 -04:00

periodic_news.dm

…

progressbar.dm

Mass replace

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

recipe.dm

food

2016-11-29 08:45:46 -05:00

ruins.dm

Hopefully final

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

shuttles.dm

ALL HAIL LEMONS

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

spell.dm

Add shapeshift spell, human_req/nonabstract_req support and make Ashdrake reward a shapeshift.

2017-01-06 17:02:38 +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 #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

Spelling and sanity fixes

2015-09-23 16:20:06 -04:00