cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 20:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Particle Accelerators are easier to hack + PA wire tidying (#10027)

Browse Source
This commit is contained in:
Hockaa
2020-09-23 11:28:13 +01:00
committed by GitHub
parent 86d0645d71
commit 683eb244d0
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/wires/particle_accelerator.dm
+10 -15
View File
@@ -1,12 +1,18 @@
/datum/wires/particle_acc/control_box
wire_count = 5
wire_count = 4
holder_type = /obj/machinery/particle_accelerator/control_box
var/const/PARTICLE_TOGGLE_WIRE = 1 // Toggles whether the PA is on or not.
var/const/PARTICLE_STRENGTH_WIRE = 2 // Determines the strength of the PA.
var/const/PARTICLE_INTERFACE_WIRE = 4 // Determines the interface showing up.
var/const/PARTICLE_LIMIT_POWER_WIRE = 8 // Determines how strong the PA can be.
//var/const/PARTICLE_NOTHING_WIRE = 16 // Blank wire
var/const/PARTICLE_LIMIT_POWER_WIRE = 4 // Determines how strong the PA can be.
/datum/wires/particle_acc/control_box/GetInteractWindow()
var/obj/machinery/particle_accelerator/control_box/C = holder
. += ..()
. += text("<br>\n[]<br>\n[]<br>\n[]",
((C.active && C.assembled) ? "The firing light is on." : "The firing light is off."),
(C.strength ? "The strength light is blinking." : "The strength light is off."),
(C.strength_upper_limit == 2 ? "The strength limiter light is on." : "The strength limiter light is off."))
/datum/wires/particle_acc/control_box/CanUse(var/mob/living/L)
var/obj/machinery/particle_accelerator/control_box/C = holder
@@ -24,9 +30,6 @@ var/const/PARTICLE_LIMIT_POWER_WIRE = 8 // Determines how strong the PA can be.
if(PARTICLE_STRENGTH_WIRE)
C.add_strength()
if(PARTICLE_INTERFACE_WIRE)
C.interface_control = !C.interface_control
if(PARTICLE_LIMIT_POWER_WIRE)
C.visible_message("\icon[C]<b>[C]</b> makes a large whirring noise.")
@@ -38,14 +41,6 @@ var/const/PARTICLE_LIMIT_POWER_WIRE = 8 // Determines how strong the PA can be.
if(C.active == !mended)
C.toggle_power(usr)
if(PARTICLE_STRENGTH_WIRE)
for(var/i = 1; i < 3; i++)
C.remove_strength()
if(PARTICLE_INTERFACE_WIRE)
C.interface_control = mended
if(PARTICLE_LIMIT_POWER_WIRE)
C.strength_upper_limit = (mended ? 2 : 3)
if(C.strength_upper_limit < C.strength)
code/modules/power/singularity/particle_accelerator/particle_control.dm
-1
View File
@@ -15,7 +15,6 @@
active = FALSE
dir = NORTH
var/strength_upper_limit = 2
var/interface_control = TRUE
var/list/obj/structure/particle_accelerator/connected_parts
var/assembled = 0
var/parts
html/changelogs/hockaa-PAtweak.yml
+8
View File
@@ -0,0 +1,8 @@
author: Hocka
delete-after: True
changes:
- rscadd: "The Particle Accelerator's controller now has some text when viewing the wires to make tampering a bit more obvious."
- tweak: "Removes the interface wire from the Particle Accelerator's controller as it was functionally just a second blank wire."
- tweak: "Cutting and mending the Particle Accelerator controller's strength wire no longer decreases the strength and just prevents you from changing the strength of the accelerator."