cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-03 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9030 from Ilysen/if-i-dont-do-a-small-thing-here-and-there-im-gonna-melt

Browse Source 
Fixes a small hiccup in cable coil examine text
This commit is contained in:
Atermonera
2023-03-13 23:45:38 -08:00
committed by GitHub
parent a2c68d9a8d d6e00dd400
commit 1809d95686
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/power/cable.dm
View File

@@ -498,6 +498,7 @@ var/global/list/possible_cable_coil_colours = list(
amount = MAXCOIL
max_amount = MAXCOIL
color = COLOR_RED
gender = NEUTER
desc = "A coil of power cable."
throwforce = 10
w_class = ITEMSIZE_SMALL
@@ -508,6 +509,7 @@ var/global/list/possible_cable_coil_colours = list(
item_state = "coil"
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
stacktype = /obj/item/stack/cable_coil
singular_name = "length"
drop_sound = 'sound/items/drop/accessory.ogg'
pickup_sound = 'sound/items/pickup/accessory.ogg'
tool_qualities = list(TOOL_CABLE_COIL)
@@ -590,15 +592,6 @@ var/global/list/possible_cable_coil_colours = list(
else
w_class = ITEMSIZE_SMALL
/obj/item/stack/cable_coil/examine(mob/user)
. = ..()
if(get_amount() == 1)
. += "Just a short piece remains."
else if(get_amount() == 2)
. += "Just a couple of short pieces remain."
else if(Adjacent(user))
. += "There are [get_amount()] lengths of cable in the coil."
/obj/item/stack/cable_coil/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/multitool))
var/selected_type = input("Pick new colour.", "Cable Colour", null, null) as null|anything in possible_cable_coil_colours