Kyep 682b9aaaf3 fixes merge conflict

2018-04-25 23:36:39 -07:00

..

admin

fixes merge conflict

2018-04-25 23:36:39 -07:00

alarm

…

arcade

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

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

assembly

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

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

atmos_automation

Removes All Weapons

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

awaymissions

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

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

busy_space

…

client

Rust-G integration. Makes logging procs 2-3 times less expensive (EVEN WITH CALL OVERHEAD). tgstation/tgstation#36858

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

clothing

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

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

countdown

Ports TG's Garbage Subsystem

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

crafting

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

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

customitems

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

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

detective_work

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

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

economy

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

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

error_handler

Completely Overhaul Logging

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

events

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

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

examine

Removes All Weapons

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

ext_scripts

Whoops

2018-03-22 15:41:33 -07:00

fancytitle

…

fish

Removes All Weapons

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

flufftext

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

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

food_and_drinks

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

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

holiday

Removes All Weapons

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

hydroponics

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

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

karma

Completely Overhaul Logging

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

library

Convert a bunch of name/(ckey) to key_name + ISO-8601 timestamps

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

lighting

…

logic

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

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

map_fluff

…

martial_arts

Fix runtime logs & Remove a bunch of painful admin notifications

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

mining

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

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

mob

fixes merge conflict

2018-04-25 23:36:39 -07:00

modular_computers

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

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

nano

Completely Overhaul Logging

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

ninja

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

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

paperwork

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

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

pda

comment

2018-04-25 23:24:27 -04:00

persistence

…

power

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

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

procedural_mapping

Removes All Weapons

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

projectiles

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

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

reagents

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

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

recycling

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

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

research

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

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

ruins

…

scripting

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

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

security_levels

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

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

shuttle

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

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

space_management

…

spacepods

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

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

station_goals

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

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

store

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

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

surgery

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

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

telesci

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

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

tooltip

…

tram

…

vehicle

Removes All Weapons

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

vr

Removes All Weapons

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