A few fixes

This commit is contained in:
Heroman
2022-12-20 18:01:31 +10:00
parent 5fffdef1a8
commit b7a51d6281
4 changed files with 2665 additions and 43503 deletions
+3 -1
View File
@@ -69,8 +69,10 @@
to_chat(user, "<span class='notice'>You put the [W] into \the [src].</span>")
update_icon()
else if(istype(W, /obj/item/weapon/pen))
if(!(loc == user))
to_chat(user, "<span class='warning'>You cannot rename \the [src] without holding it.</span>")
var/n_name = sanitizeSafe(tgui_input_text(usr, "What would you like to label the folder?", "Folder Labelling", null, MAX_NAME_LEN), MAX_NAME_LEN)
if((loc == usr && usr.stat == 0))
if(loc == usr && usr.stat == 0)
name = "folder[(n_name ? text("- '[n_name]'") : null)]"
return
+3 -1
View File
@@ -134,5 +134,7 @@
carrier = loc
/obj/item/hose_connector/output/active/process()
if(carrier)
if(carrier && my_hose)
carrier.reagents.trans_to_holder(reagents, reagents.maximum_volume)
else if(reagents.total_volume && carrier && !my_hose)
reagents.trans_to_obj(carrier, reagents.maximum_volume)
@@ -8,6 +8,8 @@
anchored = FALSE
pressure_resistance = 2*ONE_ATMOSPHERE
var/has_sockets = TRUE
var/obj/item/hose_connector/input/active/InputSocket
var/obj/item/hose_connector/output/active/OutputSocket
@@ -15,7 +17,7 @@
var/possible_transfer_amounts = list(10,25,50,100)
/obj/structure/reagent_dispensers/attackby(obj/item/weapon/W as obj, mob/user as mob)
return
return
/obj/structure/reagent_dispensers/Destroy()
QDEL_NULL(InputSocket)
@@ -30,10 +32,11 @@
if (!possible_transfer_amounts)
src.verbs -= /obj/structure/reagent_dispensers/verb/set_APTFT
InputSocket = new(src)
InputSocket.carrier = src
OutputSocket = new(src)
OutputSocket.carrier = src
if(has_sockets)
InputSocket = new(src)
InputSocket.carrier = src
OutputSocket = new(src)
OutputSocket.carrier = src
. = ..()
@@ -319,6 +322,7 @@
icon_state = "water_cooler"
possible_transfer_amounts = null
anchored = TRUE
has_sockets = FALSE
var/bottle = 0
var/cups = 0
var/cupholder = 0
File diff suppressed because it is too large Load Diff