diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index 77bc239bf4..045da484ed 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -1,211 +1,164 @@
-/obj/item/device/transfer_valve
- icon = 'icons/obj/assemblies.dmi'
- name = "tank transfer valve"
- icon_state = "valve_1"
- item_state = "ttv"
+/obj/item/device/transfer_valve
+ icon = 'icons/obj/assemblies.dmi'
+ name = "tank transfer valve"
+ icon_state = "valve_1"
+ item_state = "ttv"
lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi'
- desc = "Regulates the transfer of air between two tanks"
- var/obj/item/tank/tank_one
- var/obj/item/tank/tank_two
+ desc = "Regulates the transfer of air between two tanks"
+ var/obj/item/tank/tank_one
+ var/obj/item/tank/tank_two
var/obj/item/device/assembly/attached_device
- var/mob/attacher = null
+ var/mob/attacher = null
var/valve_open = FALSE
- var/toggle = 1
- origin_tech = "materials=1;engineering=1"
-
-/obj/item/device/transfer_valve/IsAssemblyHolder()
- return 1
-
-/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params)
- if(istype(item, /obj/item/tank))
- if(tank_one && tank_two)
- to_chat(user, "There are already two tanks attached, remove one first!")
- return
-
- if(!tank_one)
- if(!user.transferItemToLoc(item, src))
- return
- tank_one = item
- to_chat(user, "You attach the tank to the transfer valve.")
- if(item.w_class > w_class)
- w_class = item.w_class
- else if(!tank_two)
- if(!user.transferItemToLoc(item, src))
- return
- tank_two = item
- to_chat(user, "You attach the tank to the transfer valve.")
- if(item.w_class > w_class)
- w_class = item.w_class
-
- update_icon()
-//TODO: Have this take an assemblyholder
- else if(isassembly(item))
- var/obj/item/device/assembly/A = item
- if(A.secured)
- to_chat(user, "The device is secured.")
- return
- if(attached_device)
- to_chat(user, "There is already a device attached to the valve, remove it first!")
- return
- if(!user.transferItemToLoc(item, src))
- return
- attached_device = A
- to_chat(user, "You attach the [item] to the valve controls and secure it.")
- A.holder = src
- A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
-
- GLOB.bombers += "[key_name(user)] attached a [item] to a transfer valve."
- message_admins("[key_name_admin(user)] attached a [item] to a transfer valve.")
- log_game("[key_name_admin(user)] attached a [item] to a transfer valve.")
- attacher = user
- return
-
-/obj/item/device/transfer_valve/attack_self(mob/user)
- user.set_machine(src)
- var/dat = {" Valve properties:
-
Attachment one: [tank_one] [tank_one ? "Remove" : ""]
-
Attachment two: [tank_two] [tank_two ? "Remove" : ""]
-
Valve attachment: [attached_device ? "[attached_device]" : "None"] [attached_device ? "Remove" : ""]
-
Valve status: [ valve_open ? "Closed Open" : "Closed Open"]"}
-
- var/datum/browser/popup = new(user, "trans_valve", name)
- popup.set_content(dat)
- popup.open()
- return
-
-/obj/item/device/transfer_valve/Topic(href, href_list)
- ..()
- if ( usr.stat || usr.restrained() )
- return
- if (src.loc == usr)
- if(tank_one && href_list["tankone"])
- split_gases()
+ var/toggle = 1
+ origin_tech = "materials=1;engineering=1"
+
+/obj/item/device/transfer_valve/IsAssemblyHolder()
+ return 1
+
+/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params)
+ if(istype(item, /obj/item/tank))
+ if(tank_one && tank_two)
+ to_chat(user, "There are already two tanks attached, remove one first!")
+ return
+
+ if(!tank_one)
+ if(!user.transferItemToLoc(item, src))
+ return
+ tank_one = item
+ to_chat(user, "You attach the tank to the transfer valve.")
+ if(item.w_class > w_class)
+ w_class = item.w_class
+ else if(!tank_two)
+ if(!user.transferItemToLoc(item, src))
+ return
+ tank_two = item
+ to_chat(user, "You attach the tank to the transfer valve.")
+ if(item.w_class > w_class)
+ w_class = item.w_class
+
+ update_icon()
+//TODO: Have this take an assemblyholder
+ else if(isassembly(item))
+ var/obj/item/device/assembly/A = item
+ if(A.secured)
+ to_chat(user, "The device is secured.")
+ return
+ if(attached_device)
+ to_chat(user, "There is already a device attached to the valve, remove it first!")
+ return
+ if(!user.transferItemToLoc(item, src))
+ return
+ attached_device = A
+ to_chat(user, "You attach the [item] to the valve controls and secure it.")
+ A.holder = src
+ A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
+
+ GLOB.bombers += "[key_name(user)] attached a [item] to a transfer valve."
+ message_admins("[key_name_admin(user)] attached a [item] to a transfer valve.")
+ log_game("[key_name_admin(user)] attached a [item] to a transfer valve.")
+ attacher = user
+ return
+
+/obj/item/device/transfer_valve/attack_self(mob/user)
+ user.set_machine(src)
+ var/dat = {" Valve properties:
+
Attachment one: [tank_one] [tank_one ? "Remove" : ""]
+
Attachment two: [tank_two] [tank_two ? "Remove" : ""]
+
Valve attachment: [attached_device ? "[attached_device]" : "None"] [attached_device ? "Remove" : ""]
+
Valve status: [ valve_open ? "Closed Open" : "Closed Open"]"}
+
+ var/datum/browser/popup = new(user, "trans_valve", name)
+ popup.set_content(dat)
+ popup.open()
+ return
+
+/obj/item/device/transfer_valve/Topic(href, href_list)
+ ..()
+ if ( usr.stat || usr.restrained() )
+ return
+ if (src.loc == usr)
+ if(tank_one && href_list["tankone"])
+ split_gases()
valve_open = FALSE
- tank_one.loc = get_turf(src)
- tank_one = null
- update_icon()
- if((!tank_two || tank_two.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
- w_class = WEIGHT_CLASS_NORMAL
- else if(tank_two && href_list["tanktwo"])
- split_gases()
+ tank_one.loc = get_turf(src)
+ tank_one = null
+ update_icon()
+ if((!tank_two || tank_two.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
+ w_class = WEIGHT_CLASS_NORMAL
+ else if(tank_two && href_list["tanktwo"])
+ split_gases()
valve_open = FALSE
- tank_two.loc = get_turf(src)
- tank_two = null
- update_icon()
- if((!tank_one || tank_one.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
- w_class = WEIGHT_CLASS_NORMAL
- else if(href_list["open"])
- toggle_valve()
- else if(attached_device)
- if(href_list["rem_device"])
+ tank_two.loc = get_turf(src)
+ tank_two = null
+ update_icon()
+ if((!tank_one || tank_one.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
+ w_class = WEIGHT_CLASS_NORMAL
+ else if(href_list["open"])
+ toggle_valve()
+ else if(attached_device)
+ if(href_list["rem_device"])
attached_device.forceMove(get_turf(src))
attached_device.holder = null
- attached_device = null
- update_icon()
- if(href_list["device"])
- attached_device.attack_self(usr)
-
- src.attack_self(usr)
- src.add_fingerprint(usr)
- return
- return
-
-/obj/item/device/transfer_valve/proc/process_activation(obj/item/device/D)
- if(toggle)
- toggle = 0
- toggle_valve()
- spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever
- toggle = 1
-
-/obj/item/device/transfer_valve/update_icon()
- cut_overlays()
- underlays = null
-
- if(!tank_one && !tank_two && !attached_device)
- icon_state = "valve_1"
- return
- icon_state = "valve"
-
- if(tank_one)
- add_overlay("[tank_one.icon_state]")
- if(tank_two)
- var/icon/J = new(icon, icon_state = "[tank_two.icon_state]")
- J.Shift(WEST, 13)
- underlays += J
- if(attached_device)
- add_overlay("device")
-
-/obj/item/device/transfer_valve/proc/merge_gases()
- tank_two.air_contents.volume += tank_one.air_contents.volume
- var/datum/gas_mixture/temp
- temp = tank_one.air_contents.remove_ratio(1)
- tank_two.air_contents.merge(temp)
-
-/obj/item/device/transfer_valve/proc/split_gases()
- if (!valve_open || !tank_one || !tank_two)
- return
- var/ratio1 = tank_one.air_contents.volume/tank_two.air_contents.volume
- var/datum/gas_mixture/temp
- temp = tank_two.air_contents.remove_ratio(ratio1)
- tank_one.air_contents.merge(temp)
- tank_two.air_contents.volume -= tank_one.air_contents.volume
-
- /*
- Exadv1: I know this isn't how it's going to work, but this was just to check
- it explodes properly when it gets a signal (and it does).
- */
-
-/obj/item/device/transfer_valve/proc/toggle_valve()
- if(!valve_open && tank_one && tank_two)
+ attached_device = null
+ update_icon()
+ if(href_list["device"])
+ attached_device.attack_self(usr)
+
+ src.attack_self(usr)
+ src.add_fingerprint(usr)
+ return
+ return
+
+/obj/item/device/transfer_valve/proc/process_activation(obj/item/device/D)
+ if(toggle)
+ toggle = 0
+ toggle_valve()
+ spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever
+ toggle = 1
+
+/obj/item/device/transfer_valve/update_icon()
+ cut_overlays()
+ underlays = null
+
+ if(!tank_one && !tank_two && !attached_device)
+ icon_state = "valve_1"
+ return
+ icon_state = "valve"
+
+ if(tank_one)
+ add_overlay("[tank_one.icon_state]")
+ if(tank_two)
+ var/icon/J = new(icon, icon_state = "[tank_two.icon_state]")
+ J.Shift(WEST, 13)
+ underlays += J
+ if(attached_device)
+ add_overlay("device")
+
+/obj/item/device/transfer_valve/proc/merge_gases()
+ tank_two.air_contents.volume += tank_one.air_contents.volume
+ var/datum/gas_mixture/temp
+ temp = tank_one.air_contents.remove_ratio(1)
+ tank_two.air_contents.merge(temp)
+
+/obj/item/device/transfer_valve/proc/split_gases()
+ if (!valve_open || !tank_one || !tank_two)
+ return
+ var/ratio1 = tank_one.air_contents.volume/tank_two.air_contents.volume
+ var/datum/gas_mixture/temp
+ temp = tank_two.air_contents.remove_ratio(ratio1)
+ tank_one.air_contents.merge(temp)
+ tank_two.air_contents.volume -= tank_one.air_contents.volume
+
+ /*
+ Exadv1: I know this isn't how it's going to work, but this was just to check
+ it explodes properly when it gets a signal (and it does).
+ */
+
+/obj/item/device/transfer_valve/proc/toggle_valve()
+ if(!valve_open && tank_one && tank_two)
valve_open = TRUE
-<<<<<<< HEAD
- var/turf/bombturf = get_turf(src)
- var/area/A = get_area(bombturf)
-
- var/attachment = "no device"
- if(attached_device)
- if(istype(attached_device, /obj/item/device/assembly/signaler))
- attachment = "[attached_device]"
- else
- attachment = attached_device
-
- var/attacher_name = ""
- if(!attacher)
- attacher_name = "Unknown"
- else
- attacher_name = "[key_name_admin(attacher)]"
-
- var/log_str1 = "Bomb valve opened in "
- var/log_str2 = "with [attachment] attacher: [attacher_name]"
-
- var/log_attacher = ""
- if(attacher)
- log_attacher = "[ADMIN_QUE(attacher)] [ADMIN_FLW(attacher)]"
-
- var/mob/mob = get_mob_by_key(src.fingerprintslast)
- var/last_touch_info = ""
- if(mob)
- last_touch_info = "[ADMIN_QUE(mob)] [ADMIN_FLW(mob)]"
-
- var/log_str3 = " Last touched by: [key_name_admin(mob)]"
-
- var/bomb_message = "[log_str1] [A.name][ADMIN_JMP(bombturf)] [log_str2][log_attacher] [log_str3][last_touch_info]"
-
- GLOB.bombers += bomb_message
-
- message_admins(bomb_message, 0, 1)
- log_game("[log_str1] [A.name][COORD(bombturf)] [log_str2] [log_str3]")
- merge_gases()
- spawn(20) // In case one tank bursts
- for (var/i=0,i<5,i++)
- src.update_icon()
- sleep(10)
- src.update_icon()
-
- else if(valve_open && tank_one && tank_two)
- split_gases()
-=======
var/turf/bombturf = get_turf(src)
var/area/A = get_area(bombturf)
@@ -251,11 +204,10 @@
else if(valve_open && tank_one && tank_two)
split_gases()
->>>>>>> 28d725e... Merge pull request #30975 from ShizCalev/href-tokens
valve_open = FALSE
- src.update_icon()
-
-// this doesn't do anything but the timer etc. expects it to be here
-// eventually maybe have it update icon to show state (timer, prox etc.) like old bombs
-/obj/item/device/transfer_valve/proc/c_state()
- return
+ src.update_icon()
+
+// this doesn't do anything but the timer etc. expects it to be here
+// eventually maybe have it update icon to show state (timer, prox etc.) like old bombs
+/obj/item/device/transfer_valve/proc/c_state()
+ return