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

# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi

2017-02-06 20:37:03 +01:00

..

laborcamp

UID mass replace: src=\ref[src]

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

lavaland

Add immortality talisman, add final items

2017-02-06 20:08:52 +01:00

abandonedcrates.dm

Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions

2017-02-06 19:55:37 +01:00

coins.dm

Merge branch 'master' into w_class

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

equipment_locker.dm

Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions

2017-02-06 19:55:37 +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

Add Lavaland reagents, fix mine lamp luminosity

2017-01-20 23:35:56 +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

hit ore box with advanced mining scanner to interact with it

2017-02-05 09:30:01 +04:00

shelters.dm

updates

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