KasparoVy 3e653a6279 Conflict resolution.

2016-09-26 12:17:35 -04:00

..

area

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

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

dna

More Conflict Resolution

2016-09-03 21:29:10 -04:00

gamemodes

Conflict resolution.

2016-09-26 12:17:35 -04:00

jobs

Recolors tanks, tweaks more things

2016-09-03 20:53:15 +02:00

machinery

Conflict resolution.

2016-09-26 12:17:35 -04:00

magic

…

mecha

Ports tg's associative-list research datums

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

objects

Conflict resolution.

2016-09-26 12:17:35 -04: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

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