cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 11:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge examine refactor for vorestation

Browse Source
This commit is contained in:
Aronai Sieyes
2020-04-29 17:49:54 -04:00
parent 6ebd249748
commit 874baa1d2d
34 changed files with 179 additions and 932 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shieldgen/handheld_defuser.dm
-5
View File
@@ -54,10 +54,5 @@
/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"].")
=======
. += "The charge meter reads [cell ? cell.percent() : 0]%"
. += "It is [enabled ? "enabled" : "disabled"]."
>>>>>>> 6c6644f... Rewrite examine() to pass a list around (#7038)
code/modules/shieldgen/shield_diffuser.dm
-4
View File
@@ -91,8 +91,4 @@
. = ..()
. += "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)