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

..

area

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

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

dna

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

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

gamemodes

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

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

jobs

Fix up a number of ID checks

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

machinery

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

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

magic

…

mecha

Lay groundwork for megafauna, and add Ashdragon.

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

objects

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

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

turfs

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

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

verbs

UID mass replace: src=\ref[datum]

2016-09-05 23:12:08 -04:00

alternate_appearance.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

asteroid.dm

Moves many uses of log_to_dd to log_runtime, to make the output

2016-08-24 09:55:19 -07:00

atoms_movable.dm

Lay groundwork for megafauna, and add Ashdragon.

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

atoms.dm

Lay groundwork for megafauna, and add Ashdragon.

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

data_huds.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

response_team.dm

Conflict resolution.

2016-08-18 03:28:03 -04:00

shuttle_engines.dm

…

skincmd.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

smoothwall.dm

…

sound.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00