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

# Conflicts:
#	code/modules/mob/living/carbon/human/appearance.dm

2016-10-25 18:31:39 +02:00

..

effects

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

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

items

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

2016-10-25 18:31:39 +02:00

random

Mass replace

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

structures

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

2016-10-25 18:31:39 +02:00

buckling.dm

/tg/ mecha - Part 1

2016-08-12 06:14:00 -07:00

empulse.dm

…

explosion.dm

Mass replace

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

items.dm

add_logs() un-fuckery

2016-08-29 17:27:56 -04:00

objs.dm

UID mass replace: src=\ref[src]

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

structures.dm

Mass replace

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

weapons.dm

…