Kyep 08fdc2bce3 merge conflict fix

2018-04-25 23:48:44 -07:00

..

area

merge conflict fix

2018-04-25 23:48:44 -07:00

dna

Completely Overhaul Logging

2018-04-19 15:07:59 -08:00

gamemodes

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

jobs

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

machinery

merge conflict fix

2018-04-25 23:48:44 -07:00

magic

no more runtimes

2018-03-29 00:44:53 -04:00

mecha

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

objects

merge conflict fix

2018-04-25 23:48:44 -07:00

turfs

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

verbs

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

alternate_appearance.dm

…

asteroid.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

atoms_movable.dm

Ports TG's Garbage Subsystem

2018-03-28 20:02:39 -04:00

atoms.dm

Ports TG Components

2018-04-21 01:22:50 -04:00

data_huds.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

response_team.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

shuttle_engines.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

skincmd.dm

…

smoothwall.dm

…

sound.dm

…

world.dm

Fix runtime logs & Remove a bunch of painful admin notifications

2018-04-25 16:35:02 -07:00