mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-19 02:56:14 +01:00
Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]"
This commit is contained in:
@@ -44,10 +44,10 @@
|
||||
ttone = "assist"
|
||||
var/our_owner = null // Ref to a pAI
|
||||
|
||||
/obj/item/device/pda/ai/pai/Initialize()
|
||||
if(istype(loc, /mob/living/silicon/pai))
|
||||
our_owner = REF(loc)
|
||||
. = ..()
|
||||
/obj/item/device/pda/ai/pai/New(mob/living/silicon/pai/P)
|
||||
if(istype(P))
|
||||
our_owner = REF(P)
|
||||
return ..()
|
||||
|
||||
/obj/item/device/pda/ai/pai/tgui_status(mob/living/silicon/pai/user, datum/tgui_state/state)
|
||||
if(!istype(user) || REF(user) != our_owner) // Only allow our pAI to interface with us
|
||||
|
||||
@@ -305,4 +305,4 @@ var/list/civilian_cartridges = list(
|
||||
name = "F.R.A.M.E. cartridge"
|
||||
icon_state = "cart"
|
||||
charges = 5
|
||||
messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/frame)
|
||||
messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/frame)
|
||||
|
||||
+5
-10
@@ -1,3 +1,4 @@
|
||||
|
||||
//The advanced pea-green monochrome lcd of tomorrow.
|
||||
|
||||
var/global/list/obj/item/device/pda/PDAs = list()
|
||||
@@ -115,8 +116,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
||||
close(usr)
|
||||
return 0
|
||||
|
||||
/obj/item/device/pda/Initialize()
|
||||
. = ..()
|
||||
/obj/item/device/pda/New(var/mob/living/carbon/human/H)
|
||||
..()
|
||||
PDAs += src
|
||||
PDAs = sortAtom(PDAs)
|
||||
update_programs()
|
||||
@@ -124,13 +125,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
||||
cartridge = new default_cartridge(src)
|
||||
cartridge.update_programs(src)
|
||||
new /obj/item/weapon/pen(src)
|
||||
|
||||
if(ishuman(loc))
|
||||
var/mob/living/carbon/human/H = loc
|
||||
pdachoice = H.pdachoice
|
||||
else
|
||||
pdachoice = 1
|
||||
|
||||
pdachoice = isnull(H) ? 1 : (ishuman(H) ? H.pdachoice : 1)
|
||||
switch(pdachoice)
|
||||
if(1) icon = 'icons/obj/pda_vr.dmi' //VOREStation edit
|
||||
if(2) icon = 'icons/obj/pda_slim.dmi'
|
||||
@@ -505,4 +500,4 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
||||
// Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP
|
||||
/obj/item/device/pda/emp_act(severity)
|
||||
for(var/atom/A in src)
|
||||
A.emp_act(severity)
|
||||
A.emp_act(severity)
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
default_cartridge = /obj/item/weapon/cartridge/mime
|
||||
icon_state = "pda-mime"
|
||||
|
||||
/obj/item/device/pda/mime/Initialize()
|
||||
/obj/item/device/pda/mime/New()
|
||||
. = ..()
|
||||
var/datum/data/pda/app/M = find_program(/datum/data/pda/app/messenger)
|
||||
if(M)
|
||||
@@ -128,7 +128,7 @@
|
||||
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"
|
||||
|
||||
/obj/item/device/pda/librarian/Initialize()
|
||||
/obj/item/device/pda/librarian/New()
|
||||
. = ..()
|
||||
var/datum/data/pda/app/M = find_program(/datum/data/pda/app/messenger)
|
||||
if(M)
|
||||
@@ -171,44 +171,44 @@
|
||||
)
|
||||
var/list/cartridges_to_send_to = list()
|
||||
|
||||
/obj/item/device/pda/multicaster/command/Initialize()
|
||||
. = ..()
|
||||
/obj/item/device/pda/multicaster/command/New()
|
||||
..()
|
||||
owner = "Command Department"
|
||||
name = "Command Department (Relay)"
|
||||
cartridges_to_send_to = command_cartridges
|
||||
|
||||
/obj/item/device/pda/multicaster/security/Initialize()
|
||||
. = ..()
|
||||
/obj/item/device/pda/multicaster/security/New()
|
||||
..()
|
||||
owner = "Security Department"
|
||||
name = "Security Department (Relay)"
|
||||
cartridges_to_send_to = security_cartridges
|
||||
|
||||
/obj/item/device/pda/multicaster/engineering/Initialize()
|
||||
. = ..()
|
||||
/obj/item/device/pda/multicaster/engineering/New()
|
||||
..()
|
||||
owner = "Engineering Department"
|
||||
name = "Engineering Department (Relay)"
|
||||
cartridges_to_send_to = engineering_cartridges
|
||||
|
||||
/obj/item/device/pda/multicaster/medical/Initialize()
|
||||
. = ..()
|
||||
/obj/item/device/pda/multicaster/medical/New()
|
||||
..()
|
||||
owner = "Medical Department"
|
||||
name = "Medical Department (Relay)"
|
||||
cartridges_to_send_to = medical_cartridges
|
||||
|
||||
/obj/item/device/pda/multicaster/research/Initialize()
|
||||
. = ..()
|
||||
/obj/item/device/pda/multicaster/research/New()
|
||||
..()
|
||||
owner = "Research Department"
|
||||
name = "Research Department (Relay)"
|
||||
cartridges_to_send_to = research_cartridges
|
||||
|
||||
/obj/item/device/pda/multicaster/cargo/Initialize()
|
||||
. = ..()
|
||||
/obj/item/device/pda/multicaster/cargo/New()
|
||||
..()
|
||||
owner = "Cargo Department"
|
||||
name = "Cargo Department (Relay)"
|
||||
cartridges_to_send_to = cargo_cartridges
|
||||
|
||||
/obj/item/device/pda/multicaster/civilian/Initialize()
|
||||
. = ..()
|
||||
/obj/item/device/pda/multicaster/civilian/New()
|
||||
..()
|
||||
owner = "Civilian Services Department"
|
||||
name = "Civilian Services Department (Relay)"
|
||||
cartridges_to_send_to = civilian_cartridges
|
||||
@@ -230,8 +230,8 @@
|
||||
icon = 'icons/obj/pda.dmi'
|
||||
icon_state = "pdabox"
|
||||
|
||||
/obj/item/weapon/storage/box/PDAs/Initialize()
|
||||
. = ..()
|
||||
/obj/item/weapon/storage/box/PDAs/New()
|
||||
..()
|
||||
new /obj/item/device/pda(src)
|
||||
new /obj/item/device/pda(src)
|
||||
new /obj/item/device/pda(src)
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
var/on = 0 //Are we currently active??
|
||||
var/menu_message = ""
|
||||
|
||||
/obj/item/radio/integrated/Initialize()
|
||||
. = ..()
|
||||
/obj/item/radio/integrated/New()
|
||||
..()
|
||||
if(istype(loc.loc, /obj/item/device/pda))
|
||||
hostpda = loc.loc
|
||||
if(bot_filter)
|
||||
@@ -133,4 +133,4 @@
|
||||
signal.data["message"] = message
|
||||
|
||||
spawn(0)
|
||||
radio_connection.post_signal(src, signal)
|
||||
radio_connection.post_signal(src, signal)
|
||||
|
||||
Reference in New Issue
Block a user