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

Merge branch 'upstream-master' into placeholder

Browse Source
This commit is contained in:
Werner
2021-09-07 00:00:37 +02:00
parent 9a765e1dc0 af05c53192
commit 92d164ac09
213 changed files with 2832 additions and 947 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cable.dm
+2 -1
View File
@@ -483,7 +483,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
throw_range = 5
matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20)
recyclable = TRUE
flags = CONDUCT
flags = HELDMAPTEXT|CONDUCT
slot_flags = SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
stacktype = /obj/item/stack/cable_coil
@@ -630,6 +630,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
update_held_icon()
cut_overlays()
add_overlay(overlay_image(icon, "[icon_state]_end", flags=RESET_COLOR))
check_maptext(SMALL_FONTS(7, get_amount()))
/obj/item/stack/cable_coil/attackby(var/obj/item/W, var/mob/user)
if(W.ismultitool())