Kyep 7e613798b0 Fixes merge conflict in admin_verbs.dm

2016-10-01 13:26:24 -07:00

..

area

Merge remote-tracking branch 'upstream/master' into strips-out-media

2016-08-17 17:46:26 -04:00

dna

Moves from log_debug to log_runtime for non-fatal abberant states

2016-08-23 17:03:52 -07:00

gamemodes

Integrates UIDs into View Variables

2016-09-08 19:04:50 -04:00

jobs

Fixes merge conflict in admin_verbs.dm

2016-10-01 13:26:24 -07:00

machinery

Fixes door/Move calling its parent twice

2016-09-28 13:01:48 -04:00

magic

…

mecha

Ports tg's associative-list research datums

2016-09-14 20:38:21 -07:00

objects

pais don't gib on wipe

2016-09-26 17:04:34 +02:00

turfs

Redo of clown/mime door fix.

2016-09-12 20:11:54 +10: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

/tg/ mecha - Part 1

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

atoms.dm

Fixes a runtime when a null memo would be attempted to be

2016-08-31 00:27:09 -07:00

data_huds.dm

please god tell me i fixed the morgue conflict

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

response_team.dm

Removes eye color vars on the human, stores it on the eyes

2016-08-13 23:05:32 -07: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