From 461a28b9a0b67abcc38a48affd728fb28e314d15 Mon Sep 17 00:00:00 2001 From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Date: Thu, 17 Nov 2022 13:40:37 -0500 Subject: [PATCH] Removes Syndicate cyborg's messaging app (#71134) ## About The Pull Request Syndicate borg apps weren't changed to cyborg subtypes when those were added in. ## Why It's Good For The Game Closes https://github.com/tgstation/tgstation/issues/71116 ## Changelog :cl: fix: Syndicate Cyborgs no longer have the PDA messaging app. /:cl: --- code/modules/mob/living/silicon/robot/robot.dm | 2 +- code/modules/mob/living/silicon/silicon.dm | 2 +- code/modules/modular_computers/computers/item/tablet.dm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index d7c0639893f..e7989ad8292 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -93,7 +93,7 @@ /mob/living/silicon/robot/model/syndicate/create_modularInterface() if(!modularInterface) - modularInterface = new /obj/item/modular_computer/tablet/integrated/syndicate(src) + modularInterface = new /obj/item/modular_computer/tablet/integrated/cyborg/syndicate(src) modularInterface.saved_identification = real_name modularInterface.saved_job = "Cyborg" return ..() diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index f41ceeee35d..05260fd7435 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -99,7 +99,7 @@ /mob/living/silicon/robot/model/syndicate/create_modularInterface() if(!modularInterface) - modularInterface = new /obj/item/modular_computer/tablet/integrated/syndicate(src) + modularInterface = new /obj/item/modular_computer/tablet/integrated/cyborg/syndicate(src) modularInterface.saved_job = "Cyborg" return ..() diff --git a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm index b980fd3acb3..7e940696422 100644 --- a/code/modules/modular_computers/computers/item/tablet.dm +++ b/code/modules/modular_computers/computers/item/tablet.dm @@ -371,14 +371,14 @@ /obj/item/modular_computer/tablet/integrated/ui_state(mob/user) return GLOB.reverse_contained_state -/obj/item/modular_computer/tablet/integrated/syndicate +/obj/item/modular_computer/tablet/integrated/cyborg/syndicate icon_state = "tablet-silicon-syndicate" icon_state_powered = "tablet-silicon-syndicate" icon_state_unpowered = "tablet-silicon-syndicate" device_theme = "syndicate" -/obj/item/modular_computer/tablet/integrated/syndicate/Initialize(mapload) +/obj/item/modular_computer/tablet/integrated/cyborg/syndicate/Initialize(mapload) . = ..() if(iscyborg(silicon_owner)) var/mob/living/silicon/robot/robo = silicon_owner