diff --git a/packs/infinity/icons/mob/wrist_computer.dmi b/maps/sierra/icons/mob/wrist_computer.dmi similarity index 100% rename from packs/infinity/icons/mob/wrist_computer.dmi rename to maps/sierra/icons/mob/wrist_computer.dmi diff --git a/packs/infinity/icons/obj/wrist_computer.dmi b/maps/sierra/icons/obj/wrist_computer.dmi similarity index 100% rename from packs/infinity/icons/obj/wrist_computer.dmi rename to maps/sierra/icons/obj/wrist_computer.dmi diff --git a/packs/infinity/items/modular_computer.dm b/maps/sierra/items/modular_computer.dm similarity index 95% rename from packs/infinity/items/modular_computer.dm rename to maps/sierra/items/modular_computer.dm index 4416534e7ad16..7a40af5d3b4c9 100644 --- a/packs/infinity/items/modular_computer.dm +++ b/maps/sierra/items/modular_computer.dm @@ -1,7 +1,7 @@ /obj/item/modular_computer/pda/wrist name = "wrist computer" desc = "A wrist-mounted modular personal computer. Very stylish." - icon = 'packs/infinity/icons/obj/wrist_computer.dmi' + icon = 'maps/sierra/icons/obj/wrist_computer.dmi' icon_state = "wc_base" color = COLOR_GUNMETAL item_state_slots = list(slot_wear_id_str = "wc_base") @@ -11,10 +11,10 @@ slot_flags = SLOT_ID | SLOT_BELT icon_state_unpowered = "wc_base" - item_icons = list(slot_wear_id_str = 'packs/infinity/icons/mob/wrist_computer.dmi') + item_icons = list(slot_wear_id_str = 'maps/sierra/icons/mob/wrist_computer.dmi') item_state = "wc_base" - interact_sounds = list('packs/infinity/sound/items/ui_pipboy_select.wav') + interact_sounds = list('maps/sierra/sound/items/ui_pipboy_select.wav') /obj/item/modular_computer/pda/wrist/get_mob_overlay(mob/user_mob, slot) var/image/ret = ..() diff --git a/maps/sierra/loadout/loadout_pda.dm b/maps/sierra/loadout/loadout_pda.dm index 05060c149b4e3..ebf78965c1420 100644 --- a/maps/sierra/loadout/loadout_pda.dm +++ b/maps/sierra/loadout/loadout_pda.dm @@ -41,7 +41,6 @@ . = item -/* SIERRA TODO: /datum/gear/utility/wrist_computer display_name = "Wrist computer selection" path = /obj/item/modular_computer/pda/wrist @@ -84,4 +83,3 @@ NME.log_in() if(H.equip_to_slot_if_possible(item, slot, del_on_fail = 1)) . = item - */ diff --git a/maps/sierra/sierra.dm b/maps/sierra/sierra.dm index d82e2ac3046e6..d365586a9cb80 100644 --- a/maps/sierra/sierra.dm +++ b/maps/sierra/sierra.dm @@ -58,6 +58,7 @@ #include "items/items.dm" #include "items/lighting.dm" #include "items/machinery.dm" + #include "items/modular_computer.dm" #include "items/manuals.dm" #include "items/mech.dm" #include "items/papers.dm" diff --git a/packs/infinity/sound/items/ui_pipboy_select.wav b/maps/sierra/sound/items/ui_pipboy_select.wav similarity index 100% rename from packs/infinity/sound/items/ui_pipboy_select.wav rename to maps/sierra/sound/items/ui_pipboy_select.wav diff --git a/packs/infinity/_datums/loadout/gears.dm b/packs/infinity/_datums/loadout/gears.dm deleted file mode 100644 index 85ca313f9055e..0000000000000 --- a/packs/infinity/_datums/loadout/gears.dm +++ /dev/null @@ -1,42 +0,0 @@ -/datum/gear/utility/wrist_computer - display_name = "Wrist computer selection" - path = /obj/item/modular_computer/pda/wrist - cost = 2 - -/datum/gear/utility/wrist_computer/New() - ..() - var/wcomp = list() - slot = slot_wear_id - wcomp["black"] = /obj/item/modular_computer/pda/wrist/ - wcomp["lightgrey"] = /obj/item/modular_computer/pda/wrist/grey - wcomp["black-red (sec)"] = /obj/item/modular_computer/pda/wrist/security - wcomp["brown (sup)"] = /obj/item/modular_computer/pda/wrist/cargo - wcomp["yellow (eng)"] = /obj/item/modular_computer/pda/wrist/engineering - wcomp["navy (heads)"] = /obj/item/modular_computer/pda/wrist/heads - wcomp["navy-red (hos)"] = /obj/item/modular_computer/pda/wrist/heads/hos - wcomp["navy-gold (capt)"] = /obj/item/modular_computer/pda/wrist/captain - wcomp["navy-blue (cmo)"] = /obj/item/modular_computer/pda/wrist/heads/cmo - wcomp["navy-white (hop)"] = /obj/item/modular_computer/pda/wrist/heads/hop - wcomp["navy-yellow (ce)"] = /obj/item/modular_computer/pda/wrist/heads/ce - wcomp["navy-darkgreen (rd)"] = /obj/item/modular_computer/pda/wrist/heads/rd - wcomp["blue (med)"] = /obj/item/modular_computer/pda/wrist/medical - wcomp["purple (exp)"] = /obj/item/modular_computer/pda/wrist/explorer - wcomp["lightgrey-darkgreen (sci)"] = /obj/item/modular_computer/pda/wrist/science - wcomp["lightgrey-yellowblue (robot)"]= /obj/item/modular_computer/pda/wrist/roboticist - wcomp["black (mercs)"] = /obj/item/modular_computer/pda/wrist/syndicate - wcomp["short (lightgrey)"] = /obj/item/modular_computer/pda/wrist/lila - wcomp["short (black)"] = /obj/item/modular_computer/pda/wrist/lila/black - gear_tweaks += new/datum/gear_tweak/path(wcomp) - -/datum/gear/utility/wrist_computer/spawn_on_mob(mob/living/carbon/human/H, metadata) - var/obj/item/modular_computer/pda/wrist/item = spawn_item(H, H, metadata) - var/obj/item/card/id = H.GetIdCard() - if(id) - item.attackby(id, H) - if(item.tesla_link && !istype(H, /mob/living/carbon/human/dummy)) //PDA in loadout shouldn't work - var/datum/extension/interactive/ntos/os = get_extension(item, /datum/extension/interactive/ntos) - if(os && os.active_program && os.active_program.NM && istype(os.active_program, /datum/computer_file/program/email_client)) - var/datum/nano_module/email_client/NME = os.active_program.NM - NME.log_in() - if(H.equip_to_slot_if_possible(item, slot, equip_flags = TRYEQUIP_DESTROY)) - . = item diff --git a/packs/infinity/_pack.dm b/packs/infinity/_pack.dm index 44d74b8f54aa2..4bca2635ff31d 100644 --- a/packs/infinity/_pack.dm +++ b/packs/infinity/_pack.dm @@ -5,7 +5,6 @@ #include "__defines\guns.dm" // DATUMS -#include "_datums\loadout\gears.dm" #include "_datums\reagents\experimental.dm" // HELPERS @@ -38,7 +37,6 @@ #include "items\chairs.dm" #include "items\chemistry.dm" #include "items\grown.dm" -#include "items\modular_computer.dm" #include "items\multimeter.dm" #include "items\powertools.dm" #include "items\towels.dm"