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

fix a runtime and some usr to user (#16849)

Browse Source 
* fix a runtimg and some usr to user

* .

* .

* more usr
This commit is contained in:
Kashargul
2025-01-06 18:30:18 +01:00
committed by GitHub
parent bd8ee83893
commit 04c482e97b
4 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cable.dm
+7 -7
View File
@@ -208,7 +208,7 @@ var/list/possible_cable_coil_colours = list(
if(c.d1 == UP || c.d2 == UP)
qdel(c)
investigate_log("was cut by [key_name(usr, usr.client)] in [user.loc.loc]","wires")
investigate_log("was cut by [key_name(user, user.client)] in [user.loc.loc]","wires")
qdel(src)
return
@@ -245,7 +245,7 @@ var/list/possible_cable_coil_colours = list(
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(5, 1, src)
s.start()
if(usr.stunned)
if(user.stunned)
return 1
return 0
@@ -601,8 +601,8 @@ var/list/possible_cable_coil_colours = list(
/obj/item/stack/cable_coil/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/multitool))
var/selected_type = tgui_input_list(usr, "Pick new colour.", "Cable Colour", possible_cable_coil_colours)
set_cable_color(selected_type, usr)
var/selected_type = tgui_input_list(user, "Pick new colour.", "Cable Colour", possible_cable_coil_colours)
set_cable_color(selected_type, user)
return
return ..()
@@ -981,7 +981,7 @@ var/list/possible_cable_coil_colours = list(
/obj/item/stack/cable_coil/alien/attack_hand(mob/user as mob)
if (user.get_inactive_hand() == src)
var/N = tgui_input_number(usr, "How many units of wire do you want to take from [src]? You can only take up to [amount] at a time.", "Split stacks", 1, amount)
var/N = tgui_input_number(user, "How many units of wire do you want to take from [src]? You can only take up to [amount] at a time.", "Split stacks", 1, amount)
if(N && N <= amount)
var/obj/item/stack/cable_coil/CC = new/obj/item/stack/cable_coil(user.loc)
CC.amount = N
@@ -992,8 +992,8 @@ var/list/possible_cable_coil_colours = list(
src.add_fingerprint(user)
CC.add_fingerprint(user)
spawn(0)
if (src && usr.machine==src)
src.interact(usr)
if (src && user.machine==src)
src.interact(user)
else
return
else
code/modules/power/cable_heavyduty.dm
+2 -2
View File
@@ -18,10 +18,10 @@
return
if(W.has_tool_quality(TOOL_WIRECUTTER))
to_chat(usr, span_blue("These cables are too tough to be cut with those [W.name]."))
to_chat(user, span_blue("These cables are too tough to be cut with those [W.name]."))
return
else if(istype(W, /obj/item/stack/cable_coil))
to_chat(usr, span_blue("You will need heavier cables to connect to these."))
to_chat(user, span_blue("You will need heavier cables to connect to these."))
return
else
..()