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

..

beams.dm

Fixes

2016-06-03 23:41:54 -04:00

bullets.dm

consumables

2016-11-08 10:26:29 -05:00

energy.dm

Compiles, and guns work™

2016-05-31 22:50:55 -04:00

force.dm

Here we go again...

2016-05-31 22:50:53 -04:00

magic.dm

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

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

reusable.dm

Sprites & fixes

2016-05-31 22:50:57 -04:00

special.dm

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

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