From e09fb44d5b87ff8a1c4e771780bc7dc78bee0a3d Mon Sep 17 00:00:00 2001 From: coldud13 Date: Thu, 11 May 2023 15:53:08 +1000 Subject: [PATCH] [MANUAL MIRROR] Minor updates to the Occupational Corruption Device (#75122) (#21070) Minor updates to the Occupational Corruption Device (#75122) This PR makes a few changes to the Occupational Corruption Device, the job-specific traitor item that allows you to summon a bureaucratic error event. Largely untouched for years, even across the change from standard to progression traitor. It now triggers directly from the uplink, which means no more self-deleting remote. Now, it functions like the comms blackout/grid check "viruses". This, however, led me to a major problem -- No remote means there is no longer an "Occupational Corruption Device", abandoning the pun intended by the original author. To remedy this, the Occupational Corruption Device is now the "Organic Capital Disturbance virus". Different words, same stupid acronym. (The description is a bit more direct now too). Co-authored-by: Rhials --- code/game/objects/items/devices/ocd.dm | 11 ----------- code/modules/uplink/uplink_items/job.dm | 17 +++++++++++------ tgstation.dme | 1 - 3 files changed, 11 insertions(+), 18 deletions(-) delete mode 100644 code/game/objects/items/devices/ocd.dm diff --git a/code/game/objects/items/devices/ocd.dm b/code/game/objects/items/devices/ocd.dm deleted file mode 100644 index f231c65eb32..00000000000 --- a/code/game/objects/items/devices/ocd.dm +++ /dev/null @@ -1,11 +0,0 @@ -/obj/item/devices/bureaucratic_error_remote - name = "Occupational Corruption Device" - desc = "When you need to make the lives of new-hires that much more confusing, think OCD." - icon = 'icons/obj/device.dmi' - icon_state = "gangtool-white" - -/obj/item/devices/bureaucratic_error_remote/attack_self(mob/user) - var/datum/round_event/bureaucratic_error/event = new() - event.start() - deadchat_broadcast(span_bold("An Occupational Corruption Device has been activated!")) - qdel(src) diff --git a/code/modules/uplink/uplink_items/job.dm b/code/modules/uplink/uplink_items/job.dm index fe66edd0fea..54bd016ba81 100644 --- a/code/modules/uplink/uplink_items/job.dm +++ b/code/modules/uplink/uplink_items/job.dm @@ -16,14 +16,19 @@ limited_stock = 1 //please don't spam deadchat surplus = 5 -/datum/uplink_item/role_restricted/bureaucratic_error_remote - name = "Organic Resources Disturbance Inducer" - desc = "A device that raises hell in organic resources indirectly. Single use." - cost = 2 +/datum/uplink_item/role_restricted/bureaucratic_error + name = "Organic Capital Disturbance Virus" + desc = "Randomizes job positions presented to new hires. May lead to too many/too few security officers and/or clowns. Single use." + item = /obj/effect/gibspawner/generic + surplus = 0 limited_stock = 1 - item = /obj/item/devices/bureaucratic_error_remote + cost = 2 + restricted = TRUE restricted_roles = list(JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER) - surplus = 5 + +/datum/uplink_item/role_restricted/bureaucratic_error/spawn_item(spawn_path, mob/user, datum/uplink_handler/uplink_handler, atom/movable/source) + force_event(/datum/round_event_control/bureaucratic_error, "a syndicate virus") + return source /datum/uplink_item/role_restricted/clumsinessinjector //clown ops can buy this too, but it's in the pointless badassery section for them name = "Clumsiness Injector" diff --git a/tgstation.dme b/tgstation.dme index 1d924c07614..7465f112b79 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1995,7 +1995,6 @@ #include "code\game\objects\items\devices\lightreplacer.dm" #include "code\game\objects\items\devices\megaphone.dm" #include "code\game\objects\items\devices\multitool.dm" -#include "code\game\objects\items\devices\ocd.dm" #include "code\game\objects\items\devices\pipe_painter.dm" #include "code\game\objects\items\devices\polycircuit.dm" #include "code\game\objects\items\devices\portable_chem_mixer.dm"