From d2a93a2659bbabbb4faa9607af5902a4af2a7934 Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Fri, 29 Mar 2024 20:35:41 +0100 Subject: [PATCH] sdaf (#18804) --- .../clothing/spacesuits/rig/rig_wiring.dm | 35 ++++++++++++---- html/changelogs/fluffyghost-fixrighacking.yml | 41 +++++++++++++++++++ 2 files changed, 67 insertions(+), 9 deletions(-) create mode 100644 html/changelogs/fluffyghost-fixrighacking.yml diff --git a/code/modules/clothing/spacesuits/rig/rig_wiring.dm b/code/modules/clothing/spacesuits/rig/rig_wiring.dm index 490a49d685e..b545e7cb9b1 100644 --- a/code/modules/clothing/spacesuits/rig/rig_wiring.dm +++ b/code/modules/clothing/spacesuits/rig/rig_wiring.dm @@ -1,18 +1,29 @@ -/datum/wires/rig - random = 1 - holder_type = /obj/item/rig - -#define RIG_SECURITY 1 -#define RIG_AI_OVERRIDE 2 -#define RIG_SYSTEM_CONTROL 4 -#define RIG_INTERFACE_LOCK 8 -#define RIG_INTERFACE_SHOCK 16 /* * Rig security can be snipped to disable ID access checks on rig. * Rig AI override can be pulsed to toggle whether or not the AI can take control of the suit. * System control can be pulsed to toggle some malfunctions. * Interface lock can be pulsed to toggle whether or not the interface can be accessed. */ +#define RIG_SECURITY BITFLAG(1) +#define RIG_AI_OVERRIDE BITFLAG(2) +#define RIG_SYSTEM_CONTROL BITFLAG(3) +#define RIG_INTERFACE_LOCK BITFLAG(4) +#define RIG_INTERFACE_SHOCK BITFLAG(5) + +/datum/wires/rig + random = 1 + holder_type = /obj/item/rig + +/datum/wires/rig/New(atom/holder) + wires = list( + RIG_SECURITY, + RIG_AI_OVERRIDE, + RIG_SYSTEM_CONTROL, + RIG_INTERFACE_LOCK, + RIG_INTERFACE_SHOCK + ) + add_duds(3) + . = ..() /datum/wires/rig/on_cut(wire, mend, source) @@ -63,3 +74,9 @@ if(rig.open) return TRUE return FALSE + +#undef RIG_SECURITY +#undef RIG_AI_OVERRIDE +#undef RIG_SYSTEM_CONTROL +#undef RIG_INTERFACE_LOCK +#undef RIG_INTERFACE_SHOCK diff --git a/html/changelogs/fluffyghost-fixrighacking.yml b/html/changelogs/fluffyghost-fixrighacking.yml new file mode 100644 index 00000000000..389b1678a02 --- /dev/null +++ b/html/changelogs/fluffyghost-fixrighacking.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: FluffyGhost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "The machinist intern forgot to add the wires to the hardsuits, they're back now, so you can hack them once more."