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

# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi

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

..

laborcamp

UID mass replace: src=\ref[src]

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

lavaland

Remove duplicate ghost check

2016-11-02 12:23:48 +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

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

machine_input_output_plates.dm

-tg- OOP Hud Refactor

2016-04-21 20:28:08 -07:00

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