Markolie e2587dbbbf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 ...

# Conflicts:
#	code/game/gamemodes/events.dm
#	code/modules/awaymissions/bluespaceartillery.dm

2016-12-23 19:04:35 +01:00

..

area

Resolves Mapping issue with Surgery. Each OR is now its own area.

2016-11-27 20:03:00 -05:00

dna

Merge pull request #5840 from Crazylemon64/adds_reset_perspective

2016-12-23 07:27:36 -05:00

gamemodes

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

2016-12-23 19:04:35 +01:00

jobs

Remove newscast from two missed announcements

2016-10-25 19:50:05 +02:00

machinery

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

2016-12-23 19:04:35 +01:00

magic

…

mecha

Merge pull request #5840 from Crazylemon64/adds_reset_perspective

2016-12-23 07:27:36 -05:00

objects

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

2016-12-23 19:04:35 +01:00

turfs

Wall Rot Effect Refactor

2016-12-14 13:12:10 -05:00

verbs

Merge remote-tracking branch 'upstream/master' into patreon

2016-11-26 16:48:07 -08: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

Switches reset_view to reset_perspective

2016-12-21 17:59:08 -08:00

atoms.dm

Polishes up the reset_view proc, which is basically

2016-12-21 17:56:57 -08:00

data_huds.dm

please god tell me i fixed the morgue conflict

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

response_team.dm

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

2016-10-31 14:46:58 +01: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

Ports over the status effect unification

2016-10-23 15:45:35 -07:00