Skip to content

Commit

Permalink
Borgs can now access the APCs channel configuration again (#19674)
Browse files Browse the repository at this point in the history
Borgs can now access the APCs channel configuration again, like the AI
already can
  • Loading branch information
FluffyGhoster authored Jul 23, 2024
1 parent aa9fd46 commit 363650f
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 4 deletions.
2 changes: 1 addition & 1 deletion code/modules/power/apc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,7 @@
data["power_cell_charge"] = cell?.percent()
data["fail_time"] = failure_timer * 2
data["silicon_user"] = isAdmin || issilicon(user)
data["is_AI"] = isAI(user)
data["is_AI_or_robot"] = isAI(user) || isrobot(user)
data["total_load"] = round(lastused_total)
data["total_charging"] = round(lastused_charging)
data["is_operating"] = operating
Expand Down
58 changes: 58 additions & 0 deletions html/changelogs/fluffyghost-borgapcchannels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
################################
# 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
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################

# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Borgs can now access the APCs channel configuration again, like the AI already can."
6 changes: 3 additions & 3 deletions tgui/packages/tgui/interfaces/Apc.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export type APCData = {
power_cell_charge: number;
fail_time: number;
silicon_user: BooleanLike;
is_AI: BooleanLike;
is_AI_or_robot: BooleanLike;
total_load: number;
total_charging: number;
is_operating: BooleanLike;
Expand Down Expand Up @@ -171,7 +171,7 @@ export const APCWindow = (props, context) => {
[{channelStatus(channel.status)}] | [
{channelPower(channel.status)}] | {channel.power_load} W
</Box>
{(!data.locked && !data.silicon_user) || data.is_AI ? (
{(!data.locked && !data.silicon_user) || data.is_AI_or_robot ? (
<Section>
<Button
content="Auto"
Expand Down Expand Up @@ -225,7 +225,7 @@ export const APCWindow = (props, context) => {
</LabeledList.Item>
</LabeledList>
</Section>
{data.silicon_user || data.is_AI ? (
{data.silicon_user || data.is_AI_or_robot ? (
<Section title="System Overrides">
<Button
content="Overload Lighting Circuit"
Expand Down

0 comments on commit 363650f

Please sign in to comment.