cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Removes tablets (not PDAs) entirely. [MDB IGNORE] (#17880)

Browse Source 
* Removes tablets (not PDAs) entirely.

* contractor changes

* map changes

* Update assistant.dm

* conflicts

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-12-07 01:07:02 +00:00
committed by GitHub
co-authored by John Willard Zonespace Tom
parent e14f30aae5
commit 2b800b9a23
115 changed files with 416 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/antagonist/revelation.dm
+2 -2
View File
@@ -19,8 +19,8 @@
/datum/computer_file/program/revelation/proc/activate()
if(computer)
if(istype(computer, /obj/item/modular_computer/tablet/integrated)) //If this is a borg's integrated tablet
var/obj/item/modular_computer/tablet/integrated/modularInterface = computer
if(istype(computer, /obj/item/modular_computer/pda/silicon)) //If this is a borg's integrated tablet
var/obj/item/modular_computer/pda/silicon/modularInterface = computer
to_chat(modularInterface.silicon_owner,span_userdanger("SYSTEM PURGE DETECTED/"))
addtimer(CALLBACK(modularInterface.silicon_owner, TYPE_PROC_REF(/mob/living/silicon/robot/, death)), 2 SECONDS, TIMER_UNIQUE)
return
code/modules/modular_computers/file_system/programs/ntmessenger.dm
+1 -1
View File
@@ -405,6 +405,6 @@
send_message(usr, list(locate(href_list["target"])))
if("mess_us_up")
if(!HAS_TRAIT(src, TRAIT_PDA_CAN_EXPLODE))
var/obj/item/modular_computer/tablet/comp = computer
var/obj/item/modular_computer/pda/comp = computer
comp.explode(usr, from_message_menu = TRUE)
return
code/modules/modular_computers/file_system/programs/robotact.dm
+7 -7
View File
@@ -14,12 +14,12 @@
program_icon = "terminal"
/datum/computer_file/program/robotact/on_start(mob/living/user)
if(!istype(computer, /obj/item/modular_computer/tablet/integrated))
if(!istype(computer, /obj/item/modular_computer/pda/silicon))
to_chat(user, span_warning("A warning flashes across \the [computer]: Device Incompatible."))
return FALSE
. = ..()
if(.)
var/obj/item/modular_computer/tablet/integrated/tablet = computer
var/obj/item/modular_computer/pda/silicon/tablet = computer
if(tablet.device_theme == "syndicate")
program_icon_state = "command-syndicate"
return TRUE
@@ -31,7 +31,7 @@
return data
//Implied, since we can't run on non tablets
var/obj/item/modular_computer/tablet/integrated/tablet = computer
var/obj/item/modular_computer/pda/silicon/tablet = computer
var/mob/living/silicon/robot/cyborg = tablet.silicon_owner
@@ -77,7 +77,7 @@
return data
var/mob/living/silicon/robot/cyborg = user
//Implied
var/obj/item/modular_computer/tablet/integrated/tablet = computer
var/obj/item/modular_computer/pda/silicon/tablet = computer
data["Laws"] = cyborg.laws.get_law_list(TRUE, TRUE, FALSE)
data["borgLog"] = tablet.borglog
@@ -89,7 +89,7 @@
if(.)
return
//Implied type, memes
var/obj/item/modular_computer/tablet/integrated/tablet = computer
var/obj/item/modular_computer/pda/silicon/tablet = computer
var/mob/living/silicon/robot/cyborg = tablet.silicon_owner
switch(action)
@@ -148,9 +148,9 @@
* law changes and borg log additions.
*/
/datum/computer_file/program/robotact/proc/force_full_update()
if(!istype(computer, /obj/item/modular_computer/tablet/integrated))
if(!istype(computer, /obj/item/modular_computer/pda/silicon))
return
var/obj/item/modular_computer/tablet/integrated/tablet = computer
var/obj/item/modular_computer/pda/silicon/tablet = computer
var/datum/tgui/active_ui = SStgui.get_open_ui(tablet.silicon_owner, src)
if(active_ui)
active_ui.send_full_update()