cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix PDA option not working (#8216)

Browse Source
This commit is contained in:
Raeschen
2024-04-11 15:15:24 +02:00
committed by GitHub
parent 8a9df74a38
commit 2a2943c3af
4 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/pda/ai.dm
View File

@@ -44,7 +44,7 @@
ttone = "assist" ttone = "assist"
var/our_owner = null // Ref to a pAI var/our_owner = null // Ref to a pAI
/obj/item/device/pda/ai/pai/Initialize(mob/living/silicon/pai/P) //ChompEDIT New --> Initialize /obj/item/device/pda/ai/pai/New(mob/living/silicon/pai/P)
if(istype(P)) if(istype(P))
our_owner = REF(P) our_owner = REF(P)
return ..() return ..()

14
code/modules/pda/pda.dm
View File

@@ -130,7 +130,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
close(usr) close(usr)
return 0 return 0
/obj/item/device/pda/Initialize(var/mob/living/carbon/human/H) //ChompEDIT New --> Initialize /obj/item/device/pda/New(var/mob/living/carbon/human/H)
..() ..()
PDAs += src PDAs += src
PDAs = sortAtom(PDAs) PDAs = sortAtom(PDAs)
@@ -146,7 +146,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
model_name = "Thinktronic 5230 Personal Data Assistant" model_name = "Thinktronic 5230 Personal Data Assistant"
if(2) if(2)
icon = 'icons/obj/pda_slim.dmi' icon = 'icons/obj/pda_slim.dmi'
model_name = "Ward-Takahashi SlimFit<EFBFBD> Personal Data Assistant" model_name = "Ward-Takahashi SlimFit Personal Data Assistant"
if(3) if(3)
icon = 'icons/obj/pda_old.dmi' icon = 'icons/obj/pda_old.dmi'
model_name = "Thinktronic 5120 Personal Data Assistant" model_name = "Thinktronic 5120 Personal Data Assistant"
@@ -172,7 +172,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
) )
if(7) if(7)
icon = 'icons/obj/pda_slider.dmi' //VOREStation edit icon = 'icons/obj/pda_slider.dmi' //VOREStation edit
model_name = "Slider<EFBFBD> Personal Data Assistant" model_name = "Slider Personal Data Assistant"
if(8) if(8)
icon = 'icons/obj/pda_vintage.dmi' icon = 'icons/obj/pda_vintage.dmi'
model_name = "\[ERR:INVALID_MANUFACTURER_ID\] Personal Data Assistant" model_name = "\[ERR:INVALID_MANUFACTURER_ID\] Personal Data Assistant"
@@ -181,9 +181,15 @@ var/global/list/obj/item/device/pda/PDAs = list()
else else
icon = 'icons/obj/pda_old.dmi' icon = 'icons/obj/pda_old.dmi'
log_debug("Invalid switch for PDA, defaulting to old PDA icons. [pdachoice] chosen.") log_debug("Invalid switch for PDA, defaulting to old PDA icons. [pdachoice] chosen.")
add_overlay("pda-pen") //add_overlay("pda-pen") //ChompEDIT no icon ops on New
start_program(find_program(/datum/data/pda/app/main_menu)) start_program(find_program(/datum/data/pda/app/main_menu))
//ChompEDIT START - move icon ops to initialize
/obj/item/device/pda/Initialize()
. = ..()
add_overlay("pda-pen")
//ChompEDIT END
/obj/item/device/pda/proc/can_use(mob/user) /obj/item/device/pda/proc/can_use(mob/user)
return (tgui_status(user, GLOB.tgui_inventory_state) == STATUS_INTERACTIVE) return (tgui_status(user, GLOB.tgui_inventory_state) == STATUS_INTERACTIVE)

18
code/modules/pda/pda_subtypes.dm
View File

@@ -43,7 +43,7 @@
default_cartridge = /obj/item/weapon/cartridge/mime default_cartridge = /obj/item/weapon/cartridge/mime
icon_state = "pda-mime" icon_state = "pda-mime"
/obj/item/device/pda/mime/Initialize() //ChompEDIT New --> Initialize /obj/item/device/pda/mime/New()
. = ..() . = ..()
var/datum/data/pda/app/M = find_program(/datum/data/pda/app/messenger) var/datum/data/pda/app/M = find_program(/datum/data/pda/app/messenger)
if(M) if(M)
@@ -128,7 +128,7 @@
desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a WGW-11 series e-reader." desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a WGW-11 series e-reader."
model_name = "Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant" model_name = "Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant"
/obj/item/device/pda/librarian/Initialize() //ChompEDIT New --> Initialize /obj/item/device/pda/librarian/New()
. = ..() . = ..()
var/datum/data/pda/app/M = find_program(/datum/data/pda/app/messenger) var/datum/data/pda/app/M = find_program(/datum/data/pda/app/messenger)
if(M) if(M)
@@ -171,43 +171,43 @@
) )
var/list/cartridges_to_send_to = list() var/list/cartridges_to_send_to = list()
/obj/item/device/pda/multicaster/command/Initialize() //ChompEDIT New --> Initialize /obj/item/device/pda/multicaster/command/New()
..() ..()
owner = "Command Department" owner = "Command Department"
name = "Command Department (Relay)" name = "Command Department (Relay)"
cartridges_to_send_to = command_cartridges cartridges_to_send_to = command_cartridges
/obj/item/device/pda/multicaster/security/Initialize() //ChompEDIT New --> Initialize /obj/item/device/pda/multicaster/security/New()
..() ..()
owner = "Security Department" owner = "Security Department"
name = "Security Department (Relay)" name = "Security Department (Relay)"
cartridges_to_send_to = security_cartridges cartridges_to_send_to = security_cartridges
/obj/item/device/pda/multicaster/engineering/Initialize() //ChompEDIT New --> Initialize /obj/item/device/pda/multicaster/engineering/New()
..() ..()
owner = "Engineering Department" owner = "Engineering Department"
name = "Engineering Department (Relay)" name = "Engineering Department (Relay)"
cartridges_to_send_to = engineering_cartridges cartridges_to_send_to = engineering_cartridges
/obj/item/device/pda/multicaster/medical/Initialize() //ChompEDIT New --> Initialize /obj/item/device/pda/multicaster/medical/New()
..() ..()
owner = "Medical Department" owner = "Medical Department"
name = "Medical Department (Relay)" name = "Medical Department (Relay)"
cartridges_to_send_to = medical_cartridges cartridges_to_send_to = medical_cartridges
/obj/item/device/pda/multicaster/research/Initialize() //ChompEDIT New --> Initialize /obj/item/device/pda/multicaster/research/New()
..() ..()
owner = "Research Department" owner = "Research Department"
name = "Research Department (Relay)" name = "Research Department (Relay)"
cartridges_to_send_to = research_cartridges cartridges_to_send_to = research_cartridges
/obj/item/device/pda/multicaster/cargo/Initialize() //ChompEDIT New --> Initialize /obj/item/device/pda/multicaster/cargo/New()
..() ..()
owner = "Cargo Department" owner = "Cargo Department"
name = "Cargo Department (Relay)" name = "Cargo Department (Relay)"
cartridges_to_send_to = cargo_cartridges cartridges_to_send_to = cargo_cartridges
/obj/item/device/pda/multicaster/civilian/Initialize() //ChompEDIT New --> Initialize /obj/item/device/pda/multicaster/civilian/New()
..() ..()
owner = "Civilian Services Department" owner = "Civilian Services Department"
name = "Civilian Services Department (Relay)" name = "Civilian Services Department (Relay)"

2
code/modules/pda/pda_vr.dm
View File

@@ -1,7 +1,7 @@
/obj/item/device/pda /obj/item/device/pda
var/delete_id = FALSE //Guaranteed deletion of ID upon deletion of PDA var/delete_id = FALSE //Guaranteed deletion of ID upon deletion of PDA
/obj/item/device/pda/multicaster/exploration/Initialize() //ChompEDIT New --> Initialize /obj/item/device/pda/multicaster/exploration/New()
..() ..()
owner = "Exploration Department" //CHOMP keep explo owner = "Exploration Department" //CHOMP keep explo
name = "Exploration Department (Relay)" //CHOMP keep explo name = "Exploration Department (Relay)" //CHOMP keep explo