From d88bff9fa9a78672961ff799c72d1b93d90691d8 Mon Sep 17 00:00:00 2001 From: oranges Date: Mon, 11 Dec 2017 09:14:24 +1300 Subject: [PATCH 1/3] Restores the uplink modules, removes LoadComponents --- code/datums/mind.dm | 2 +- .../objects/items/devices/PDA/virus_cart.dm | 2 +- .../objects/items/devices/uplink_devices.dm | 31 --------- .../objects/items/implants/implantuplink.dm | 52 +++++++++++++++ .../components => modules/uplink}/uplink.dm | 0 code/modules/uplink/uplink_devices.dm | 65 +++++++++++++++++++ .../uplink}/uplink_items.dm | 0 .../uplink}/uplink_purchase_log.dm | 0 tgstation.dme | 8 +-- 9 files changed, 123 insertions(+), 37 deletions(-) delete mode 100644 code/game/objects/items/devices/uplink_devices.dm rename code/{datums/components => modules/uplink}/uplink.dm (100%) create mode 100644 code/modules/uplink/uplink_devices.dm rename code/{datums => modules/uplink}/uplink_items.dm (100%) rename code/{datums => modules/uplink}/uplink_purchase_log.dm (100%) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 0a069ad6e3..c0ab1dc015 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -299,7 +299,7 @@ to_chat(traitor_mob, "Unfortunately, [employer] wasn't able to get you an Uplink.") . = 0 else - uplink_loc.LoadComponent(/datum/component/uplink, traitor_mob.key) + uplink_loc.AddComponent(/datum/component/uplink, traitor_mob.key) if(uplink_loc == R) R.traitor_frequency = sanitize_frequency(rand(MIN_FREQ, MAX_FREQ)) diff --git a/code/game/objects/items/devices/PDA/virus_cart.dm b/code/game/objects/items/devices/PDA/virus_cart.dm index e28f6676e8..a678e41445 100644 --- a/code/game/objects/items/devices/PDA/virus_cart.dm +++ b/code/game/objects/items/devices/PDA/virus_cart.dm @@ -95,7 +95,7 @@ to_chat(U, "Virus Sent! The unlock code to the target is: [lock_code]") GET_COMPONENT_FROM(hidden_uplink, /datum/component/uplink, target) if(!hidden_uplink) - hidden_uplink = target.LoadComponent(/datum/component/uplink) + hidden_uplink = target.AddComponent(/datum/component/uplink) target.lock_code = lock_code else hidden_uplink.hidden_crystals += hidden_uplink.telecrystals //Temporarially hide the PDA's crystals, so you can't steal telecrystals. diff --git a/code/game/objects/items/devices/uplink_devices.dm b/code/game/objects/items/devices/uplink_devices.dm deleted file mode 100644 index 2541b33e27..0000000000 --- a/code/game/objects/items/devices/uplink_devices.dm +++ /dev/null @@ -1,31 +0,0 @@ - -// A collection of pre-set uplinks, for admin spawns. -/obj/item/device/radio/uplink/Initialize(mapload, _owner, _tc_amount = 20) - . = ..() - icon_state = "radio" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' - LoadComponent(/datum/component/uplink, _owner, FALSE, TRUE, null, _tc_amount) - -/obj/item/device/radio/uplink/nuclear/Initialize() - . = ..() - GET_COMPONENT(hidden_uplink, /datum/component/uplink) - hidden_uplink.set_gamemode(/datum/game_mode/nuclear) - -/obj/item/device/multitool/uplink/Initialize(mapload, _owner, _tc_amount = 20) - . = ..() - LoadComponent(/datum/component/uplink, _owner, FALSE, TRUE, null, _tc_amount) - -/obj/item/pen/uplink/Initialize(mapload, _owner, _tc_amount = 20) - . = ..() - LoadComponent(/datum/component/uplink) - traitor_unlock_degrees = 360 - -/obj/item/device/radio/uplink/old - name = "dusty radio" - desc = "A dusty looking radio." - -/obj/item/device/radio/uplink/old/Initialize(mapload, _owner, _tc_amount = 10) - . = ..() - GET_COMPONENT(hidden_uplink, /datum/component/uplink) - hidden_uplink.name = "dusty radio" diff --git a/code/game/objects/items/implants/implantuplink.dm b/code/game/objects/items/implants/implantuplink.dm index d1d5adf4b5..6e375848f0 100644 --- a/code/game/objects/items/implants/implantuplink.dm +++ b/code/game/objects/items/implants/implantuplink.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /obj/item/implant/uplink name = "uplink implant" desc = "Sneeki breeki." @@ -47,3 +48,54 @@ /obj/item/implant/uplink/precharged starting_tc = 10 +======= +/obj/item/implant/uplink + name = "uplink implant" + desc = "Sneeki breeki." + icon = 'icons/obj/radio.dmi' + icon_state = "radio" + lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + var/starting_tc = 0 + +/obj/item/implant/uplink/Initialize(mapload, _owner) + . = ..() + AddComponent(/datum/component/uplink, _owner, TRUE, FALSE, null, starting_tc) + +/obj/item/implant/uplink/implant(mob/living/target, mob/user, silent = 0) + GET_COMPONENT(hidden_uplink, /datum/component/uplink) + if(hidden_uplink) + for(var/X in target.implants) + if(istype(X, type)) + var/obj/item/implant/imp_e = X + GET_COMPONENT_FROM(their_hidden_uplink, /datum/component/uplink, imp_e) + if(their_hidden_uplink) + their_hidden_uplink.telecrystals += hidden_uplink.telecrystals + qdel(src) + return TRUE + else + qdel(imp_e) //INFERIOR AND EMPTY! + + if(..()) + if(hidden_uplink) + hidden_uplink.owner = "[user.key]" + return TRUE + return FALSE + +/obj/item/implant/uplink/activate() + GET_COMPONENT(hidden_uplink, /datum/component/uplink) + if(hidden_uplink) + hidden_uplink.locked = FALSE + hidden_uplink.interact(usr) + +/obj/item/implanter/uplink + name = "implanter (uplink)" + imp_type = /obj/item/implant/uplink + +/obj/item/implanter/uplink/precharged + name = "implanter (precharged uplink)" + imp_type = /obj/item/implant/uplink/precharged + +/obj/item/implant/uplink/precharged + starting_tc = 10 +>>>>>>> ea2c37c... Merge pull request #33276 from Cyberboss/FixUplinks diff --git a/code/datums/components/uplink.dm b/code/modules/uplink/uplink.dm similarity index 100% rename from code/datums/components/uplink.dm rename to code/modules/uplink/uplink.dm diff --git a/code/modules/uplink/uplink_devices.dm b/code/modules/uplink/uplink_devices.dm new file mode 100644 index 0000000000..4776b6e1ef --- /dev/null +++ b/code/modules/uplink/uplink_devices.dm @@ -0,0 +1,65 @@ +<<<<<<< HEAD:code/game/objects/items/devices/uplink_devices.dm + +// A collection of pre-set uplinks, for admin spawns. +/obj/item/device/radio/uplink/Initialize(mapload, _owner, _tc_amount = 20) + . = ..() + icon_state = "radio" + lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + LoadComponent(/datum/component/uplink, _owner, FALSE, TRUE, null, _tc_amount) + +/obj/item/device/radio/uplink/nuclear/Initialize() + . = ..() + GET_COMPONENT(hidden_uplink, /datum/component/uplink) + hidden_uplink.set_gamemode(/datum/game_mode/nuclear) + +/obj/item/device/multitool/uplink/Initialize(mapload, _owner, _tc_amount = 20) + . = ..() + LoadComponent(/datum/component/uplink, _owner, FALSE, TRUE, null, _tc_amount) + +/obj/item/pen/uplink/Initialize(mapload, _owner, _tc_amount = 20) + . = ..() + LoadComponent(/datum/component/uplink) + traitor_unlock_degrees = 360 + +/obj/item/device/radio/uplink/old + name = "dusty radio" + desc = "A dusty looking radio." + +/obj/item/device/radio/uplink/old/Initialize(mapload, _owner, _tc_amount = 10) + . = ..() + GET_COMPONENT(hidden_uplink, /datum/component/uplink) + hidden_uplink.name = "dusty radio" +======= + +// A collection of pre-set uplinks, for admin spawns. +/obj/item/device/radio/uplink/Initialize(mapload, _owner, _tc_amount = 20) + . = ..() + icon_state = "radio" + lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + AddComponent(/datum/component/uplink, _owner, FALSE, TRUE, null, _tc_amount) + +/obj/item/device/radio/uplink/nuclear/Initialize() + . = ..() + GET_COMPONENT(hidden_uplink, /datum/component/uplink) + hidden_uplink.set_gamemode(/datum/game_mode/nuclear) + +/obj/item/device/multitool/uplink/Initialize(mapload, _owner, _tc_amount = 20) + . = ..() + AddComponent(/datum/component/uplink, _owner, FALSE, TRUE, null, _tc_amount) + +/obj/item/pen/uplink/Initialize(mapload, _owner, _tc_amount = 20) + . = ..() + AddComponent(/datum/component/uplink) + traitor_unlock_degrees = 360 + +/obj/item/device/radio/uplink/old + name = "dusty radio" + desc = "A dusty looking radio." + +/obj/item/device/radio/uplink/old/Initialize(mapload, _owner, _tc_amount = 10) + . = ..() + GET_COMPONENT(hidden_uplink, /datum/component/uplink) + hidden_uplink.name = "dusty radio" +>>>>>>> ea2c37c... Merge pull request #33276 from Cyberboss/FixUplinks:code/modules/uplink/uplink_devices.dm diff --git a/code/datums/uplink_items.dm b/code/modules/uplink/uplink_items.dm similarity index 100% rename from code/datums/uplink_items.dm rename to code/modules/uplink/uplink_items.dm diff --git a/code/datums/uplink_purchase_log.dm b/code/modules/uplink/uplink_purchase_log.dm similarity index 100% rename from code/datums/uplink_purchase_log.dm rename to code/modules/uplink/uplink_purchase_log.dm diff --git a/tgstation.dme b/tgstation.dme index 0e23640d22..28d5cc4d8f 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -312,8 +312,6 @@ #include "code\datums\shuttles.dm" #include "code\datums\soullink.dm" #include "code\datums\spawners_menu.dm" -#include "code\datums\uplink_items.dm" -#include "code\datums\uplink_purchase_log.dm" #include "code\datums\verbs.dm" #include "code\datums\weakrefs.dm" #include "code\datums\world_topic.dm" @@ -348,7 +346,6 @@ #include "code\datums\components\spooky.dm" #include "code\datums\components\squeek.dm" #include "code\datums\components\thermite.dm" -#include "code\datums\components\uplink.dm" #include "code\datums\diseases\_disease.dm" #include "code\datums\diseases\_MobProcs.dm" #include "code\datums\diseases\anxiety.dm" @@ -922,7 +919,6 @@ #include "code\game\objects\items\devices\taperecorder.dm" #include "code\game\objects\items\devices\traitordevices.dm" #include "code\game\objects\items\devices\transfer_valve.dm" -#include "code\game\objects\items\devices\uplink_devices.dm" #include "code\game\objects\items\devices\PDA\cart.dm" #include "code\game\objects\items\devices\PDA\PDA.dm" #include "code\game\objects\items\devices\PDA\PDA_types.dm" @@ -2390,6 +2386,10 @@ #include "code\modules\tgui\states\zlevel.dm" #include "code\modules\tooltip\tooltip.dm" #include "code\modules\vehicles\_vehicle.dm" +#include "code\modules\uplink\uplink.dm" +#include "code\modules\uplink\uplink_devices.dm" +#include "code\modules\uplink\uplink_items.dm" +#include "code\modules\uplink\uplink_purchase_log.dm" #include "code\modules\vehicles\atv.dm" #include "code\modules\vehicles\bicycle.dm" #include "code\modules\vehicles\entered.dm" From 6a8cffc3d564ba4c63e513865ef401c392f7f432 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 10 Dec 2017 18:03:04 -0500 Subject: [PATCH 2/3] Update implantuplink.dm --- .../objects/items/implants/implantuplink.dm | 52 ------------------- 1 file changed, 52 deletions(-) diff --git a/code/game/objects/items/implants/implantuplink.dm b/code/game/objects/items/implants/implantuplink.dm index 6e375848f0..4f5996b4d1 100644 --- a/code/game/objects/items/implants/implantuplink.dm +++ b/code/game/objects/items/implants/implantuplink.dm @@ -1,54 +1,3 @@ -<<<<<<< HEAD -/obj/item/implant/uplink - name = "uplink implant" - desc = "Sneeki breeki." - icon = 'icons/obj/radio.dmi' - icon_state = "radio" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' - var/starting_tc = 0 - -/obj/item/implant/uplink/Initialize(mapload, _owner) - . = ..() - LoadComponent(/datum/component/uplink, _owner, TRUE, FALSE, null, starting_tc) - -/obj/item/implant/uplink/implant(mob/living/target, mob/user, silent = 0) - GET_COMPONENT(hidden_uplink, /datum/component/uplink) - if(hidden_uplink) - for(var/X in target.implants) - if(istype(X, type)) - var/obj/item/implant/imp_e = X - GET_COMPONENT_FROM(their_hidden_uplink, /datum/component/uplink, imp_e) - if(their_hidden_uplink) - their_hidden_uplink.telecrystals += hidden_uplink.telecrystals - qdel(src) - return TRUE - else - qdel(imp_e) //INFERIOR AND EMPTY! - - if(..()) - if(hidden_uplink) - hidden_uplink.owner = "[user.key]" - return TRUE - return FALSE - -/obj/item/implant/uplink/activate() - GET_COMPONENT(hidden_uplink, /datum/component/uplink) - if(hidden_uplink) - hidden_uplink.locked = FALSE - hidden_uplink.interact(usr) - -/obj/item/implanter/uplink - name = "implanter (uplink)" - imp_type = /obj/item/implant/uplink - -/obj/item/implanter/uplink/precharged - name = "implanter (precharged uplink)" - imp_type = /obj/item/implant/uplink/precharged - -/obj/item/implant/uplink/precharged - starting_tc = 10 -======= /obj/item/implant/uplink name = "uplink implant" desc = "Sneeki breeki." @@ -98,4 +47,3 @@ /obj/item/implant/uplink/precharged starting_tc = 10 ->>>>>>> ea2c37c... Merge pull request #33276 from Cyberboss/FixUplinks From 1eb0e42bb136af9e5f1627f64fd14189c55f3e92 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 10 Dec 2017 18:04:11 -0500 Subject: [PATCH 3/3] Update uplink_devices.dm --- code/modules/uplink/uplink_devices.dm | 34 --------------------------- 1 file changed, 34 deletions(-) diff --git a/code/modules/uplink/uplink_devices.dm b/code/modules/uplink/uplink_devices.dm index 4776b6e1ef..737f92a9ef 100644 --- a/code/modules/uplink/uplink_devices.dm +++ b/code/modules/uplink/uplink_devices.dm @@ -1,36 +1,3 @@ -<<<<<<< HEAD:code/game/objects/items/devices/uplink_devices.dm - -// A collection of pre-set uplinks, for admin spawns. -/obj/item/device/radio/uplink/Initialize(mapload, _owner, _tc_amount = 20) - . = ..() - icon_state = "radio" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' - LoadComponent(/datum/component/uplink, _owner, FALSE, TRUE, null, _tc_amount) - -/obj/item/device/radio/uplink/nuclear/Initialize() - . = ..() - GET_COMPONENT(hidden_uplink, /datum/component/uplink) - hidden_uplink.set_gamemode(/datum/game_mode/nuclear) - -/obj/item/device/multitool/uplink/Initialize(mapload, _owner, _tc_amount = 20) - . = ..() - LoadComponent(/datum/component/uplink, _owner, FALSE, TRUE, null, _tc_amount) - -/obj/item/pen/uplink/Initialize(mapload, _owner, _tc_amount = 20) - . = ..() - LoadComponent(/datum/component/uplink) - traitor_unlock_degrees = 360 - -/obj/item/device/radio/uplink/old - name = "dusty radio" - desc = "A dusty looking radio." - -/obj/item/device/radio/uplink/old/Initialize(mapload, _owner, _tc_amount = 10) - . = ..() - GET_COMPONENT(hidden_uplink, /datum/component/uplink) - hidden_uplink.name = "dusty radio" -======= // A collection of pre-set uplinks, for admin spawns. /obj/item/device/radio/uplink/Initialize(mapload, _owner, _tc_amount = 20) @@ -62,4 +29,3 @@ . = ..() GET_COMPONENT(hidden_uplink, /datum/component/uplink) hidden_uplink.name = "dusty radio" ->>>>>>> ea2c37c... Merge pull request #33276 from Cyberboss/FixUplinks:code/modules/uplink/uplink_devices.dm