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

..

laborcamp

UID mass replace: src=\ref[src]

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

lavaland

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

2017-01-06 17:02:38 +01:00

abandonedcrates.dm

Mass replace

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

coins.dm

Merge branch 'master' into w_class

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

equipment_locker.dm

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

2017-01-11 23:11:29 +01:00

machine_input_output_plates.dm

…

machine_processing.dm

UID mass replace: src=\ref[src]

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

machine_stacking.dm

UID mass replace: src=\ref[src]

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

machine_unloading.dm

Adds in Fast Processing

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

mine_areas.dm

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

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

mine_items.dm

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

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

mine_turfs.dm

Mining Area Tweak

2016-08-21 06:10:51 -04:00

mint.dm

UID mass replace: src=\ref[src]

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

money_bag.dm

UID mass replace: src=\ref[src]

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

ore.dm

Lay groundwork for megafauna, and add Ashdragon.

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

satchel_ore_boxdm.dm

UID mass replace: src=\ref[src]

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

shelters.dm

updates

2016-08-21 11:44:54 -04:00