From 47960ab931313c94b572d04d46498a5c5dc05b3a Mon Sep 17 00:00:00 2001 From: deathride58 Date: Mon, 4 Dec 2017 17:07:28 -0500 Subject: [PATCH] fixes conflict with base cit code, modularizes citadel uplink items file --- .../code/datums/uplink_items_cit.dm | 0 tgstation.dme | 7 +------ 2 files changed, 1 insertion(+), 6 deletions(-) rename code/modules/uplink/uplink_item_cit.dm => modular_citadel/code/datums/uplink_items_cit.dm (100%) diff --git a/code/modules/uplink/uplink_item_cit.dm b/modular_citadel/code/datums/uplink_items_cit.dm similarity index 100% rename from code/modules/uplink/uplink_item_cit.dm rename to modular_citadel/code/datums/uplink_items_cit.dm diff --git a/tgstation.dme b/tgstation.dme index 8cb49902ba..fc3e464c37 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2376,12 +2376,6 @@ #include "code\modules\tgui\states\self.dm" #include "code\modules\tgui\states\zlevel.dm" #include "code\modules\tooltip\tooltip.dm" -<<<<<<< HEAD -#include "code\modules\uplink\uplink.dm" -#include "code\modules\uplink\uplink_item.dm" -#include "code\modules\uplink\uplink_item_cit.dm" -======= ->>>>>>> ccd4981... Merge pull request #32624 from kevinz000/component_uplinks #include "code\modules\vehicles\atv.dm" #include "code\modules\vehicles\bicycle.dm" #include "code\modules\vehicles\pimpin_ride.dm" @@ -2407,4 +2401,5 @@ #include "interface\skin.dmf" #include "modular_citadel\cit_medkits.dm" #include "modular_citadel\cit_screenshake.dm" +#include "modular_citadel\code\datums\uplink_items_cit.dm" // END_INCLUDE