From a43114579e0a1f2c9f447594a4d855bcc60048ef Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Sat, 6 May 2023 18:02:37 +1000
Subject: [PATCH] Merge pull request #14837 from
KillianKirilenko/kk-teslafriend
Friendlier Tesla Components
---
code/modules/power/singularity/emitter.dm | 9 ++++++++-
code/modules/power/singularity/field_generator.dm | 9 +++++++++
code/modules/power/singularity/generator.dm | 4 ++++
code/modules/power/tesla/coil.dm | 8 ++++++++
code/modules/power/tesla/generator.dm | 4 ++++
5 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index bdb05918c9..b725f2d4f7 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -272,6 +272,13 @@
/obj/machinery/power/emitter/examine(mob/user)
. = ..()
+ switch(state)
+ if(0)
+ . += "It is not secured in place at all!"
+ if(1)
+ . += "It has been bolted down securely, but not welded into place."
+ if(2)
+ . += "It has been bolted down securely and welded down into place."
var/integrity_percentage = round((integrity / initial(integrity)) * 100)
switch(integrity_percentage)
if(0 to 30)
@@ -279,7 +286,7 @@
if(31 to 70)
. += "It is damaged."
if(77 to 99)
- . += ""
+ . += "It is slightly damaged."
//R-UST port
/obj/machinery/power/emitter/proc/get_initial_fire_delay()
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index 8d892b2756..4a85e1fec5 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -40,6 +40,15 @@ field_generator power level display
var/light_power_on = 1
light_color = "#5BA8FF"
+/obj/machinery/field_generator/examine()
+ . = ..()
+ switch(state)
+ if(0)
+ . += "It is not secured in place at all!"
+ if(1)
+ . += "It has been bolted down securely, but not welded into place."
+ if(2)
+ . += "It has been bolted down securely and welded down into place."
/obj/machinery/field_generator/update_icon()
cut_overlays()
diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm
index c29e200e86..a41ea2fd49 100644
--- a/code/modules/power/singularity/generator.dm
+++ b/code/modules/power/singularity/generator.dm
@@ -10,6 +10,10 @@
var/energy = 0
var/creation_type = /obj/singularity
+/obj/machinery/the_singularitygen/examine()
+ . = ..()
+ . += "It is [anchored ? "secured" : "not secured"]!"
+
/obj/machinery/the_singularitygen/process()
var/turf/T = get_turf(src)
if(src.energy >= 200)
diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm
index 2657b34a0a..33caa542a4 100644
--- a/code/modules/power/tesla/coil.dm
+++ b/code/modules/power/tesla/coil.dm
@@ -21,6 +21,10 @@
/obj/machinery/power/tesla_coil/pre_mapped
anchored = TRUE
+/obj/machinery/power/tesla_coil/examine()
+ . = ..()
+ . += "It is [anchored ? "secured" : "not secured"]!"
+
/obj/machinery/power/tesla_coil/New()
..()
wires = new(src)
@@ -107,6 +111,10 @@
buckle_lying = FALSE
circuit = /obj/item/weapon/circuitboard/grounding_rod
+/obj/machinery/power/grounding_rod/examine()
+ . = ..()
+ . += "It is [anchored ? "secured" : "not secured"]!"
+
/obj/machinery/power/grounding_rod/pre_mapped
anchored = TRUE
diff --git a/code/modules/power/tesla/generator.dm b/code/modules/power/tesla/generator.dm
index 63bce099fa..668dfe4e0a 100644
--- a/code/modules/power/tesla/generator.dm
+++ b/code/modules/power/tesla/generator.dm
@@ -5,6 +5,10 @@
icon_state = "TheSingGen"
creation_type = /obj/singularity/energy_ball
+/obj/machinery/the_singularitygen/tesla/examine()
+ . = ..()
+ . += "It is [anchored ? "secured" : "not secured"]!"
+
/obj/machinery/the_singularitygen/tesla/tesla_act(power, explosive = FALSE)
if(explosive)
energy += power