cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cable/Pipe Color Examining (#19041)

Browse Source 
* Examining a pipe or cable will now display its color as text.


![image](https://github.com/Aurorastation/Aurora.3/assets/22774890/4c7ffcc9-85f7-437b-aaaf-4290e080b0d4)

![image](https://github.com/Aurorastation/Aurora.3/assets/22774890/c1505ae5-e594-4b95-b982-3016fb947d32)

![image](https://github.com/Aurorastation/Aurora.3/assets/22774890/df9b1d01-974e-42fa-85fb-83e283b10405)
This commit is contained in:
Geeves
2024-05-01 22:34:15 +00:00
committed by GitHub
parent 61748c7429
commit 3e43bea584
7 changed files with 117 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cable.dm
+44 -23
View File
@@ -1,3 +1,14 @@
GLOBAL_LIST_INIT(cable_coil_colours, list(
"Yellow" = COLOR_YELLOW,
"Green" = COLOR_LIME,
"Pink" = COLOR_PINK,
"Blue" = COLOR_BLUE,
"Orange" = COLOR_ORANGE,
"Cyan" = COLOR_CYAN,
"Red" = COLOR_RED,
"White" = COLOR_WHITE
))
///////////////////////////////
//CABLE STRUCTURE
///////////////////////////////
@@ -36,6 +47,16 @@ By design, d1 is the smallest direction and d2 is the highest
color = COLOR_RED
var/obj/machinery/power/breakerbox/breaker_box
/obj/structure/cable/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
var/found_color_name = "Unknown"
for(var/color_name in GLOB.cable_coil_colours)
var/color_value = GLOB.cable_coil_colours[color_name]
if(color == color_value)
found_color_name = color_name
break
. += "This cable is: <span style='color:[color]'>[found_color_name]</span>"
/obj/structure/cable/drain_power(var/drain_check, var/surge, var/amount = 0)
if(drain_check)
@@ -490,16 +511,6 @@ By design, d1 is the smallest direction and d2 is the highest
drop_sound = 'sound/items/drop/accessory.ogg'
pickup_sound = 'sound/items/pickup/accessory.ogg'
surgerysound = 'sound/items/surgery/fixovein.ogg'
var/static/list/possible_cable_coil_colours = list(
"Yellow" = COLOR_YELLOW,
"Green" = COLOR_LIME,
"Pink" = COLOR_PINK,
"Blue" = COLOR_BLUE,
"Orange" = COLOR_ORANGE,
"Cyan" = COLOR_CYAN,
"Red" = COLOR_RED,
"White" = COLOR_WHITE
)
build_from_parts = TRUE
worn_overlay = "end"
@@ -517,6 +528,22 @@ By design, d1 is the smallest direction and d2 is the highest
update_icon()
update_wclass()
/obj/item/stack/cable_coil/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
var/found_color_name = "Unknown"
for(var/color_name in GLOB.cable_coil_colours)
var/color_value = GLOB.cable_coil_colours[color_name]
if(color == color_value)
found_color_name = color_name
break
. += "This cable is: <span style='color:[color]'>[found_color_name]</span>"
if(!uses_charge)
. += "There [src.amount == 1 ? "is" : "are"] <b>[src.amount]</b> [src.singular_name]\s of cable in the coil."
else
. += "You have enough charge to produce <b>[get_amount()]</b>."
/obj/item/stack/cable_coil/attack(mob/living/carbon/M, mob/user)
if(ishuman(M) && user.a_intent == I_HELP)
var/mob/living/carbon/human/H = M
@@ -610,7 +637,7 @@ By design, d1 is the smallest direction and d2 is the highest
/obj/item/stack/cable_coil/update_icon()
if(!color)
color = pick(possible_cable_coil_colours)
color = pick(GLOB.cable_coil_colours)
name = "[initial(name)]"
if(amount == 1)
icon_state = "[initial(icon_state)]1"
@@ -635,16 +662,16 @@ By design, d1 is the smallest direction and d2 is the highest
return ..()
/obj/item/stack/cable_coil/proc/choose_cable_color(var/user)
var/selected_type = tgui_input_list(user, "Pick a new colour.", "Cable Colour", possible_cable_coil_colours)
var/selected_type = tgui_input_list(user, "Pick a new colour.", "Cable Colour", GLOB.cable_coil_colours)
set_cable_color(selected_type, user)
/obj/item/stack/cable_coil/proc/set_cable_color(selected_color, var/user)
if(!selected_color)
return
var/final_color = possible_cable_coil_colours[selected_color]
var/final_color = GLOB.cable_coil_colours[selected_color]
if(!final_color)
final_color = possible_cable_coil_colours["Red"]
final_color = GLOB.cable_coil_colours["Red"]
selected_color = "Red"
color = final_color
to_chat(user, SPAN_NOTICE("You change \the [src]'s color to [lowertext(selected_color)]."))
@@ -657,13 +684,6 @@ By design, d1 is the smallest direction and d2 is the highest
w_class = ITEMSIZE_SMALL
slot_flags = SLOT_BELT
/obj/item/stack/cable_coil/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(!uses_charge)
. += "There [src.amount == 1 ? "is" : "are"] <b>[src.amount]</b> [src.singular_name]\s of cable in the coil."
else
. += "You have enough charge to produce <b>[get_amount()]</b>."
/obj/item/stack/cable_coil/verb/make_restraint()
set name = "Make Cable Restraints"
set category = "Object"
@@ -985,8 +1005,9 @@ By design, d1 is the smallest direction and d2 is the highest
color = COLOR_WHITE
/obj/item/stack/cable_coil/random/Initialize()
color = pick(possible_cable_coil_colours)
. = ..()
var/color_name = pick(GLOB.cable_coil_colours)
color = GLOB.cable_coil_colours[color_name]
return ..()
//////////////////////////////
// Nooses.