diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index 55c275e6d04..a034cc0f785 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -70,8 +70,8 @@
to_chat(user, "You put the [W] into \the [src].")
update_icon()
else if(istype(W, /obj/item/weapon/pen))
- 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))
+ var/n_name = sanitizeSafe(tgui_input_text(user, "What would you like to label the folder?", "Folder Labelling", null, MAX_NAME_LEN), MAX_NAME_LEN)
+ if(in_range(user, src) && user.stat == 0)
name = "folder[(n_name ? text("- '[n_name]'") : null)]"
return
@@ -86,7 +86,7 @@
dat += "Remove Rename - [Pb.name]
"
user << browse(dat, "window=folder")
onclose(user, "folder")
- add_fingerprint(usr)
+ add_fingerprint(user)
return
/obj/item/weapon/folder/Topic(href, href_list)
diff --git a/code/modules/reagents/hoses/connector.dm b/code/modules/reagents/hoses/connector.dm
index be801b84aff..abf55d4fab9 100644
--- a/code/modules/reagents/hoses/connector.dm
+++ b/code/modules/reagents/hoses/connector.dm
@@ -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)
\ No newline at end of file
diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm
index fff716753d4..df1af4cfd85 100644
--- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm
+++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm
@@ -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
diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm
index 5cc8f0e0de2..38f3f01c8d2 100644
--- a/maps/stellar_delight/stellar_delight2.dmm
+++ b/maps/stellar_delight/stellar_delight2.dmm
@@ -2639,6 +2639,25 @@
},
/turf/simulated/floor/tiled/eris/white/cargo,
/area/stellardelight/deck2/triage)
+"fy" = (
+/obj/item/device/radio,
+/obj/item/device/radio,
+/obj/item/device/radio,
+/obj/item/weapon/tank/emergency/oxygen/engi,
+/obj/item/weapon/tank/emergency/oxygen/engi,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/structure/closet/crate/medical{
+ desc = "A crate full of emergency supplies to help with response and rescue operations. A logo of NanoTrasen with a checkmark is stamped on the crate.";
+ name = "NanoTrasen Emergency Supply Crate"
+ },
+/obj/item/weapon/storage/briefcase/inflatable,
+/obj/item/weapon/storage/firstaid/adv,
+/obj/item/weapon/storage/firstaid/regular,
+/obj/item/bodybag/cryobag,
+/obj/item/bodybag/cryobag,
+/turf/simulated/floor/tiled/eris/dark/monofloor,
+/area/bridge)
"fz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -14200,7 +14219,7 @@
input_tag = "cooling_in";
name = "Engine Cooling Control";
output_tag = "cooling_out";
- sensors = list("burn_chamber"="Burn Chamber");
+ sensors = list("burn_chamber" = "Burn Chamber");
throwpass = 1
},
/turf/simulated/floor,
@@ -14754,7 +14773,7 @@
frequency = 1443;
level = 3;
name = "Distribution and Waste Monitor";
- sensors = list("dist_main_meter"="Surface - Distribution Loop","scrub_main_meter"="Surface - Scrubbers Loop","mair_main_meter"="Surface - Mixed Air Tank","dist_aux_meter"="Station - Distribution Loop","scrub_aux_meter"="Station - Scrubbers Loop","mair_aux_meter"="Station - Mixed Air Tank","mair_mining_meter"="Mining Outpost - Mixed Air Tank")
+ sensors = list("dist_main_meter" = "Surface - Distribution Loop", "scrub_main_meter" = "Surface - Scrubbers Loop", "mair_main_meter" = "Surface - Mixed Air Tank", "dist_aux_meter" = "Station - Distribution Loop", "scrub_aux_meter" = "Station - Scrubbers Loop", "mair_aux_meter" = "Station - Mixed Air Tank", "mair_mining_meter" = "Mining Outpost - Mixed Air Tank")
},
/obj/machinery/power/apc/angled{
dir = 1
@@ -18538,7 +18557,7 @@
name = "box of measuring cups";
pixel_x = 2;
pixel_y = 3;
- starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup=7)
+ starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7)
},
/turf/simulated/floor/tiled/eris/cafe,
/area/crew_quarters/kitchen)
@@ -20036,25 +20055,6 @@
},
/turf/simulated/wall/bay/r_wall/steel,
/area/engineering/engine_room)
-"RZ" = (
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/weapon/tank/emergency/oxygen/engi,
-/obj/item/weapon/tank/emergency/oxygen/engi,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/structure/closet/crate/medical{
- desc = "A crate full of emergency supplies to help with response and rescue operations. A logo of NanoTrasen with a checkmark is stamped on the crate.";
- name = "NanoTrasen Emergency Supply Crate"
- },
-/obj/item/weapon/storage/briefcase/inflatable,
-/obj/item/weapon/storage/firstaid/adv,
-/obj/item/weapon/storage/firstaid,
-/obj/item/bodybag/cryobag,
-/obj/item/bodybag/cryobag,
-/turf/simulated/floor/tiled/eris/dark/monofloor,
-/area/bridge)
"Sb" = (
/turf/simulated/floor/tiled/eris/dark/danger,
/area/engineering/engine_room)
@@ -33763,7 +33763,7 @@ jU
TP
Ld
Uj
-RZ
+fy
Zj
rN
ry