cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite examine() to pass a list around

Browse Source
This commit is contained in:
Aronai Sieyes
2020-04-29 16:42:16 -04:00
committed by VirgoBot
parent 8c5c0a7cfb
commit 6ebd249748
214 changed files with 2021 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/shieldgen/directional_shield.dm
View File

@@ -203,9 +203,9 @@
playsound(get_turf(src), 'sound/machines/defib_safetyOff.ogg', 75, 0)
/obj/item/shield_projector/examine(var/mob/user)
..()
if(get_dist(src, user) <= 1)
to_chat(user, "\The [src]'s shield matrix is at [round( (shield_health / max_shield_health) * 100, 0.01)]% strength.")
. = ..()
if(Adjacent(user))
. += "Its shield matrix is at [round( (shield_health / max_shield_health) * 100, 0.01)]% strength."
/obj/item/shield_projector/emp_act(var/severity)
adjust_health(-max_shield_health / severity) // A strong EMP will kill the shield instantly, but weaker ones won't on the first hit.

7
code/modules/shieldgen/handheld_defuser.dm
View File

@@ -54,5 +54,10 @@
/obj/item/weapon/shield_diffuser/examine(mob/user)
. = ..()
<<<<<<< HEAD
to_chat(user, "The charge meter reads [cell ? cell.percent() : 0]%")
to_chat(user, "It is [enabled ? "enabled" : "disabled"].")
to_chat(user, "It is [enabled ? "enabled" : "disabled"].")
=======
. += "The charge meter reads [cell ? cell.percent() : 0]%"
. += "It is [enabled ? "enabled" : "disabled"]."
>>>>>>> 6c6644f... Rewrite examine() to pass a list around (#7038)

6
code/modules/shieldgen/shield_diffuser.dm
View File

@@ -89,6 +89,10 @@
/obj/machinery/shield_diffuser/examine(var/mob/user)
. = ..()
to_chat(user, "It is [enabled ? "enabled" : "disabled"].")
. += "It is [enabled ? "enabled" : "disabled"]."
if(alarm)
<<<<<<< HEAD
to_chat(user, "A red LED labeled \"Proximity Alarm\" is blinking on the control panel.")
=======
. += "A red LED labeled \"Proximity Alarm\" is blinking on the control panel."
>>>>>>> 6c6644f... Rewrite examine() to pass a list around (#7038)