diff --git a/baystation12.dme b/baystation12.dme index 0862d7b6049..83d91e79bb7 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -132,11 +132,6 @@ #define FILE_DIR "code/modules/recycling" #define FILE_DIR "code/modules/research" #define FILE_DIR "code/modules/security levels" -#define FILE_DIR "code/modules/water" -#define FILE_DIR "code/modules/water/components" -#define FILE_DIR "code/modules/water/components/binary" -#define FILE_DIR "code/modules/water/components/trinary" -#define FILE_DIR "code/modules/water/components/unary" #define FILE_DIR "code/unused" #define FILE_DIR "code/unused/beast" #define FILE_DIR "code/unused/computer2" @@ -172,7 +167,6 @@ #define FILE_DIR "icons/obj/doors" #define FILE_DIR "icons/obj/machines" #define FILE_DIR "icons/obj/pipes" -#define FILE_DIR "icons/obj/water" #define FILE_DIR "icons/pda_icons" #define FILE_DIR "icons/spideros_icons" #define FILE_DIR "icons/Testing" @@ -374,7 +368,6 @@ #include "code\game\syndicate_shuttle.dm" #include "code\game\syndicate_specops_shuttle.dm" #include "code\game\throwing.dm" -#include "code\game\topic.dm" #include "code\game\turf.dm" #include "code\game\vials.dm" #include "code\game\vote.dm" @@ -1019,24 +1012,6 @@ #include "code\modules\research\server.dm" #include "code\modules\security levels\keycard authentication.dm" #include "code\modules\security levels\security levels.dm" -#include "code\modules\water\construction.dm" -#include "code\modules\water\water.dm" -#include "code\modules\water\water_meter.dm" -#include "code\modules\water\water_pipe_network.dm" -#include "code\modules\water\water_pipeline.dm" -#include "code\modules\water\water_pipes.dm" -#include "code\modules\water\components\tvalve.dm" -#include "code\modules\water\components\valve.dm" -#include "code\modules\water\components\water_glass_connector.dm" -#include "code\modules\water\components\water_portables_connector.dm" -#include "code\modules\water\components\binary\binary_water_base.dm" -#include "code\modules\water\components\binary\fixture.dm" -#include "code\modules\water\components\binary\water_pump.dm" -#include "code\modules\water\components\trinary\trinary_water_base.dm" -#include "code\modules\water\components\trinary\water_filter.dm" -#include "code\modules\water\components\trinary\water_mixer.dm" -#include "code\modules\water\components\unary\sprinkler.dm" -#include "code\modules\water\components\unary\unary_water_base.dm" #include "code\WorkInProgress\AI_Visibility.dm" #include "code\WorkInProgress\buildmode.dm" #include "code\WorkInProgress\detective_work.dm" diff --git a/code/WorkInProgress/Tastyfish/livestock.dm b/code/WorkInProgress/Tastyfish/livestock.dm index 8b14956004a..9c9e7cc4958 100644 --- a/code/WorkInProgress/Tastyfish/livestock.dm +++ b/code/WorkInProgress/Tastyfish/livestock.dm @@ -6,9 +6,9 @@ speak_chance = 1 turns_per_move = 15 meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat - response_help = "pets \the" - response_disarm = "gently pushes aside \the" - response_harm = "kicks \the" + response_help = "pets " + response_disarm = "gently pushes aside " + response_harm = "kicks " var/max_nutrition = 100 // different animals get hungry faster, basically number of 5-second steps from full to starving (60 == 5 minutes) var/nutrition_step // cycle step in nutrition system var/obj/movement_target // eating-ing target diff --git a/code/defines/area/Space Station 13 areas.dm b/code/defines/area/Space Station 13 areas.dm index 0434d866e98..fa31915446e 100644 --- a/code/defines/area/Space Station 13 areas.dm +++ b/code/defines/area/Space Station 13 areas.dm @@ -466,10 +466,6 @@ proc/process_ghost_teleport_locs() name = "Atmospherics" icon_state = "atmos" -/area/atmos/plumbing - name = "Plumbing" - icon_state = "toilet" - //Maintenance /area/maintenance/atmos_control diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm index b305a5525b4..5365249ca45 100644 --- a/code/defines/obj/machinery.dm +++ b/code/defines/obj/machinery.dm @@ -373,16 +373,19 @@ var/lastgen = 0 var/lastgenlev = -1 + /obj/machinery/power/monitor - name = "Power Monitoring Computer" - desc = "Used to monitor the power." - icon = 'computer.dmi' - icon_state = "power" - density = 1 - anchored = 1 - use_power = 2 - idle_power_usage = 20 - active_power_usage = 80 + name = "Power Monitoring Computer" + desc = "Used to monitor the power, and remotely toggle main breakers." + icon = 'computer.dmi' + icon_state = "power" + density = 1 + anchored = 1 + use_power = 2 + idle_power_usage = 20 + active_power_usage = 80 + var/control = 0 + req_access = list(access_engine_equip) /obj/machinery/cell_charger name = "cell charger" @@ -460,4 +463,4 @@ density = 1 anchored = 1.0 var/obj/item/clothing/suit/storage/det_suit/coat - var/obj/item/clothing/head/det_hat/hat \ No newline at end of file + var/obj/item/clothing/head/det_hat/hat diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm index 7566e0a6de0..df474f601dd 100644 --- a/code/game/machinery/computer/power.dm +++ b/code/game/machinery/computer/power.dm @@ -1,5 +1,9 @@ // the power monitoring computer // for the moment, just report the status of all APCs in the same powernet + +//Now Supports remote access -- Newt + + /obj/machinery/power/monitor/attack_ai(mob/user) add_fingerprint(user) @@ -41,6 +45,15 @@ A.icon_state = "4" A.anchored = 1 del(src) + if(istype(I, /obj/item/weapon/card/id)||istype(I, /obj/item/device/pda)) + //var/obj/item/weapon/card/id/W = I + if(src.allowed(user)) + src.control = !src.control + user << "You [ control ? "enable" : "disable"] remote APC control." + else + user << "\red Access denied." + + else src.attack_hand(user) return @@ -84,6 +97,10 @@ for(var/obj/machinery/power/apc/A in L) t += copytext(add_tspace(A.area.name, 30), 1, 30) + if(control) + t += " ([A.operating? " On" : "Off"])" + else + t += " ([A.operating? "On " : "Off"])" t += " [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] [add_lspace(A.lastused_total, 6)] [A.cell ? "[add_lspace(round(A.cell.percent()), 3)]% [chg[A.charging+1]]" : " N/C"]
" t += "" @@ -101,6 +118,13 @@ if( href_list["update"] ) src.updateDialog() return + if( href_list["breaker"]) + var/obj/machinery/power/apc/APC = locate(href_list["apc"]) + APC.operating = !APC.operating + APC.update() + APC.updateicon() + src.updateDialog() + return /obj/machinery/power/monitor/process() @@ -119,4 +143,3 @@ spawn(rand(0, 15)) src.icon_state = "c_unpowered" stat |= NOPOWER - diff --git a/code/game/machinery/sink.dm b/code/game/machinery/sink.dm index 1507de23df7..d488b9235d7 100644 --- a/code/game/machinery/sink.dm +++ b/code/game/machinery/sink.dm @@ -5,20 +5,7 @@ desc = "A sink used for washing one's hands and face." anchored = 1 var/busy = 0 //Something's being washed at the moment - var/mode = 0 //0 == fill, 1 == pour - var/obj/machinery/water/binary/fixture/cxn - - New() - ..() - reagents = new(100) - reagents.my_atom = src - spawn(2) - cxn = locate(/obj/machinery/water/binary/fixture) in loc - if(cxn) - cxn.parent = src - - verbs += /obj/machinery/sink/proc/mode_pour attack_hand(mob/M as mob) if(busy) @@ -27,33 +14,18 @@ var/turf/location = M.loc if(!isturf(location)) return - M << "\blue You start washing up." - - // collect water, at least 10u? - var/amt_needed = 25 - reagents.total_volume - if(!cxn || cxn.fill(amt_needed) < amt_needed) - M << "\The [src] barely trickles. Cleaning up with \the [src] is impossible!" - return + usr << "\blue You start washing up." busy = 1 sleep(40) busy = 0 - // react, for if there's something not water - reagents.reaction(M, TOUCH) - - // ok, this is just goop.. - if(reagents.get_reagent_amount("water") < 10) - M << "\red This does not feel... very water-like..." - return - if(M.loc != location) return //Person has moved away from the sink - if(M.blood_DNA) - reagents.add_reagent("blood", 10) // down the sink M.clean_blood() if(istype(M, /mob/living/carbon)) var/mob/living/carbon/C = M + C.clean_blood() /* if(C.r_hand) C.r_hand.clean_blood() // The hand you attack with is empty anyway, the other one should not be washed while doing this. @@ -77,63 +49,22 @@ for(var/mob/V in viewers(src, null)) V.show_message(text("\blue [M] washes up using \the [src].")) - // empty sink - cxn.drain(reagents.total_volume) - - proc/mode_pour() - set name = "Toggle Mode -> Pour" - set category = "Object" - set src in oview(1) - - mode = 1 - verbs -= /obj/machinery/sink/proc/mode_pour - verbs += /obj/machinery/sink/proc/mode_fill - usr << "You will now pour reagents down \the [src]." - - proc/mode_fill() - set name = "Toggle Mode -> Fill" - set category = "Object" - set src in oview(1) - - mode = 0 - verbs -= /obj/machinery/sink/proc/mode_fill - verbs += /obj/machinery/sink/proc/mode_pour - usr << "You will now fill your container from the faucet." attackby(var/obj/item/O as obj, var/mob/user as mob) if(busy) user << "\red Someone's already washing something here." return - // collect water, any water? - var/amt_needed = 10 - reagents.total_volume - if(!cxn || cxn.fill(amt_needed) == 0) - user << "\The [src] barely trickles. Getting water from \the [src] is impossible!" - return - if (istype(O, /obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/food/drinks)) - if(!mode) - // fill - if(O.reagents.total_volume < O.reagents.maximum_volume) - reagents.trans_to(O, reagents.total_volume) - user.visible_message( \ - "\blue [user] fills \the [O] using \the [src].", \ - "\blue You fill \the [O] using \the [src].") - else - user.visible_message( \ - "\blue [user] spills water out of \the overflowing [O] into \the [src].", \ - "\blue You spill water out of \the overflowing [O] into \the [src].") + if(O.reagents.total_volume < O.reagents.maximum_volume) + O:reagents.add_reagent("water", 10) + user.visible_message( \ + "\blue [user] fills the [O] using the [src].", \ + "\blue You fill the [O] using the [src].") else - // pour - if(O.reagents.total_volume > 0) - O.reagents.trans_to(src, O.reagents.total_volume) - user.visible_message( \ - "\blue [user] pours the contents of \the [O] into \the [src].", \ - "\blue You pour the contents of \the [O] into \the [src].") - else - user << "\The [O] is empty." - // empty sink - cxn.drain(reagents.total_volume) + user.visible_message( \ + "\blue [user] spills water out of the overflowing [O] into the [src].", \ + "\blue You spill water out of the overflowing [O] into the [src].") return else if (istype(O, /obj/item/weapon/melee/baton)) var/obj/item/weapon/melee/baton/B = O @@ -150,9 +81,6 @@ user.visible_message( \ "[user] was stunned by his wet [O].", \ "\red You have wet \the [O], it shocks you!") - - // empty sink - cxn.drain(reagents.total_volume) return var/turf/location = user.loc @@ -167,30 +95,23 @@ sleep(40) busy = 0 - reagents.reaction(O, TOUCH) - if(user.loc != location) return //User has moved if(!I) return //Item's been destroyed while washing if(user.get_active_hand() != I) return //Person has switched hands or the item in their hands - if(O.blood_DNA) - reagents.add_reagent("blood", 10) // down the sink O.clean_blood() user.visible_message( \ "\blue [user] washes \a [I] using \the [src].", \ "\blue You wash \a [I] using \the [src].") - // empty sink - cxn.drain(reagents.total_volume) - shower - name = "shower" + name = "Shower" desc = "This is dumb." kitchen - name = "kitchen sink" + name = "Kitchen Sink" icon_state = "sink_alt" kitchen2 - name = "kitchen sink" + name = "Kitchen Sink" icon_state = "sink_alt2" diff --git a/code/game/master_controller.dm b/code/game/master_controller.dm index 6a3dbe3a012..a04c8421fdf 100644 --- a/code/game/master_controller.dm +++ b/code/game/master_controller.dm @@ -58,9 +58,6 @@ datum/controller/game_controller for(var/obj/machinery/atmospherics/machine in world) machine.build_network() - for(var/obj/machinery/water/machine in world) - machine.build_network() - world << "\red \b Initializing atmos machinery." sleep(-1) for(var/obj/machinery/atmospherics/unary/vent_pump/T in world) @@ -123,9 +120,6 @@ datum/controller/game_controller for(var/datum/pipe_network/network in pipe_networks) network.process() - for(var/datum/water/pipe_network/network in water_pipe_networks) - network.process() - for(var/datum/powernet/P in powernets) P.reset() diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index efb4bdd0c47..7bcda1ad743 100644 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -775,15 +775,6 @@ user << "\blue \t [re]" else user << "\blue No active chemical agents found in [A]." - else if(istype(A,/obj/machinery/water/pipe)) - var/datum/water/pipeline/P = A:parent - if(P.reagents.reagent_list.len > 0) - var/reagents_length = P.reagents.reagent_list.len - user << "\blue [reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found at [P.return_pressure()]kPa." - for (var/re in P.reagents.reagent_list) - user << "\blue \t [re]" - else - user << "\blue No active chemical agents found in [A]." else user << "\blue No significant chemical agents found in [A]." diff --git a/code/game/objects/devices/PDA/cart.dm b/code/game/objects/devices/PDA/cart.dm index 59e3b754056..b3e9698f6de 100644 --- a/code/game/objects/devices/PDA/cart.dm +++ b/code/game/objects/devices/PDA/cart.dm @@ -34,7 +34,6 @@ name = "Power-ON Cartridge" icon_state = "cart-e" access_engine = 1 - access_reagent_scanner = 1 medical name = "Med-U Cartridge" diff --git a/code/game/objects/stool.dm b/code/game/objects/stool.dm index 2d978c02a97..89b5977b82b 100644 --- a/code/game/objects/stool.dm +++ b/code/game/objects/stool.dm @@ -326,8 +326,14 @@ "You unbuckled from [src] by [user.name].",\ "You hear metal clanking") else + var/t_himself = "itself" + if (M.gender == MALE) + t_himself = "himself" + else if (M.gender == FEMALE) + t_himself = "herself" + M.visible_message(\ - "\blue [M.name] unbuckled \himself!",\ + "\blue [M.name] unbuckled [t_himself]!",\ "You unbuckle yourself from [src].",\ "You hear metal clanking") M.pixel_y = 0 diff --git a/code/game/objects/washing_machine.dm b/code/game/objects/washing_machine.dm index b56198edab9..f4904427c19 100644 --- a/code/game/objects/washing_machine.dm +++ b/code/game/objects/washing_machine.dm @@ -21,16 +21,6 @@ //1 = hacked var/gibs_ready = 0 var/obj/crayon - var/obj/machinery/water/binary/fixture/cxn - - New() - ..() - reagents = new(200) - reagents.my_atom = src - spawn(2) - cxn = locate(/obj/machinery/water/binary/fixture) in loc - if(cxn) - cxn.parent = src /obj/machinery/washing_machine/verb/start() set name = "Start Washing" @@ -41,31 +31,13 @@ usr << "The washing machine cannot run in this state." return - if(!cxn) - usr << "\The [src] makes a grinding sound and stalls." - if( locate(/mob,contents) ) state = 8 else state = 5 update_icon() - - // collect water, fill up - var/amt_needed - do - amt_needed = reagents.maximum_volume/2 - reagents.total_volume - cxn.fill(amt_needed) - sleep(10) - while(amt_needed > 0) - - // now, clean things sleep(200) for(var/atom/A in contents) - reagents.reaction(A, TOUCH) - - if(A.blood_DNA) - reagents.add_reagent("blood", 10) // down the sink - reagents.add_reagent("carbon", 5) A.clean_blood() if(crayon) @@ -170,7 +142,6 @@ gibs_ready = 1 else state = 4 - cxn.drain(reagents.total_volume) update_icon() /obj/machinery/washing_machine/verb/climb_out() diff --git a/code/modules/chemical/Chemistry-Holder.dm b/code/modules/chemical/Chemistry-Holder.dm index f69115f4ae9..9dccadb9393 100644 --- a/code/modules/chemical/Chemistry-Holder.dm +++ b/code/modules/chemical/Chemistry-Holder.dm @@ -59,15 +59,11 @@ datum return the_id trans_to(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1)//if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred. - if(!target || src.total_volume <= 0) + if (!target ) return - var/datum/reagents/R - if(istype(target,/datum/reagents)) - R = target - else if(target.reagents) - R = target.reagents - else + if (!target.reagents || src.total_volume<=0) return + var/datum/reagents/R = target.reagents amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume) var/part = amount / src.total_volume var/trans_data = null @@ -85,15 +81,11 @@ datum return amount copy_to(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1) - if(!target || src.total_volume <= 0) + if(!target) return - var/datum/reagents/R - if(istype(target,/datum/reagents)) - R = target - else if(target.reagents) - R = target.reagents - else + if(!target.reagents || src.total_volume<=0) return + var/datum/reagents/R = target.reagents amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume) var/part = amount / src.total_volume var/trans_data = null diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 9f2ba9d7e0f..5ab8e07efba 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -597,29 +597,8 @@ var/amount_per_transfer_from_this = 10 var/possible_transfer_amounts = list(10,25,50,100) - var/obj/machinery/water/portables_connector/connected_port - var/max_pressure = 4*ONE_ATMOSPHERE - attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/wrench)) - if(connected_port) - disconnect() - user << "\blue You disconnect [name] from the port." - update_icon() - return - else - var/obj/machinery/water/portables_connector/possible_port = locate(/obj/machinery/water/portables_connector/) in loc - if(possible_port) - if(connect(possible_port)) - user << "\blue You connect [name] to the port." - update_icon() - return - else - user << "\blue [name] failed to connect to the port." - return - else - user << "\blue Nothing happens." - return + return New() var/datum/reagents/R = new/datum/reagents(1000) @@ -671,43 +650,6 @@ new /obj/effect/effect/water(src.loc) del(src) - proc/connect(obj/machinery/water/portables_connector/new_port) - //Make sure not already connected to something else - if(connected_port || !new_port || new_port.connected_device) - return 0 - - //Make sure are close enough for a valid connection - if(new_port.loc != loc) - return 0 - - //Perform the connection - connected_port = new_port - connected_port.connected_device = src - - anchored = 1 //Prevent movement - - //Actually enforce the air sharing - var/datum/water/pipe_network/network = connected_port.return_network(src) - if(network && !network.reagents.Find(reagents)) - network.reagents += reagents - network.update = 1 - - return 1 - - proc/disconnect() - if(!connected_port) - return 0 - - var/datum/water/pipe_network/network = connected_port.return_network(src) - if(network) - network.reagents -= reagents - - anchored = 0 - - connected_port.connected_device = null - connected_port = null - - return 1 /obj/item/weapon/reagent_containers @@ -781,8 +723,7 @@ /obj/machinery/disease2/incubator, /obj/machinery/disease2/isolator, /obj/machinery/disease2/biodestroyer, - /mob/living/simple_animal/livestock/cow, - /obj/machinery/water/glass_connector + /mob/living/simple_animal/livestock/cow ) examine() @@ -2949,13 +2890,6 @@ ..() reagents.add_reagent("water",1000) - update_icon() - overlays = 0 - if(connected_port) - var/image/I = image('atmos.dmi', "can-connector") - I.pixel_x = 7 - overlays += I - /obj/structure/reagent_dispensers/fueltank name = "fueltank" desc = "A fueltank" @@ -2966,13 +2900,6 @@ ..() reagents.add_reagent("fuel",1000) - update_icon() - overlays = 0 - if(connected_port) - var/image/I = image('atmos.dmi', "can-connector") - I.pixel_x = 7 - overlays += I - /obj/structure/reagent_dispensers/peppertank name = "Pepper Spray Refiller" desc = "Refill pepper spray canisters." diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index b1887e75d46..fbf09e9b1e1 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -167,7 +167,7 @@ if (istype(loc, /turf/space)) return -1 // It's hard to be slowed down in space by... anything - var/health_deficiency = (100 - health) + var/health_deficiency = traumatic_shock if(health_deficiency >= 40) tally += (health_deficiency / 25) var/hungry = (500 - nutrition)/5 // So overeat would be 100 and default level would be 80 diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 1715b749c7d..1058eb93ed5 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -8,6 +8,8 @@ temperature_alert = 0 + // used to do some stuff only on every X life tick + life_tick = 0 /mob/living/carbon/human/Life() set invisibility = 0 @@ -19,6 +21,8 @@ if(!loc) // Fixing a null error that occurs when the mob isn't found in the world -- TLE return + life_tick++ + var/datum/gas_mixture/environment = loc.return_air() // clean all symptoms, they must be set again in this cycle @@ -75,6 +79,9 @@ handle_pain() + // Some mobs heal slowly, others die slowly + handle_health_updates() + // Update clothing update_clothing() @@ -103,6 +110,23 @@ /mob/living/carbon/human proc + handle_health_updates() + // if the mob has enough health, she should slowly heal + if(health >= 0) + var/pr = 5 + if(stat == 1) // sleeping means faster healing + pr += 3 + if(prob(pr)) + heal_organ_damage(1,1) + adjustToxLoss(-1) + else if(health < 0) + var/pr = 8 + // sleeping means slower damage + if(stat == 1) + pr = 3 + if(prob(pr)) + adjustToxLoss(1) + clamp_values() SetStunned(min(stunned, 20)) diff --git a/code/modules/mob/organ/pain.dm b/code/modules/mob/organ/pain.dm index 5fcefd73c67..fb0715138c3 100644 --- a/code/modules/mob/organ/pain.dm +++ b/code/modules/mob/organ/pain.dm @@ -34,6 +34,10 @@ mob/proc/pain(var/partname, var/amount, var/force) mob/living/carbon/human/proc/handle_pain() // not when sleeping if(stat >= 2) return + if(reagents.has_reagent("tramadol")) + return + if(reagents.has_reagent("oxycodone")) + return var/maxdam = 0 var/datum/organ/external/damaged_organ = null for(var/name in organs) diff --git a/code/modules/water/components/binary/binary_water_base.dm b/code/modules/water/components/binary/binary_water_base.dm deleted file mode 100644 index 5974356d3e9..00000000000 --- a/code/modules/water/components/binary/binary_water_base.dm +++ /dev/null @@ -1,147 +0,0 @@ -obj/machinery/water/binary - dir = SOUTH - initialize_directions = SOUTH|NORTH - - var/datum/reagents/r1 - var/datum/reagents/r2 - - var/obj/machinery/water/node1 - var/obj/machinery/water/node2 - - var/datum/water/pipe_network/network1 - var/datum/water/pipe_network/network2 - - var/max_volume = 400 - var/max_pressure = 3 * ONE_ATMOSPHERE - - New() - ..() - switch(dir) - if(NORTH) - initialize_directions = NORTH|SOUTH - if(SOUTH) - initialize_directions = NORTH|SOUTH - if(EAST) - initialize_directions = EAST|WEST - if(WEST) - initialize_directions = EAST|WEST - r1 = new(max_volume) - r1.my_atom = src - r2 = new(max_volume) - r2.my_atom = src - -// Housekeeping and pipe network stuff below - network_expand(datum/water/pipe_network/new_network, obj/machinery/water/pipe/reference) - if(reference == node1) - network1 = new_network - - else if(reference == node2) - network2 = new_network - - if(new_network.normal_members.Find(src)) - return 0 - - new_network.normal_members += src - - return null - - Del() - loc = null - - if(node1) - node1.disconnect(src) - del(network1) - if(node2) - node2.disconnect(src) - del(network2) - - node1 = null - node2 = null - - ..() - - initialize() - if(node1 && node2) return - - var/node2_connect = dir - var/node1_connect = turn(dir, 180) - - for(var/obj/machinery/water/target in get_step(src,node1_connect)) - if(target.initialize_directions & get_dir(target,src)) - node1 = target - break - - for(var/obj/machinery/water/target in get_step(src,node2_connect)) - if(target.initialize_directions & get_dir(target,src)) - node2 = target - break - - update_icon() - - build_network() - if(!network1 && node1) - network1 = new /datum/water/pipe_network() - network1.normal_members += src - network1.build_network(node1, src) - - if(!network2 && node2) - network2 = new /datum/water/pipe_network() - network2.normal_members += src - network2.build_network(node2, src) - - - return_network(obj/machinery/water/reference) - build_network() - - if(reference==node1) - return network1 - - if(reference==node2) - return network2 - - return null - - reassign_network(datum/water/pipe_network/old_network, datum/water/pipe_network/new_network) - if(network1 == old_network) - network1 = new_network - if(network2 == old_network) - network2 = new_network - - return 1 - - return_network_reagents(datum/water/pipe_network/reference) - var/list/results = list() - - if(network1 == reference) - results += r1 - if(network2 == reference) - results += r2 - - return results - - disconnect(obj/machinery/water/reference) - if(reference==node1) - del(network1) - node1 = null - - else if(reference==node2) - del(network2) - node2 = null - - return null - - proc/return_pressure1() - return r1.total_volume / r1.maximum_volume * max_pressure - - proc/return_pressure2() - return r2.total_volume / r2.maximum_volume * max_pressure - - proc/mingle_dc1_with_turf() - mingle_outflow_with_turf(get_turf(src), r1.total_volume, - turn(dir, 180), - reagents = r1, pressure = return_pressure1()) - - proc/mingle_dc2_with_turf() - mingle_outflow_with_turf(get_turf(src), r2.total_volume, - dir, - reagents = r2, pressure = return_pressure2()) \ No newline at end of file diff --git a/code/modules/water/components/binary/fixture.dm b/code/modules/water/components/binary/fixture.dm deleted file mode 100644 index b0656eb2703..00000000000 --- a/code/modules/water/components/binary/fixture.dm +++ /dev/null @@ -1,84 +0,0 @@ -/obj/machinery/water/binary/fixture - name = "water fixture connection" - icon = 'water_fixtures.dmi' - icon_state = "fixture-f" - level = 1 - layer = 2.9 - - var/obj/parent - - update_icon() - icon_state = "fixture[invisibility ? "-f" : "" ]" - - hide(var/i) - if(level == 1 && istype(loc, /turf/simulated)) - invisibility = i ? 101 : 0 - update_icon() - - initialize() - ..() - var/turf/T = src.loc // hide if turf is not intact - hide(T.intact) - update_icon() - - process() - ..() - - // handle leaks - if(!network1 && r1.total_volume > 0) - mingle_dc1_with_turf() - - if(!network2 && r2.total_volume > 0) - mingle_dc2_with_turf() - - proc/fill(amount) - if(!parent || !parent.reagents || amount <= 0) return - amount = min(amount, parent.reagents.maximum_volume-parent.reagents.total_volume) - var/parent_pressure = parent.reagents.total_volume / parent.reagents.maximum_volume - - if(return_pressure1() > parent_pressure) - r1.trans_to(parent, amount) - if(network1) - network1.update = 1 - return amount - else - return 0 - - proc/drain(amount) - if(!parent || !parent.reagents || amount <= 0) return - amount = min(amount, r2.maximum_volume-r2.total_volume) - var/parent_pressure = parent.reagents.total_volume / parent.reagents.maximum_volume - - if(return_pressure2() < parent_pressure) - parent.reagents.trans_to(r2, amount) - if(network2) - network2.update = 1 - return amount - else - return 0 - - attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) - return ..() - var/turf/T = src.loc - if (level==1 && isturf(T) && T.intact) - user << "\red You must remove the plating first." - return 1 - var/datum/gas_mixture/env_air = loc.return_air() - if ((return_pressure1()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." - add_fingerprint(user) - return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." - if (do_after(user, 40)) - user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") - new /obj/item/water_pipe(loc, make_from=src) - del(src) - - visible - icon_state = "fixture" - level = 2 \ No newline at end of file diff --git a/code/modules/water/components/binary/water_pump.dm b/code/modules/water/components/binary/water_pump.dm deleted file mode 100644 index 6bfc05aab63..00000000000 --- a/code/modules/water/components/binary/water_pump.dm +++ /dev/null @@ -1,198 +0,0 @@ -/* -Every cycle, the pump uses the reagents in reagents_in to try and make reagents_out the perfect pressure. - -node1, r1, network1 correspond to input -node2, r2, network2 correspond to output - -Thus, the two variables affect pump operation are set in New(): - r1.total_volume - This is the volume of gas available to the pump that may be transfered to the output - r2.total_volume - Higher quantities of this cause more air to be perfected later - but overall network volume is also increased as this increases... -*/ - -obj/machinery/water/binary/pump - icon = 'pump.dmi' - icon_state = "intact_off" - - name = "Water pump" - desc = "A pump" - - var/on = 0 - var/target_pressure = ONE_ATMOSPHERE - - var/frequency = 0 - var/id = null - var/datum/radio_frequency/radio_connection - -/* - attack_hand(mob/user) - on = !on - update_icon() -*/ - - update_icon() - if(node1&&node2) - icon_state = "intact_[on?("on"):("off")]" - else - if(node1) - icon_state = "exposed_1_off" - else if(node2) - icon_state = "exposed_2_off" - else - icon_state = "exposed_3_off" - return - - process() -// ..() - if(stat & (NOPOWER|BROKEN)) - return - if(!on) - return 0 - - var/output_starting_pressure = return_pressure2() - - if( (target_pressure - output_starting_pressure) < 0.01) - //No need to pump liquid if target is already reached! - return 1 - - //Calculate necessary moles to transfer using PV=nRT - if(r1.total_volume > 0) - var/pressure_delta = target_pressure - output_starting_pressure - var/transfer_vol = pressure_delta * r2.maximum_volume / max_pressure - - //Actually transfer the reagents - r1.trans_to(r2, transfer_vol) - - if(network1) - network1.update = 1 - - if(network2) - network2.update = 1 - else if(r2.total_volume > 0) // leak out 1->2 - mingle_dc2_with_turf() - - return 1 - - //Radio remote control - - proc - set_frequency(new_frequency) - radio_controller.remove_object(src, frequency) - frequency = new_frequency - if(frequency) - radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA) - - broadcast_status() - if(!radio_connection) - return 0 - - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.source = src - - signal.data = list( - "tag" = id, - "device" = "AGP", - "power" = on, - "target_output" = target_pressure, - "sigtype" = "status" - ) - - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) - - return 1 - - interact(mob/user as mob) - var/dat = {"Power: [on?"On":"Off"]
- Desirable output pressure: - [round(target_pressure,0.1)]kPa | Change - "} - - user << browse("[src.name] control[dat]", "window=atmo_pump") - onclose(user, "atmo_pump") - - initialize() - ..() - if(frequency) - set_frequency(frequency) - - receive_signal(datum/signal/signal) - if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) - return 0 - - if("power" in signal.data) - on = text2num(signal.data["power"]) - - if("power_toggle" in signal.data) - on = !on - - if("set_output_pressure" in signal.data) - target_pressure = between( - 0, - text2num(signal.data["set_output_pressure"]), - ONE_ATMOSPHERE*50 - ) - - if("status" in signal.data) - spawn(2) - broadcast_status() - return //do not update_icon - - spawn(2) - broadcast_status() - update_icon() - return - - - attack_hand(user as mob) - if(..()) - return - src.add_fingerprint(usr) - if(!src.allowed(user)) - user << "\red Access denied." - return - usr.machine = src - interact(user) - return - - Topic(href,href_list) - if(href_list["power"]) - on = !on - if(href_list["set_press"]) - var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num - src.target_pressure = max(0, min(4500, new_pressure)) - usr.machine = src - src.update_icon() - src.updateUsrDialog() - return - - power_change() - ..() - update_icon() - - attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) - return ..() - if (!(stat & NOPOWER) && on) - user << "\red You cannot unwrench this [src], turn it off first." - return 1 - var/turf/T = src.loc - if (level==1 && isturf(T) && T.intact) - user << "\red You must remove the plating first." - return 1 - var/datum/gas_mixture/env_air = loc.return_air() - if ((return_pressure1()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." - add_fingerprint(user) - return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." - if (do_after(user, 40)) - user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") - new /obj/item/water_pipe(loc, make_from=src) - del(src) diff --git a/code/modules/water/components/trinary/trinary_water_base.dm b/code/modules/water/components/trinary/trinary_water_base.dm deleted file mode 100644 index 4cc16546271..00000000000 --- a/code/modules/water/components/trinary/trinary_water_base.dm +++ /dev/null @@ -1,189 +0,0 @@ -obj/machinery/water/trinary - dir = SOUTH - initialize_directions = SOUTH|NORTH|WEST - - var/datum/reagents/r1 - var/datum/reagents/r2 - var/datum/reagents/r3 - - var/obj/machinery/water/node1 - var/obj/machinery/water/node2 - var/obj/machinery/water/node3 - - var/datum/water/pipe_network/network1 - var/datum/water/pipe_network/network2 - var/datum/water/pipe_network/network3 - - var/max_volume = 400 - var/max_pressure = 3 * ONE_ATMOSPHERE - - New() - ..() - switch(dir) - if(NORTH) - initialize_directions = EAST|NORTH|SOUTH - if(SOUTH) - initialize_directions = SOUTH|WEST|NORTH - if(EAST) - initialize_directions = EAST|WEST|SOUTH - if(WEST) - initialize_directions = WEST|NORTH|EAST - r1 = new(max_volume) - r1.my_atom = src - r2 = new(max_volume) - r2.my_atom = src - r3 = new(max_volume) - r3.my_atom = src - -// Housekeeping and pipe network stuff below - network_expand(datum/water/pipe_network/new_network, obj/machinery/water/pipe/reference) - if(reference == node1) - network1 = new_network - - else if(reference == node2) - network2 = new_network - - else if (reference == node3) - network3 = new_network - - if(new_network.normal_members.Find(src)) - return 0 - - new_network.normal_members += src - - return null - - Del() - loc = null - - if(node1) - node1.disconnect(src) - del(network1) - if(node2) - node2.disconnect(src) - del(network2) - if(node3) - node3.disconnect(src) - del(network3) - - node1 = null - node2 = null - node3 = null - - ..() - - initialize() - if(node1 && node2 && node3) return - - var/node1_connect = turn(dir, -180) - var/node2_connect = turn(dir, -90) - var/node3_connect = dir - - for(var/obj/machinery/water/target in get_step(src,node1_connect)) - if(target.initialize_directions & get_dir(target,src)) - node1 = target - break - - for(var/obj/machinery/water/target in get_step(src,node2_connect)) - if(target.initialize_directions & get_dir(target,src)) - node2 = target - break - - for(var/obj/machinery/water/target in get_step(src,node3_connect)) - if(target.initialize_directions & get_dir(target,src)) - node3 = target - break - - update_icon() - - build_network() - if(!network1 && node1) - network1 = new /datum/water/pipe_network() - network1.normal_members += src - network1.build_network(node1, src) - - if(!network2 && node2) - network2 = new /datum/water/pipe_network() - network2.normal_members += src - network2.build_network(node2, src) - - if(!network3 && node3) - network3 = new /datum/water/pipe_network() - network3.normal_members += src - network3.build_network(node3, src) - - - return_network(obj/machinery/water/reference) - build_network() - - if(reference==node1) - return network1 - - if(reference==node2) - return network2 - - if(reference==node3) - return network3 - - return null - - reassign_network(datum/water/pipe_network/old_network, datum/water/pipe_network/new_network) - if(network1 == old_network) - network1 = new_network - if(network2 == old_network) - network2 = new_network - if(network3 == old_network) - network3 = new_network - - return 1 - - return_network_reagents(datum/water/pipe_network/reference) - var/list/results = list() - - if(network1 == reference) - results += r1 - if(network2 == reference) - results += r2 - if(network3 == reference) - results += r3 - - return results - - disconnect(obj/machinery/water/reference) - if(reference==node1) - del(network1) - node1 = null - - else if(reference==node2) - del(network2) - node2 = null - - else if(reference==node3) - del(network3) - node3 = null - - return null - - proc/return_pressure1() - return r1.total_volume / r1.maximum_volume * max_pressure - - proc/return_pressure2() - return r2.total_volume / r2.maximum_volume * max_pressure - - proc/return_pressure3() - return r3.total_volume / r3.maximum_volume * max_pressure - - proc/mingle_dc1_with_turf() - mingle_outflow_with_turf(get_turf(src), r1.total_volume, - turn(dir, 180), - reagents = r1, pressure = return_pressure1()) - - proc/mingle_dc2_with_turf() - mingle_outflow_with_turf(get_turf(src), r2.total_volume, - turn(dir, -90), - reagents = r2, pressure = return_pressure2()) - - proc/mingle_dc3_with_turf() - mingle_outflow_with_turf(get_turf(src), r3.total_volume, - dir, - reagents = r3, pressure = return_pressure3()) \ No newline at end of file diff --git a/code/modules/water/components/trinary/water_filter.dm b/code/modules/water/components/trinary/water_filter.dm deleted file mode 100644 index d647f74614b..00000000000 --- a/code/modules/water/components/trinary/water_filter.dm +++ /dev/null @@ -1,198 +0,0 @@ -obj/machinery/water/trinary/filter - icon = 'filter.dmi' - icon_state = "intact_off" - density = 1 - - name = "Liquid filter" - - req_access = list(access_atmospherics) - - var/on = 0 - var/temp = null // -- TLE - - var/target_pressure = ONE_ATMOSPHERE - - var/list/filter_types = list() - var/filter_types_text - - var/frequency = 0 - var/datum/radio_frequency/radio_connection - - proc - set_frequency(new_frequency) - radio_controller.remove_object(src, frequency) - frequency = new_frequency - if(frequency) - radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) - - New() - if(filter_types_text) - filter_types = dd_text2list(filter_types_text, ";") - filter_types_text = null - - if(radio_controller) - initialize() - ..() - - update_icon() - if(node2 && node3 && node1) - icon_state = "intact_[on?("on"):("off")]" - else - icon_state = "hintact_off" - on = 0 - - return - - New() - ..() - - process() - ..() - if(!on) - return 0 - - var/output_starting_pressure = return_pressure3() - - if(output_starting_pressure >= target_pressure) - //No need to mix if target is already full! - return 1 - - //Calculate necessary volume to transfer - - var/pressure_delta = target_pressure - output_starting_pressure - var/transfer_vol = pressure_delta * r3.maximum_volume / max_pressure - - //Actually transfer the reagents - - if(transfer_vol > 0) - var/datum/reagents/removed = new(transfer_vol) - removed.my_atom = src - r1.trans_to(removed, transfer_vol) - - var/datum/reagents/filtered_out = new(transfer_vol) - filtered_out.my_atom = src - - // transfer each type in filter list - for(var/T in filter_types) - var/datum/reagent/R = removed.has_reagent(T) - if(!R) continue - filtered_out.add_reagent(T, R.volume) - removed.remove_reagent(T, R.volume) - - filtered_out.trans_to(r2, filtered_out.total_volume) - removed.trans_to(r3, removed.total_volume) - - if(network2) - network2.update = 1 - else if(r2.total_volume > 0) // leak out 1->2 - mingle_dc2_with_turf() - - if(network3) - network3.update = 1 - else if(r3.total_volume > 0) // leak out 1->3 - mingle_dc3_with_turf() - - if(network1) - network1.update = 1 - - return 1 - - hide(var/i) - if(level == 1 && istype(loc, /turf/simulated)) - invisibility = i ? 101 : 0 - density = !i - update_icon() - - initialize() - set_frequency(frequency) - ..() - var/turf/T = src.loc // hide if turf is not intact - hide(T.intact) - - attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) - return ..() - var/turf/T = src.loc - if (level==1 && isturf(T) && T.intact) - user << "\red You must remove the plating first." - return 1 - var/datum/gas_mixture/env_air = loc.return_air() - if ((return_pressure1()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." - add_fingerprint(user) - return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." - if (do_after(user, 40)) - user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") - new /obj/item/water_pipe(loc, make_from=src) - del(src) - - -obj/machinery/water/trinary/filter/attack_hand(user as mob) // -- TLE - if(..()) - return - - if(!src.allowed(user)) - user << "\red Access denied." - return - - var/dat - dat += {" - Power: [on?"On":"Off"]
- Filtering: Add
"} - - for(var/T in filter_types) - dat += "[T]
" - - dat += {"
Desirable output pressure: - [src.target_pressure] | Change - "} -/* - user << browse("[src.name] control[dat]","window=atmo_filter") - onclose(user, "atmo_filter") - return - - if (src.temp) - dat = text("[]

Clear Screen", src.temp, src) - //else - // src.on != src.on -*/ - user << browse("[src.name] control[dat]", "window=atmo_filter") - onclose(user, "atmo_filter") - return - -obj/machinery/water/trinary/filter/Topic(href, href_list) // -- TLE - if(..()) - return - usr.machine = src - src.add_fingerprint(usr) - if (href_list["temp"]) - src.temp = null - if(href_list["set_press"]) - var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num - src.target_pressure = max(0, min(4500, new_pressure)) - if(href_list["power"]) - on=!on - if(href_list["add"]) - var/list/choices = new() - for(var/T in typesof(/datum/reagent) - /datum/reagent) - var/datum/reagent/R = new T() - choices += R.id - var/choice = input("Choose Reagent", name) in choices - filter_types += choice - if(href_list["remove"]) - filter_types -= href_list["remove"] - src.update_icon() - src.updateUsrDialog() -/* - for(var/mob/M in viewers(1, src)) - if ((M.client && M.machine == src)) - src.attack_hand(M) -*/ - return - - diff --git a/code/modules/water/components/trinary/water_mixer.dm b/code/modules/water/components/trinary/water_mixer.dm deleted file mode 100644 index 793e03d9a8a..00000000000 --- a/code/modules/water/components/trinary/water_mixer.dm +++ /dev/null @@ -1,148 +0,0 @@ -obj/machinery/water/trinary/mixer - icon = 'mixer.dmi' - icon_state = "intact_off" - density = 1 - - name = "Liquid mixer" - - req_access = list(access_atmospherics) - - var/on = 0 - - var/target_pressure = ONE_ATMOSPHERE - var/node1_concentration = 0.5 - var/node2_concentration = 0.5 - - //node 3 is the outlet, nodes 1 & 2 are intakes - - update_icon() - if(node2 && node3 && node1) - icon_state = "intact_[on?("on"):("off")]" - else - icon_state = "intact_off" - on = 0 - - return - - New() - ..() - r3.maximum_volume = 500 - - process() - ..() - if(!on) - return 0 - - var/output_starting_pressure = return_pressure3() - - if(output_starting_pressure >= target_pressure) - //No need to mix if target is already full! - return 1 - - //Calculate necessary moles to transfer using PV=nRT - - var/pressure_delta = target_pressure - output_starting_pressure - var/transfer_vol1 = (node1_concentration*pressure_delta) * r1.maximum_volume / max_pressure - var/transfer_vol2 = (node2_concentration*pressure_delta) * r2.maximum_volume / max_pressure - - var/r1_vol = r1.total_volume - var/r2_vol = r2.total_volume - - if((r1_vol < transfer_vol1) || (r2_vol < transfer_vol2)) - if(!transfer_vol1 || !transfer_vol2) return - var/ratio = min(r1_vol/transfer_vol1, r2_vol/transfer_vol2) - - transfer_vol1 *= ratio - transfer_vol2 *= ratio - - //Actually transfer the gas - - if(transfer_vol1 > 0) - r1.trans_to(r3, transfer_vol1) - - if(transfer_vol2 > 0) - r2.trans_to(r3, transfer_vol2) - - if(network1 && transfer_vol1) - network1.update = 1 - - if(network2 && transfer_vol2) - network2.update = 1 - - if(network3) - network3.update = 1 - else if(r3.total_volume > 0) // leak out 1,2->3 - mingle_dc3_with_turf() - - return 1 - - attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) - return ..() - var/turf/T = src.loc - if (level==1 && isturf(T) && T.intact) - user << "\red You must remove the plating first." - return 1 - var/datum/gas_mixture/env_air = loc.return_air() - if ((return_pressure3()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." - add_fingerprint(user) - return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." - if (do_after(user, 40)) - user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") - new /obj/item/water_pipe(loc, make_from=src) - del(src) - - attack_hand(user as mob) - if(..()) - return - src.add_fingerprint(usr) - if(!src.allowed(user)) - user << "\red Access denied." - return - usr.machine = src - var/dat = {"Power: [on?"On":"Off"]
- Desirable output pressure: - [target_pressure]kPa | Change -
- Node 1 Concentration: - - - - - [node1_concentration]([node1_concentration*100]%) - + - + -
- Node 2 Concentration: - - - - - [node2_concentration]([node2_concentration*100]%) - + - + - "} - - user << browse("[src.name] control[dat]", "window=atmo_mixer") - onclose(user, "atmo_mixer") - return - - Topic(href,href_list) - if(href_list["power"]) - on = !on - if(href_list["set_press"]) - var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num - src.target_pressure = max(0, min(4500, new_pressure)) - if(href_list["node1_c"]) - var/value = text2num(href_list["node1_c"]) - src.node1_concentration = max(0, min(1, src.node1_concentration + value)) - src.node2_concentration = max(0, min(1, src.node2_concentration - value)) - if(href_list["node2_c"]) - var/value = text2num(href_list["node2_c"]) - src.node2_concentration = max(0, min(1, src.node2_concentration + value)) - src.node1_concentration = max(0, min(1, src.node1_concentration - value)) - src.update_icon() - src.updateUsrDialog() - return diff --git a/code/modules/water/components/tvalve.dm b/code/modules/water/components/tvalve.dm deleted file mode 100644 index 351d8d4ef35..00000000000 --- a/code/modules/water/components/tvalve.dm +++ /dev/null @@ -1,337 +0,0 @@ -obj/machinery/water/tvalve - icon = 'valve.dmi' - icon_state = "tvalve0" - - name = "manual switching water valve" - desc = "A pipe valve" - - dir = SOUTH - initialize_directions = SOUTH|NORTH|WEST - - var/state = 0 // 0 = go straight, 1 = go to side - - // like a trinary component, node1 is input, node2 is side output, node3 is straight output - var/obj/machinery/water/node1 - var/obj/machinery/water/node2 - var/obj/machinery/water/node3 - - var/datum/water/pipe_network/network_node1 - var/datum/water/pipe_network/network_node2 - var/datum/water/pipe_network/network_node3 - - update_icon(animation) - if(animation) - flick("tvalve[src.state][!src.state]",src) - else - icon_state = "tvalve[state]" - - New() - switch(dir) - if(NORTH) - initialize_directions = SOUTH|NORTH|EAST - if(SOUTH) - initialize_directions = NORTH|SOUTH|WEST - if(EAST) - initialize_directions = WEST|EAST|SOUTH - if(WEST) - initialize_directions = EAST|WEST|NORTH - ..() - - network_expand(datum/water/pipe_network/new_network, obj/machinery/water/pipe/reference) - if(reference == node1) - network_node1 = new_network - if(state) - network_node2 = new_network - else - network_node3 = new_network - else if(reference == node2) - network_node2 = new_network - if(state) - network_node1 = new_network - else if(reference == node3) - network_node3 = new_network - if(!state) - network_node1 = new_network - - if(new_network.normal_members.Find(src)) - return 0 - - new_network.normal_members += src - - if(state) - if(reference == node1) - if(node2) - return node2.network_expand(new_network, src) - else if(reference == node2) - if(node1) - return node1.network_expand(new_network, src) - else - if(reference == node1) - if(node3) - return node3.network_expand(new_network, src) - else if(reference == node3) - if(node1) - return node1.network_expand(new_network, src) - - return null - - Del() - loc = null - - if(node1) - node1.disconnect(src) - del(network_node1) - if(node2) - node2.disconnect(src) - del(network_node2) - if(node3) - node3.disconnect(src) - del(network_node3) - - node1 = null - node2 = null - node3 = null - - ..() - - proc/go_to_side() - - if(state) return 0 - - state = 1 - update_icon() - - if(network_node1) - del(network_node1) - if(network_node3) - del(network_node3) - build_network() - - if(network_node1&&network_node2) - network_node1.merge(network_node2) - network_node2 = network_node1 - - if(network_node1) - network_node1.update = 1 - else if(network_node2) - network_node2.update = 1 - - return 1 - - proc/go_straight() - - if(!state) - return 0 - - state = 0 - update_icon() - - if(network_node1) - del(network_node1) - if(network_node2) - del(network_node2) - build_network() - - if(network_node1&&network_node3) - network_node1.merge(network_node3) - network_node3 = network_node1 - - if(network_node1) - network_node1.update = 1 - else if(network_node3) - network_node3.update = 1 - - return 1 - - attack_ai(mob/user as mob) - return - - attack_paw(mob/user as mob) - return attack_hand(user) - - attack_hand(mob/user as mob) - src.add_fingerprint(usr) - update_icon(1) - sleep(10) - if (src.state) - src.go_straight() - else - src.go_to_side() - - process() - ..() - machines.Remove(src) - - if(!node1) - if(state && node2) - mingle_dc_with_turf(turn(dir,180), network_node2) // leak 2->1 - else if(!state && node3) - mingle_dc_with_turf(turn(dir,180), network_node3) // leak 3->1 - else - if(state && node2) - mingle_dc_with_turf(turn(dir,-90), network_node1) // leak 1->2 - else if(!state && node3) - mingle_dc_with_turf(dir, network_node1) // leak 1->3 - // if it's disconnected on both ends, do nothing - - return - - initialize() - var/node1_dir - var/node2_dir - var/node3_dir - - node1_dir = turn(dir, 180) - node2_dir = turn(dir, -90) - node3_dir = dir - - for(var/obj/machinery/water/target in get_step(src,node1_dir)) - if(target.initialize_directions & get_dir(target,src)) - node1 = target - break - for(var/obj/machinery/water/target in get_step(src,node2_dir)) - if(target.initialize_directions & get_dir(target,src)) - node2 = target - break - for(var/obj/machinery/water/target in get_step(src,node3_dir)) - if(target.initialize_directions & get_dir(target,src)) - node3 = target - break - - build_network() - if(!network_node1 && node1) - network_node1 = new /datum/water/pipe_network() - network_node1.normal_members += src - network_node1.build_network(node1, src) - - if(!network_node2 && node2) - network_node2 = new /datum/water/pipe_network() - network_node2.normal_members += src - network_node2.build_network(node2, src) - - if(!network_node3 && node3) - network_node3 = new /datum/water/pipe_network() - network_node3.normal_members += src - network_node3.build_network(node3, src) - - - return_network(obj/machinery/water/reference) - build_network() - - if(reference==node1) - return network_node1 - - if(reference==node2) - return network_node2 - - if(reference==node3) - return network_node3 - - return null - - reassign_network(datum/water/pipe_network/old_network, datum/water/pipe_network/new_network) - if(network_node1 == old_network) - network_node1 = new_network - if(network_node2 == old_network) - network_node2 = new_network - if(network_node3 == old_network) - network_node3 = new_network - - return 1 - - return_network_reagents(datum/water/pipe_network/reference) - return null - - disconnect(obj/machinery/water/reference) - if(reference==node1) - del(network_node1) - node1 = null - - else if(reference==node2) - del(network_node2) - node2 = null - - else if(reference==node3) - del(network_node3) - node2 = null - - return null - - digital // can be controlled by AI - name = "digital switching valve" - desc = "A digitally controlled valve." - icon = 'digital_valve.dmi' - - attack_ai(mob/user as mob) - return src.attack_hand(user) - - attack_hand(mob/user as mob) - if(!src.allowed(user)) - user << "\red Access denied." - return - ..() - - //Radio remote control - - proc - set_frequency(new_frequency) - radio_controller.remove_object(src, frequency) - frequency = new_frequency - if(frequency) - radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) - - var/frequency = 0 - var/id = null - var/datum/radio_frequency/radio_connection - - initialize() - ..() - if(frequency) - set_frequency(frequency) - - receive_signal(datum/signal/signal) - if(!signal.data["tag"] || (signal.data["tag"] != id)) - return 0 - - switch(signal.data["command"]) - if("valve_open") - if(!state) - go_to_side() - - if("valve_close") - if(state) - go_straight() - - if("valve_toggle") - if(state) - go_straight() - else - go_to_side() - - proc/return_pressure() - return network_node1.return_pressure_transient() - - attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) - return ..() - if (istype(src, /obj/machinery/water/tvalve/digital)) - user << "\red You cannot unwrench this [src], it's too complicated." - return 1 - var/turf/T = src.loc - if (level==1 && isturf(T) && T.intact) - user << "\red You must remove the plating first." - return 1 - var/datum/gas_mixture/env_air = loc.return_air() - if ((return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." - add_fingerprint(user) - return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." - if (do_after(user, 40)) - user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") - new /obj/item/water_pipe(loc, make_from=src) - del(src) diff --git a/code/modules/water/components/unary/sprinkler.dm b/code/modules/water/components/unary/sprinkler.dm deleted file mode 100644 index 213edf6343f..00000000000 --- a/code/modules/water/components/unary/sprinkler.dm +++ /dev/null @@ -1,105 +0,0 @@ -#define SPRINKLER_VOLUME_PER_SPLASH 3 - -/obj/machinery/water/unary/sprinkler - name = "fire sprinkler" - icon = 'water_fixtures.dmi' - icon_state = "sprinkler0" - layer = 5 - max_volume = 100 - max_pressure = ONE_ATMOSPHERE - - var/on = 0 - - temperature_expose(datum/gas_mixture/air, temperature, volume) - on = temperature > T0C+200 ? 50 : 0 - update_icon() - - update_icon() - icon_state = "sprinkler[(on || stat) > 0]" - - process() - // make broken sprinkler stay on forever - if((!stat && !on) || reagents.total_volume < SPRINKLER_VOLUME_PER_SPLASH) - return - - if(on > 0) - on-- - - // from extinguisher - /*var/direction = turn(dir, 180) - - var/turf/T = get_turf(loc) - var/turf/T1 = get_step(T,turn(direction, 90)) - var/turf/T2 = get_step(T,turn(direction, -90)) - for(var/i = 1 to 5) - T2 = get_step(T2,direction) - - var/list/the_targets = block(T1, T2)*/ // 3x3 grid in front of sprinkler - - var/list/the_targets = view(5, src.loc) - if(the_targets.len == 0) - return - - for(var/a=0, a 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." - add_fingerprint(user) - return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." - if (do_after(user, 40)) - user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") - new /obj/item/water_pipe(loc, make_from=src) - del(src) - else - ..() - -#undef SPRINKLER_VOLUME_PER_SPLASH \ No newline at end of file diff --git a/code/modules/water/components/unary/unary_water_base.dm b/code/modules/water/components/unary/unary_water_base.dm deleted file mode 100644 index c32310685ec..00000000000 --- a/code/modules/water/components/unary/unary_water_base.dm +++ /dev/null @@ -1,89 +0,0 @@ -/obj/machinery/water/unary - dir = SOUTH - initialize_directions = SOUTH - - var/obj/machinery/water/node - var/datum/water/pipe_network/network - - var/max_volume = 400 - var/max_pressure = 3 * ONE_ATMOSPHERE - - New() - ..() - initialize_directions = dir - reagents = new(max_volume) - reagents.my_atom = src - - proc/return_pressure() - return reagents.total_volume / reagents.maximum_volume * max_pressure - -// Housekeeping and pipe network stuff below - network_expand(datum/water/pipe_network/new_network, obj/machinery/water/pipe/reference) - if(reference == node) - network = new_network - - if(new_network.normal_members.Find(src)) - return 0 - - new_network.normal_members += src - - return null - - Del() - loc = null - - if(node) - node.disconnect(src) - del(network) - - node = null - - ..() - - initialize() - if(node) return - - var/node_connect = dir - - for(var/obj/machinery/water/target in get_step(src,node_connect)) - if(target.initialize_directions & get_dir(target,src)) - node = target - break - - update_icon() - - build_network() - if(!network && node) - network = new /datum/water/pipe_network() - network.normal_members += src - network.build_network(node, src) - - - return_network(obj/machinery/water/reference) - build_network() - - if(reference==node) - return network - - return null - - reassign_network(datum/water/pipe_network/old_network, datum/water/pipe_network/new_network) - if(network == old_network) - network = new_network - - return 1 - - return_network_reagents(datum/water/pipe_network/reference) - var/list/results = list() - - if(network == reference) - results += reagents - - return results - - disconnect(obj/machinery/water/reference) - if(reference==node) - del(network) - node = null - - return null \ No newline at end of file diff --git a/code/modules/water/components/valve.dm b/code/modules/water/components/valve.dm deleted file mode 100644 index e6ff88900a0..00000000000 --- a/code/modules/water/components/valve.dm +++ /dev/null @@ -1,320 +0,0 @@ -obj/machinery/water/valve - icon = 'valve.dmi' - icon_state = "valve0" - - name = "manual water valve" - desc = "A pipe valve" - - dir = SOUTH - initialize_directions = SOUTH|NORTH - - var/open = 0 - - var/obj/machinery/water/node1 - var/obj/machinery/water/node2 - - var/datum/water/pipe_network/network_node1 - var/datum/water/pipe_network/network_node2 - - update_icon(animation) - if(animation) - flick("valve[src.open][!src.open]",src) - else - icon_state = "valve[open]" - - New() - switch(dir) - if(NORTH || SOUTH) - initialize_directions = NORTH|SOUTH - if(EAST || WEST) - initialize_directions = EAST|WEST - ..() - - network_expand(datum/water/pipe_network/new_network, obj/machinery/water/pipe/reference) - if(reference == node1) - network_node1 = new_network - if(open) - network_node2 = new_network - else if(reference == node2) - network_node2 = new_network - if(open) - network_node1 = new_network - - if(new_network.normal_members.Find(src)) - return 0 - - new_network.normal_members += src - - if(open) - if(reference == node1) - if(node2) - return node2.network_expand(new_network, src) - else if(reference == node2) - if(node1) - return node1.network_expand(new_network, src) - - return null - - Del() - loc = null - - if(node1) - node1.disconnect(src) - del(network_node1) - if(node2) - node2.disconnect(src) - del(network_node2) - - node1 = null - node2 = null - - ..() - - proc/open() - - if(open) return 0 - - open = 1 - update_icon() - - if(network_node1&&network_node2) - network_node1.merge(network_node2) - network_node2 = network_node1 - - if(network_node1) - network_node1.update = 1 - else if(network_node2) - network_node2.update = 1 - - return 1 - - proc/close() - - if(!open) - return 0 - - open = 0 - update_icon() - - if(network_node1) - del(network_node1) - if(network_node2) - del(network_node2) - - build_network() - - return 1 - - proc/normalize_dir() - if(dir==3) - dir = 1 - else if(dir==12) - dir = 4 - - attack_ai(mob/user as mob) - return - - attack_paw(mob/user as mob) - return attack_hand(user) - - attack_hand(mob/user as mob) - src.add_fingerprint(usr) - update_icon(1) - sleep(10) - if (src.open) - src.close() - else - src.open() - - process() - ..() - machines.Remove(src) - - if(open && (!node1 || !node2)) - var/n2dir = (dir & (NORTH|SOUTH)) ? SOUTH : WEST - - if(node1 && !node2) - mingle_dc_with_turf(n2dir, network_node1) // leak 1->2 - else if(!node1 && node2) - mingle_dc_with_turf(turn(n2dir,180), network_node2) // leak 2->1 - // if it's disconnected on both ends, or closed, do nothing - - return - - initialize() - normalize_dir() - - var/node1_dir - var/node2_dir - - for(var/direction in cardinal) - if(direction&initialize_directions) - if (!node1_dir) - node1_dir = direction - else if (!node2_dir) - node2_dir = direction - - for(var/obj/machinery/water/target in get_step(src,node1_dir)) - if(target.initialize_directions & get_dir(target,src)) - node1 = target - break - for(var/obj/machinery/water/target in get_step(src,node2_dir)) - if(target.initialize_directions & get_dir(target,src)) - node2 = target - break -/* - var/connect_directions - switch(dir) - if(NORTH) - connect_directions = NORTH|SOUTH - if(SOUTH) - connect_directions = NORTH|SOUTH - if(EAST) - connect_directions = EAST|WEST - if(WEST) - connect_directions = EAST|WEST - else - connect_directions = dir - - for(var/direction in cardinal) - if(direction&connect_directions) - for(var/obj/machinery/atmospherics/target in get_step(src,direction)) - if(target.initialize_directions & get_dir(target,src)) - connect_directions &= ~direction - node1 = target - break - if(node1) - break - - for(var/direction in cardinal) - if(direction&connect_directions) - for(var/obj/machinery/atmospherics/target in get_step(src,direction)) - if(target.initialize_directions & get_dir(target,src)) - node2 = target - break - if(node1) - break -*/ - build_network() - if(!network_node1 && node1) - network_node1 = new /datum/water/pipe_network() - network_node1.normal_members += src - network_node1.build_network(node1, src) - - if(!network_node2 && node2) - network_node2 = new /datum/water/pipe_network() - network_node2.normal_members += src - network_node2.build_network(node2, src) - - - return_network(obj/machinery/water/reference) - build_network() - - if(reference==node1) - return network_node1 - - if(reference==node2) - return network_node2 - - return null - - reassign_network(datum/water/pipe_network/old_network, datum/water/pipe_network/new_network) - if(network_node1 == old_network) - network_node1 = new_network - if(network_node2 == old_network) - network_node2 = new_network - - return 1 - - return_network_reagents(datum/water/pipe_network/reference) - return null - - disconnect(obj/machinery/water/reference) - if(reference==node1) - del(network_node1) - node1 = null - - else if(reference==node2) - del(network_node2) - node2 = null - - return null - - digital // can be controlled by AI - name = "digital water valve" - desc = "A digitally controlled valve." - icon = 'digital_valve.dmi' - - attack_ai(mob/user as mob) - return src.attack_hand(user) - - attack_hand(mob/user as mob) - if(!src.allowed(user)) - user << "\red Access denied." - return - ..() - - //Radio remote control - - proc - set_frequency(new_frequency) - radio_controller.remove_object(src, frequency) - frequency = new_frequency - if(frequency) - radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) - - var/frequency = 0 - var/id = null - var/datum/radio_frequency/radio_connection - - initialize() - ..() - if(frequency) - set_frequency(frequency) - - receive_signal(datum/signal/signal) - if(!signal.data["tag"] || (signal.data["tag"] != id)) - return 0 - - switch(signal.data["command"]) - if("valve_open") - if(!open) - open() - - if("valve_close") - if(open) - close() - - if("valve_toggle") - if(open) - close() - else - open() - - proc/return_pressure() - return network_node1.return_pressure_transient() - - attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) - return ..() - if (istype(src, /obj/machinery/water/valve/digital)) - user << "\red You cannot unwrench this [src], it's too complicated." - return 1 - var/turf/T = src.loc - if (level==1 && isturf(T) && T.intact) - user << "\red You must remove the plating first." - return 1 - var/datum/gas_mixture/env_air = loc.return_air() - if ((return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." - add_fingerprint(user) - return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." - if (do_after(user, 40)) - user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") - new /obj/item/water_pipe(loc, make_from=src) - del(src) diff --git a/code/modules/water/components/water_glass_connector.dm b/code/modules/water/components/water_glass_connector.dm deleted file mode 100644 index 4388ce27c14..00000000000 --- a/code/modules/water/components/water_glass_connector.dm +++ /dev/null @@ -1,213 +0,0 @@ -/obj/machinery/water/glass_connector - icon = 'water_glass_connector.dmi' - icon_state = "intact" - name = "Beaker Connection" - desc = "For connecting portables devices related to reagents." - - dir = SOUTH - initialize_directions = SOUTH - density = 1 - - var/icon_type = "" - - var/obj/item/weapon/reagent_containers/glass/connected_device - var/obj/machinery/water/node - var/datum/water/pipe_network/network - - New() - initialize_directions = dir - ..() - - update_icon() - if(node) - icon_state = "[node.level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]intact[icon_type]" - dir = get_dir(src, node) - else - icon_state = "exposed[icon_type]" - - overlays = new() - if(connected_device) - overlays += "inserted" - - if(connected_device.reagents.total_volume) - var/obj/effect/overlay = new/obj - overlay.icon = 'water_glass_connector.dmi' - overlay.icon_state = "window" - - var/list/rgbcolor = list(0,0,0) - var/finalcolor - for(var/datum/reagent/re in connected_device.reagents.reagent_list) // natural color mixing bullshit/algorithm - if(!finalcolor) - rgbcolor = GetColors(re.color) - finalcolor = re.color - else - var/newcolor[3] - var/prergbcolor[3] - prergbcolor = rgbcolor - newcolor = GetColors(re.color) - - rgbcolor[1] = (prergbcolor[1]+newcolor[1])/2 - rgbcolor[2] = (prergbcolor[2]+newcolor[2])/2 - rgbcolor[3] = (prergbcolor[3]+newcolor[3])/2 - - finalcolor = rgb(rgbcolor[1], rgbcolor[2], rgbcolor[3]) - // This isn't a perfect color mixing system, the more reagents that are inside, - // the darker it gets until it becomes absolutely pitch black! I dunno, maybe - // that's pretty realistic? I don't do a whole lot of color-mixing anyway. - // If you add brighter colors to it it'll eventually get lighter, though. - - overlay.icon += finalcolor - overlays += overlay - - on_reagent_change(var/mob/user) - update_icon() - - process() - ..() - if(!connected_device) - return - if(network) - network.update = 1 - return 1 - -// Housekeeping and pipe network stuff below - network_expand(datum/water/pipe_network/new_network, obj/machinery/water/pipe/reference) - if(reference == node) - network = new_network - - if(new_network.normal_members.Find(src)) - return 0 - - new_network.normal_members += src - - return null - - Del() - loc = null - - if(connected_device) - connected_device.loc = src.loc - - if(node) - node.disconnect(src) - del(network) - - node = null - - ..() - - initialize() - if(node) return - - var/node_connect = dir - - for(var/obj/machinery/water/target in get_step(src,node_connect)) - if(target.initialize_directions & get_dir(target,src)) - node = target - break - - update_icon() - - build_network() - if(!network && node) - network = new /datum/water/pipe_network() - network.normal_members += src - network.build_network(node, src) - - - return_network(obj/machinery/water/reference) - build_network() - - if(reference==node) - return network - - if(reference==connected_device) - return network - - return null - - reassign_network(datum/water/pipe_network/old_network, datum/water/pipe_network/new_network) - if(network == old_network) - network = new_network - - return 1 - - return_network_reagents(datum/water/pipe_network/reference) - var/list/results = list() - - if(connected_device) - results += connected_device.reagents - - return results - - disconnect(obj/machinery/water/reference) - if(reference==node) - del(network) - node = null - - return null - - proc/update_connection(inserting) - if(inserting) - if(network && !network.reagents.Find(connected_device.reagents)) - network.reagents += connected_device.reagents - connected_device.reagents.my_atom = src - network.update = 1 - else - if(network && network.reagents.Find(connected_device.reagents)) - network.reagents -= connected_device.reagents - connected_device.reagents.my_atom = connected_device - - attack_hand(mob/user as mob) - if (connected_device) - var/obj/item/weapon/reagent_containers/glass/B = connected_device - B.loc = src.loc - update_connection(0) - connected_device = null - update_icon() - else - ..() - - proc/return_pressure() - return network.return_pressure_transient() - - attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/wrench)) - if(connected_device) - user << "\red You cannot unwrench this [src], remove [connected_device] first." - return 1 - var/turf/T = src.loc - if (level==1 && isturf(T) && T.intact) - user << "\red You must remove the plating first." - return 1 - var/datum/gas_mixture/env_air = loc.return_air() - if ((return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." - add_fingerprint(user) - return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." - if (do_after(user, 40)) - user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") - new /obj/item/water_pipe(loc, make_from=src) - del(src) - else if(istype(W, /obj/item/weapon/reagent_containers/glass)) - if(connected_device) - user << "\red You cannot insert this [src], remove [connected_device] first." - return 1 - connected_device = W - update_connection(1) - user.drop_item() - W.loc = src - update_icon() - user << "\blue You add \the [W] to \the [src]." - else - return ..() - -/obj/machinery/water/glass_connector/wall - icon_state = "intact-w" - icon_type = "-w" - density = 0 \ No newline at end of file diff --git a/code/modules/water/components/water_portables_connector.dm b/code/modules/water/components/water_portables_connector.dm deleted file mode 100644 index 79a3f05dce2..00000000000 --- a/code/modules/water/components/water_portables_connector.dm +++ /dev/null @@ -1,151 +0,0 @@ -/obj/machinery/water/portables_connector - icon = 'portables_connector.dmi' - icon_state = "intact" - - name = "Water Connector Port" - desc = "For connecting reagent dispensers, such as water tanks." - - dir = SOUTH - initialize_directions = SOUTH - - var/obj/structure/reagent_dispensers/connected_device - - var/obj/machinery/water/node - - var/datum/water/pipe_network/network - - var/on = 0 - - level = 0 - - - New() - initialize_directions = dir - ..() - - update_icon() - if(node) - icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]intact" - dir = get_dir(src, node) - else - icon_state = "exposed" - - return - - process() - ..() - if(!on) - return - if(!connected_device) - on = 0 - return - if(network) - network.update = 1 - return 1 - -// Housekeeping and pipe network stuff below - network_expand(datum/water/pipe_network/new_network, obj/machinery/water/pipe/reference) - if(reference == node) - network = new_network - - if(new_network.normal_members.Find(src)) - return 0 - - new_network.normal_members += src - - return null - - Del() - loc = null - - if(connected_device) - connected_device.disconnect() - - if(node) - node.disconnect(src) - del(network) - - node = null - - ..() - - initialize() - if(node) return - - var/node_connect = dir - - for(var/obj/machinery/water/target in get_step(src,node_connect)) - if(target.initialize_directions & get_dir(target,src)) - node = target - break - - update_icon() - - build_network() - if(!network && node) - network = new /datum/water/pipe_network() - network.normal_members += src - network.build_network(node, src) - - - return_network(obj/machinery/water/reference) - build_network() - - if(reference==node) - return network - - if(reference==connected_device) - return network - - return null - - reassign_network(datum/water/pipe_network/old_network, datum/water/pipe_network/new_network) - if(network == old_network) - network = new_network - - return 1 - - return_network_reagents(datum/water/pipe_network/reference) - var/list/results = list() - - if(connected_device) - results += connected_device.reagents - - return results - - disconnect(obj/machinery/water/reference) - if(reference==node) - del(network) - node = null - - return null - - proc/return_pressure() - return network.return_pressure_transient() - - attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) - return ..() - if (connected_device) - user << "\red You cannot unwrench this [src], dettach [connected_device] first." - return 1 - if (locate(/obj/structure/reagent_dispensers, src.loc)) - return 1 - var/turf/T = src.loc - if (level==1 && isturf(T) && T.intact) - user << "\red You must remove the plating first." - return 1 - var/datum/gas_mixture/env_air = loc.return_air() - if ((return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." - add_fingerprint(user) - return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." - if (do_after(user, 40)) - user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") - new /obj/item/water_pipe(loc, make_from=src) - del(src) diff --git a/code/modules/water/construction.dm b/code/modules/water/construction.dm deleted file mode 100644 index 62f65e62cfa..00000000000 --- a/code/modules/water/construction.dm +++ /dev/null @@ -1,433 +0,0 @@ -/obj/machinery/pipedispenser/water - name = "Water Pipe Dispenser" - -/obj/machinery/pipedispenser/water/attack_hand(user as mob) - if(..()) - return - - var/dat = {" -Regular pipes:
-Pipe
-Bent Pipe
-Manifold
-Manual Valve
-Devices:
-Beaker Connection
-Portables Connection
-Water Pump
-Water Meter
-Water Filter
-Fixture Connection
-Sprinkler
-"} - - user << browse("[src][dat]", "window=pipedispenser") - return - -/obj/machinery/pipedispenser/water/Topic(href, href_list) - if(..()) - return - if(unwrenched) - usr << browse(null, "window=pipedispenser") - return - usr.machine = src - src.add_fingerprint(usr) - if(href_list["wmake"]) - if(!wait) - var/p_type = text2num(href_list["wmake"]) - var/p_dir = text2num(href_list["dir"]) - var/obj/item/water_pipe/P = new (/*usr.loc*/ src.loc, pipe_type=p_type, dir=p_dir) - P.update() - wait = 1 - spawn(10) - wait = 0 - if(href_list["makemeter"]) - if(!wait) - new /obj/item/water_pipe_meter(/*usr.loc*/ src.loc) - wait = 1 - spawn(15) - wait = 0 - return - -#define PIPE_SIMPLE_STRAIGHT 0 -#define PIPE_SIMPLE_BENT 1 -#define PIPE_GLASS_CONNECTOR 2 -#define PIPE_MANIFOLD 3 -#define PIPE_SPRINKLER 4 -#define PIPE_MVALVE 5 -#define PIPE_PUMP 6 -#define PIPE_FIXTURE 7 -#define PIPE_FILTER 8 -#define PIPE_CONNECTOR 9 - -/obj/item/water_pipe - name = "water pipe" - desc = "A pipe" - var/pipe_type = 0 - //var/pipe_dir = 0 - var/pipename - icon = 'water_pipe_item.dmi' - icon_state = "simple" - item_state = "buildpipe" - flags = TABLEPASS|FPRINT - w_class = 4 - level = 2 - -/obj/item/water_pipe/New(var/loc, var/pipe_type as num, var/dir as num, var/obj/machinery/water/make_from = null) - ..() - if (make_from) - src.dir = make_from.dir - src.pipename = make_from.name - var/is_bent - if (make_from.initialize_directions in list(NORTH|SOUTH, WEST|EAST)) - is_bent = 0 - else - is_bent = 1 - - if(istype(make_from, /obj/machinery/water/pipe/simple)) - src.pipe_type = PIPE_SIMPLE_STRAIGHT + is_bent - else if(istype(make_from, /obj/machinery/water/glass_connector)) - src.pipe_type = PIPE_GLASS_CONNECTOR - else if(istype(make_from, /obj/machinery/water/portables_connector)) - src.pipe_type = PIPE_CONNECTOR - else if(istype(make_from, /obj/machinery/water/pipe/manifold)) - src.pipe_type = PIPE_MANIFOLD - else if(istype(make_from, /obj/machinery/water/unary/sprinkler)) - src.pipe_type = PIPE_SPRINKLER - else if(istype(make_from, /obj/machinery/water/valve)) - src.pipe_type = PIPE_MVALVE - else if(istype(make_from, /obj/machinery/water/binary/pump)) - src.pipe_type = PIPE_PUMP - else if(istype(make_from, /obj/machinery/water/binary/fixture)) - src.pipe_type = PIPE_FIXTURE - else if(istype(make_from, /obj/machinery/water/trinary/filter)) - src.pipe_type = PIPE_FILTER - else - src.pipe_type = pipe_type - src.dir = dir - //src.pipe_dir = get_pipe_dir() - update() - src.pixel_x = rand(-5, 5) - src.pixel_y = rand(-5, 5) - -//update the name and icon of the pipe item depending on the type - -/obj/item/water_pipe/proc/update() - var/list/nlist = list( \ - "pipe", \ - "bent pipe", \ - "glass connector", \ - "manifold", \ - "sprinkler", \ - "mvalve", \ - "pump", \ - "fixture connection", \ - "liquid filter", \ - "connector", \ - ) - name = nlist[pipe_type+1] + " fitting" - var/list/islist = list( \ - "simple", \ - "simple", \ - "gconnector", \ - "manifold", \ - "sprinkler", \ - "mvalve", \ - "pump", \ - "fixture", \ - "filter", \ - "connector", \ - ) - icon_state = islist[pipe_type + 1] - -//called when a turf is attacked with a pipe item -// place the pipe on the turf, setting pipe level to 1 (underfloor) if the turf is not intact - -// rotate the pipe item clockwise - -/obj/item/water_pipe/verb/rotate() - set category = "Object" - set name = "Rotate Pipe" - set src in view(1) - - if ( usr.stat || usr.restrained() ) - return - - src.dir = turn(src.dir, -90) - - if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_MVALVE)) - if(dir==2) - dir = 1 - else if(dir==8) - dir = 4 - //src.pipe_dir = get_pipe_dir() - return - -/obj/item/water_pipe/Move() - ..() - if ((pipe_type in list (PIPE_SIMPLE_BENT)) \ - && (src.dir in cardinal)) - src.dir = src.dir|turn(src.dir, 90) - else if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_MVALVE)) - if(dir==2) - dir = 1 - else if(dir==8) - dir = 4 - return - -// returns all pipe's endpoints - -/obj/item/water_pipe/proc/get_pipe_dir() - if (!dir) - return 0 - var/flip = turn(dir, 180) - var/cw = turn(dir, -90) - var/acw = turn(dir, 90) - - switch(pipe_type) - if( PIPE_SIMPLE_STRAIGHT, \ - PIPE_PUMP ,\ - PIPE_MVALVE, \ - PIPE_FIXTURE \ - ) - return dir|flip - if(PIPE_SIMPLE_BENT) - return dir //dir|acw - if(PIPE_GLASS_CONNECTOR, PIPE_CONNECTOR, PIPE_SPRINKLER) - return dir - if(PIPE_MANIFOLD) - return flip|cw|acw - if(PIPE_FILTER) - return dir|flip|cw - return 0 - -/obj/item/water_pipe/proc/get_pdir() //endpoints for regular pipes - return get_pipe_dir() - -/obj/item/water_pipe/attack_self(mob/user as mob) - return rotate() - -/obj/item/water_pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - ..() - //* - if (!istype(W, /obj/item/weapon/wrench)) - return ..() - if (!isturf(src.loc)) - return 1 - if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_MVALVE)) - if(dir==2) - dir = 1 - else if(dir==8) - dir = 4 - var/pipe_dir = get_pipe_dir() - - for(var/obj/machinery/water/M in src.loc) - if(M.initialize_directions & pipe_dir) // matches at least one direction on either type of pipe - user << "\red There is already a pipe at that location." - return 1 - // no conflicts found - - var/pipefailtext = "\red There's nothing to connect this pipe section to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)" - - switch(pipe_type) - if(PIPE_SIMPLE_STRAIGHT, PIPE_SIMPLE_BENT) - var/obj/machinery/water/pipe/simple/P = new( src.loc ) - P.dir = src.dir - P.initialize_directions = pipe_dir - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - if (!P) - usr << pipefailtext - return 1 - P.build_network() - if (P.node1) - P.node1.initialize() - P.node1.build_network() - if (P.node2) - P.node2.initialize() - P.node2.build_network() - - if(PIPE_GLASS_CONNECTOR) // glass connector - var/obj/machinery/water/glass_connector/C = new( src.loc ) - C.dir = dir - C.initialize_directions = pipe_dir - if (pipename) - C.name = pipename - C.initialize() - C.build_network() - if (C.node) - C.node.initialize() - C.node.build_network() - - if(PIPE_CONNECTOR) // portables connector - var/obj/machinery/water/portables_connector/C = new( src.loc ) - C.dir = dir - C.initialize_directions = pipe_dir - if (pipename) - C.name = pipename - var/turf/T = C.loc - C.level = T.intact ? 2 : 1 - C.initialize() - C.build_network() - if (C.node) - C.node.initialize() - C.node.build_network() - - - if(PIPE_MANIFOLD) //manifold - var/obj/machinery/water/pipe/manifold/M = new( src.loc ) - M.dir = dir - M.initialize_directions = pipe_dir - //M.New() - var/turf/T = M.loc - M.level = T.intact ? 2 : 1 - M.initialize() - if (!M) - usr << "There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)" - return 1 - M.build_network() - if (M.node1) - M.node1.initialize() - M.node1.build_network() - if (M.node2) - M.node2.initialize() - M.node2.build_network() - if (M.node3) - M.node3.initialize() - M.node3.build_network() - - if(PIPE_SPRINKLER) //sprinkler - var/obj/machinery/water/unary/sprinkler/V = new( src.loc ) - V.dir = dir - V.initialize_directions = pipe_dir - if (pipename) - V.name = pipename - var/turf/T = V.loc - V.level = T.intact ? 2 : 1 - V.initialize() - V.build_network() - if (V.node) - V.node.initialize() - V.node.build_network() - - if(PIPE_FIXTURE) //fixture connection - var/obj/machinery/water/binary/fixture/V = new( src.loc ) - V.dir = dir - V.initialize_directions = pipe_dir - if (pipename) - V.name = pipename - var/turf/T = V.loc - V.level = T.intact ? 2 : 1 - V.initialize() - V.build_network() - if (V.node1) - V.node1.initialize() - V.node1.build_network() - if (V.node2) - V.node2.initialize() - V.node2.build_network() - - - if(PIPE_MVALVE) //manual valve - var/obj/machinery/water/valve/V = new( src.loc) - V.dir = dir - V.initialize_directions = pipe_dir - if (pipename) - V.name = pipename - var/turf/T = V.loc - V.level = T.intact ? 2 : 1 - V.initialize() - V.build_network() - if (V.node1) -// world << "[V.node1.name] is connected to valve, forcing it to update its nodes." - V.node1.initialize() - V.node1.build_network() - if (V.node2) -// world << "[V.node2.name] is connected to valve, forcing it to update its nodes." - V.node2.initialize() - V.node2.build_network() - - if(PIPE_PUMP) //gas pump - var/obj/machinery/water/binary/pump/P = new(src.loc) - P.dir = dir - P.initialize_directions = pipe_dir - if (pipename) - P.name = pipename - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - P.build_network() - if (P.node1) - P.node1.initialize() - P.node1.build_network() - if (P.node2) - P.node2.initialize() - P.node2.build_network() - - if(PIPE_FILTER) //liquid filter - var/obj/machinery/water/trinary/filter/P = new(src.loc) - P.dir = dir - P.initialize_directions = pipe_dir - if (pipename) - P.name = pipename - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - P.build_network() - if (P.node1) - P.node1.initialize() - P.node1.build_network() - if (P.node2) - P.node2.initialize() - P.node2.build_network() - if (P.node3) - P.node3.initialize() - P.node3.build_network() - - playsound(src.loc, 'Ratchet.ogg', 50, 1) - user.visible_message( \ - "[user] fastens the [src].", \ - "\blue You have fastened the [src].", \ - "You hear ratchet.") - del(src) // remove the pipe item - - return - //TODO: DEFERRED - -// ensure that setterm() is called for a newly connected pipeline - - - -/obj/item/water_pipe_meter - name = "water meter" - desc = "A meter that can be laid on water pipes" - icon = 'water_pipe_item.dmi' - icon_state = "meter" - item_state = "buildpipe" - flags = TABLEPASS|FPRINT - w_class = 4 - -/obj/item/water_pipe_meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - ..() - - if (!istype(W, /obj/item/weapon/wrench)) - return ..() - if(!locate(/obj/machinery/water/pipe, src.loc)) - user << "\red You need to fasten it to a pipe" - return 1 - new/obj/machinery/water_meter( src.loc ) - playsound(src.loc, 'Ratchet.ogg', 50, 1) - user << "\blue You have fastened the meter to the pipe" - del(src) - -#undef PIPE_SIMPLE_STRAIGHT -#undef PIPE_SIMPLE_BENT -#undef PIPE_GLASS_CONNECTOR -#undef PIPE_MANIFOLD -#undef PIPE_SPRINKLER -#undef PIPE_MVALVE -#undef PIPE_PUMP -#undef PIPE_FIXTURE -#undef PIPE_FILTER -#undef PIPE_CONNECTOR \ No newline at end of file diff --git a/code/modules/water/water.dm b/code/modules/water/water.dm deleted file mode 100644 index e53be207bcf..00000000000 --- a/code/modules/water/water.dm +++ /dev/null @@ -1,69 +0,0 @@ -/* -You'll notice this is the atmospherics system, -but with reagents instead gas mixtures. - -Quick overview: - -Pipes combine to form pipelines -Pipelines and other water objects combine to form pipe_networks - Note: A single pipe_network represents a completely open space - -Pipes -> Pipelines -Pipelines + Other Objects -> Pipe network - -*/ - -obj/machinery/water - anchored = 1 - use_power = 0 - idle_power_usage = 0 - active_power_usage = 0 - power_channel = ENVIRON - var/nodealert = 0 - - - - var/initialize_directions = 0 - var/color - - process() - build_network() - ..() - - proc - network_expand(datum/water/pipe_network/new_network, obj/machinery/water/pipe/reference) - // Check to see if should be added to network. Add self if so and adjust variables appropriately. - // Note don't forget to have neighbors look as well! - - return null - - build_network() - // Called to build a network from this node - - return null - - return_network(obj/machinery/water/reference) - // Returns pipe_network associated with connection to reference - // Notes: should create network if necessary - // Should never return null - - return null - - reassign_network(datum/water/pipe_network/old_network, datum/water/pipe_network/new_network) - // Used when two pipe_networks are combining - - return_network_reagents(datum/water/pipe_network/reference) - // Return a list of reagents(s) in the object - // associated with reference pipe_network for use in rebuilding the networks gases list - // Is permitted to return null - - disconnect(obj/machinery/water/reference) - - mingle_dc_with_turf(D, datum/water/pipe_network/net) - // 250 being a pipe opening volume - mingle_outflow_with_turf(get_turf(src), \ - net.reagents_transient.total_volume / net.reagents_transient.maximum_volume * 250, \ - D, network = net) - - update_icon() - return null \ No newline at end of file diff --git a/code/modules/water/water_meter.dm b/code/modules/water/water_meter.dm deleted file mode 100644 index f9ddba4817f..00000000000 --- a/code/modules/water/water_meter.dm +++ /dev/null @@ -1,121 +0,0 @@ -/obj/machinery/water_meter - name = "water meter" - desc = "It measures water flow." - icon = 'meter.dmi' - icon_state = "meterX" - var/obj/machinery/water/pipe/target = null - anchored = 1.0 - var/frequency = 0 - var/id - use_power = 1 - idle_power_usage = 2 - active_power_usage = 4 - -/obj/machinery/water_meter/New() - ..() - - target = locate(/obj/machinery/water/pipe) in loc - return 1 - -/obj/machinery/water_meter/initialize() - if (!target) - target = locate(/obj/machinery/water/pipe) in loc - -/obj/machinery/water_meter/process() - if(!target) - icon_state = "meterX" - return 0 - - if(stat & (BROKEN|NOPOWER)) - icon_state = "meter0" - return 0 - - use_power(5) - - if(!target || !target.parent) - icon_state = "meterX" - return 0 - - var/datum/water/pipeline/pl = target.parent - var/pressure = pl.return_pressure() / target.max_pressure * 60*ONE_ATMOSPHERE - if(pressure <= 0.15*ONE_ATMOSPHERE) - icon_state = "meter0" - else if(pressure <= 1.8*ONE_ATMOSPHERE) - var/val = round(pressure/(ONE_ATMOSPHERE*0.3) + 0.5) - icon_state = "meter1_[val]" - else if(pressure <= 30*ONE_ATMOSPHERE) - var/val = round(pressure/(ONE_ATMOSPHERE*5)-0.35) + 1 - icon_state = "meter2_[val]" - else if(pressure <= 59*ONE_ATMOSPHERE) - var/val = round(pressure/(ONE_ATMOSPHERE*5) - 6) + 1 - icon_state = "meter3_[val]" - else - icon_state = "meter4" - - if(frequency) - var/datum/radio_frequency/radio_connection = radio_controller.return_frequency(frequency) - - if(!radio_connection) return - - var/datum/signal/signal = new - signal.source = src - signal.transmission_method = 1 - signal.data = list( - "tag" = id, - "device" = "AM", - "pressure" = round(pl.return_pressure()), - "sigtype" = "status" - ) - radio_connection.post_signal(src, signal) - -/obj/machinery/water_meter/examine() - set src in view(3) - - var/t = "A gas flow meter. " - if (target) - if(target.parent) - var/datum/water/pipeline/pl = target.parent - var/pressure = pl.return_pressure() - t += "The pressure gauge reads [round(pressure, 0.01)] kPa" - else - t += "The sensor error light is blinking." - else - t += "The connect error light is blinking." - - usr << t - - - -/obj/machinery/water_meter/attack_hand(mob/user as mob) - if(stat & (NOPOWER|BROKEN)) - return 1 - - var/t = null - if (get_dist(usr, src) <= 3 || istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/dead)) - if (target) - if(target.parent) - var/datum/water/pipeline/pl = target.parent - var/pressure = pl.return_pressure() - t = "Pressure: [round(pressure, 0.01)] kPa" - else - t = "\red Results: Sensor Error!" - else - t = "\red Results: Connection Error!" - else - usr << "\blue You are too far away." - - usr << t - return 1 - -/obj/machinery/water_meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) - return ..() - playsound(src.loc, 'Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." - if (do_after(user, 40)) - user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") - new /obj/item/water_pipe_meter(src.loc) - del(src) \ No newline at end of file diff --git a/code/modules/water/water_pipe_network.dm b/code/modules/water/water_pipe_network.dm deleted file mode 100644 index 20239330fcd..00000000000 --- a/code/modules/water/water_pipe_network.dm +++ /dev/null @@ -1,225 +0,0 @@ -var/global/list/datum/water/pipe_network/water_pipe_networks = list() - -/datum/water/pipe_network - var/list/datum/reagents/reagents = list() //All of the gas_mixtures continuously connected in this network - - var/list/obj/machinery/water/normal_members = list() - var/list/datum/water/pipeline/line_members = list() - //membership roster to go through for updates and what not - - var/update = 1 - var/datum/reagents/reagents_transient = null - var/max_pressure_transient = 3*ONE_ATMOSPHERE - - New() - reagents_transient = new() - - ..() - - proc/process() - //Equalize gases amongst pipe if called for - if(update) - update = 0 - reconcile_reagents() - - // release pipe leaks - var/dirs - for(var/datum/water/pipeline/P in line_members) - for(var/obj/machinery/water/pipe/E in P.edges) - dirs = E.initialize_directions - for(var/C in E.pipeline_expansion()) - if(C) // a connection, remove dir from possibilities - dirs &= ~(get_dir(E, C)) - if(dirs > 0) // there was a disconnect, release half of volume - P.mingle_with_turf(get_turf(E), \ - P.reagents.total_volume / P.reagents.maximum_volume * E.max_volume / 2, \ - dirs) - - proc/build_network(obj/machinery/water/start_normal, obj/machinery/water/reference) - //Purpose: Generate membership roster - //Notes: Assuming that members will add themselves to appropriate roster in network_expand() - - if(!start_normal) - del(src) - - start_normal.network_expand(src, reference) - - update_network_reagents() - - if((normal_members.len>0)||(line_members.len>0)) - water_pipe_networks += src - else - del(src) - - proc/merge(datum/water/pipe_network/giver) - if(giver==src) return 0 - - normal_members -= giver.normal_members - normal_members += giver.normal_members - - line_members -= giver.line_members - line_members += giver.line_members - - for(var/obj/machinery/water/normal_member in giver.normal_members) - normal_member.reassign_network(giver, src) - - for(var/datum/water/pipeline/line_member in giver.line_members) - line_member.network = src - - del(giver) - - update_network_reagents() - return 1 - - proc/update_network_reagents() - //Go through membership roster and make sure reagents is up to date - - reagents = list() - - for(var/obj/machinery/water/normal_member in normal_members) - var/result = normal_member.return_network_reagents(src) - if(result) reagents += result - - for(var/datum/water/pipeline/line_member in line_members) - reagents += line_member.reagents - - proc/reconcile_reagents() - //Perfectly equalize all reagent members instantly - - reagents_transient = new(0) - reagents_transient.my_atom = new/obj() - - // it's more efficient to avoid .add_reagent, etc more then once per reagent type - for(var/datum/reagents/R in reagents) - // add in each reagents - reagents_transient.maximum_volume += R.maximum_volume - - for (var/datum/reagent/re in R.reagent_list) - var/datum/reagent/rr = reagents_transient.has_reagent(re.id) - if(!rr) - reagents_transient.add_reagent(re.id, re.volume, re.data) - else - rr.volume += re.volume - reagents_transient.update_total() - - if(reagents_transient.total_volume > 0) - update = 1 - - //Update individual reagents by volume ratio - for(var/datum/reagents/R in reagents) - for(var/datum/reagent/re in reagents_transient.reagent_list) - var/datum/reagent/rr = R.has_reagent(re.id) - if(!rr) - R.add_reagent(re.id, re.volume \ - * R.maximum_volume \ - / reagents_transient.maximum_volume, re.data) - else - rr.volume = re.volume \ - * R.maximum_volume \ - / reagents_transient.maximum_volume - R.update_total() - return 1 - - proc/return_pressure_transient() - return reagents_transient.total_volume / reagents_transient.maximum_volume * max_pressure_transient - - - -proc/mingle_outflow_with_turf(turf/simulated/target, mingle_volume, dir = 0, datum/water/pipeline/pipeline = null, datum/water/pipe_network/network = null, datum/reagents/reagents = null, pressure = 0) - if(pipeline) - network = pipeline.network - if(!reagents) - reagents = pipeline.reagents - if(!pressure) - pressure = pipeline.return_pressure() - else - if(!reagents) - reagents = network.reagents_transient - if(!pressure) - pressure = network.return_pressure_transient() - - mingle_volume = min(mingle_volume, reagents.total_volume) - var/num_spots = round(pressure / 10) - - if(mingle_volume < num_spots) - return - - var/datum/reagents/mingle = new(mingle_volume) - mingle.my_atom = target - reagents.trans_to(mingle, mingle_volume) - - var/turf/T1 - var/turf/T2 - if(dir == 0) - T1 = get_step(target, NORTH) - T1 = get_step(T1, EAST) - - T2 = get_step(target, SOUTH) - T2 = get_step(T2, WEST) - else - T1 = get_step(target, turn(dir, -90)) - T1 = get_step(T1, dir) - - T2 = get_step(target, turn(dir, 90)) - for(var/i = 1 to 5) - T2 = get_step(T2, dir) - - var/box = block(T1, T2) - - for(var/i = 1 to num_spots) - spawn(0) - var/obj/effect/effect/water/W = new /obj/effect/effect/water(get_turf(target)) - var/turf/my_target = pick(box) - var/datum/reagents/R = new(mingle_volume/num_spots) - if(!W) return - W.reagents = R - R.my_atom = W - if(!W || !src) return - mingle.trans_to(W,mingle_volume/num_spots) - for(var/b=0, b<5, b++) - step_towards(W,my_target) - if(!W) return - W.reagents.reaction(get_turf(W)) - for(var/atom/atm in get_turf(W)) - if(!W) return - W.reagents.reaction(atm) - if(W.loc == my_target) break - - if(network) - network.update = 1 - -proc/equalize_reagents(var/list/datum/reagents/reagents) - //Perfectly equalize all reagent members instantly - - //Calculate totals from individual components - var/datum/reagents/reagents_transient = new(0) - reagents_transient.my_atom = new/obj() - - // it's more efficient to avoid .add_reagent, etc more then once per reagent type - for(var/datum/reagents/R in reagents) - // add in each reagents - reagents_transient.maximum_volume += R.maximum_volume - - for (var/datum/reagent/re in R.reagent_list) - var/datum/reagent/rr = reagents_transient.has_reagent(re.id) - if(!rr) - reagents_transient.add_reagent(re.id, re.volume, re.data) - else - rr.volume += re.volume - reagents_transient.update_total() - - if(reagents_transient.total_volume > 0) - //Update individual reagents by volume ratio - for(var/datum/reagents/R in reagents) - for(var/datum/reagent/re in reagents_transient.reagent_list) - var/datum/reagent/rr = R.has_reagent(re.id) - if(!rr) - R.add_reagent(re.id, re.volume \ - * R.maximum_volume \ - / reagents_transient.maximum_volume, re.data) - else - rr.volume = re.volume \ - * R.maximum_volume \ - / reagents_transient.maximum_volume - R.update_total() - return 1 diff --git a/code/modules/water/water_pipeline.dm b/code/modules/water/water_pipeline.dm deleted file mode 100644 index c0e6fbf8364..00000000000 --- a/code/modules/water/water_pipeline.dm +++ /dev/null @@ -1,127 +0,0 @@ -datum/water/pipeline - var/datum/reagents/reagents - var/max_pressure - - var/list/obj/machinery/water/pipe/members - var/list/obj/machinery/water/pipe/edges //Used for building networks - - var/datum/water/pipe_network/network - - var/alert_pressure = 0 - - Del() - if(network) - del(network) - - if(reagents && reagents.total_volume) - temporarily_store_reagents() - del(reagents) - - ..() - - proc/process()//This use to be called called from the pipe networks - //Check to see if pressure is within acceptable limits - var/pressure = return_pressure() - if(pressure > alert_pressure) - for(var/obj/machinery/water/pipe/member in members) - if(!member.check_pressure(pressure)) - break //Only delete 1 pipe per process - - //Allow for reactions - //air.react() //Should be handled by pipe_network now - - proc/temporarily_store_reagents() - //Update individual gas_mixtures by volume ratio - - for(var/obj/machinery/water/pipe/member in members) - member.reagents_temporary = new(member.max_volume) - member.reagents_temporary.my_atom = member - - for(var/datum/reagent/re in reagents.reagent_list) - re.volume = \ - reagents.get_reagent_amount(re.id) \ - * member.max_volume \ - / reagents.maximum_volume - - proc/build_pipeline(obj/machinery/water/pipe/base) - var/list/possible_expansions = list(base) - members = list(base) - edges = list() - - var/volume = base.max_volume - base.parent = src - alert_pressure = base.alert_pressure - - if(base.reagents_temporary) - reagents = base.reagents_temporary - base.reagents_temporary = null - else - reagents = new(base.max_volume) - reagents.my_atom = base - max_pressure = base.max_pressure - var/PT = 1 - - while(possible_expansions.len>0) - for(var/obj/machinery/water/pipe/borderline in possible_expansions) - - var/list/result = borderline.pipeline_expansion() - var/edge_check = result.len - - if(result.len>0) - for(var/obj/machinery/water/pipe/item in result) - if(!members.Find(item)) - members += item - possible_expansions += item - - volume += item.max_volume - max_pressure += item.max_pressure - PT++ - item.parent = src - - alert_pressure = min(alert_pressure, item.alert_pressure) - - if(item.reagents_temporary) - item.reagents_temporary.copy_to(reagents, item.reagents_temporary.total_volume) - - edge_check-- - - if(edge_check>0) - edges += borderline - - possible_expansions -= borderline - - reagents.maximum_volume = volume - max_pressure /= PT - - proc/network_expand(datum/water/pipe_network/new_network, obj/machinery/water/pipe/reference) - - if(new_network.line_members.Find(src)) - return 0 - - new_network.line_members += src - - network = new_network - - for(var/obj/machinery/water/pipe/edge in edges) - for(var/obj/machinery/water/result in edge.pipeline_expansion()) - if(!istype(result,/obj/machinery/water/pipe) && (result!=reference)) - result.network_expand(new_network, edge) - - return 1 - - proc/return_network(obj/machinery/water/reference) - if(!network) - network = new /datum/water/pipe_network() - network.build_network(src, null) - //technically passing these parameters should not be allowed - //however pipe_network.build_network(..) and pipeline.network_extend(...) - // were setup to properly handle this case - - return network - - proc/return_pressure() - return reagents.total_volume / reagents.maximum_volume * max_pressure - - proc/mingle_with_turf(turf/simulated/target, mingle_volume, dir = 0) - // dump all of section's volume - mingle_outflow_with_turf(target, mingle_volume, dir, pipeline=src) \ No newline at end of file diff --git a/code/modules/water/water_pipes.dm b/code/modules/water/water_pipes.dm deleted file mode 100644 index b252fa07724..00000000000 --- a/code/modules/water/water_pipes.dm +++ /dev/null @@ -1,961 +0,0 @@ -obj/machinery/water/pipe - var/datum/reagents/reagents_temporary //used when reconstructing a pipeline that broke - var/datum/water/pipeline/parent - - var/max_volume = 0 - var/max_pressure = 3 * ONE_ATMOSPHERE - var/force = 20 - - layer = 2.3 //under water pipes with their 2.4 - - var/alert_pressure = 2.5*ONE_ATMOSPHERE - //minimum pressure before check_pressure(...) should be called - - New() - ..() - - proc/pipeline_expansion() - return null - - proc/check_pressure(pressure) - //Return 1 if parent should continue checking other pipes - //Return null if parent should stop checking other pipes. Recall: del(src) will by default return null - - return 1 - - proc/return_reagents() - if(!parent) - parent = new /datum/water/pipeline() - parent.build_pipeline(src) - - return parent.reagents - - build_network() - if(!parent) - parent = new /datum/water/pipeline() - parent.build_pipeline(src) - - return parent.return_network() - - network_expand(datum/water/pipe_network/new_network, obj/machinery/water/pipe/reference) - if(!parent) - parent = new /datum/water/pipeline() - parent.build_pipeline(src) - - return parent.network_expand(new_network, reference) - - return_network(obj/machinery/water/reference) - if(!parent) - parent = new /datum/water/pipeline() - parent.build_pipeline(src) - - return parent.return_network(reference) - - Del() - var/turf/simulated/target = get_turf(loc) - if(istype(target) && parent) - parent.mingle_with_turf(target, \ - parent.reagents.total_volume / parent.reagents.maximum_volume * max_volume) - del(parent) - ..() - - simple - icon = 'pipes.dmi' - icon_state = "intact-f" - - name = "pipe" - desc = "A one meter section of regular pipe" - - max_volume = 500 - - dir = SOUTH - initialize_directions = SOUTH|NORTH - - var/obj/machinery/water/node1 - var/obj/machinery/water/node2 - - var/burst_pressure = 2.8*ONE_ATMOSPHERE - var/fatigue_pressure = 2.5*ONE_ATMOSPHERE - - - level = 1 - - New() - ..() - switch(dir) - if(SOUTH || NORTH) - initialize_directions = SOUTH|NORTH - if(EAST || WEST) - initialize_directions = EAST|WEST - if(NORTHEAST) - initialize_directions = NORTH|EAST - if(NORTHWEST) - initialize_directions = NORTH|WEST - if(SOUTHEAST) - initialize_directions = SOUTH|EAST - if(SOUTHWEST) - initialize_directions = SOUTH|WEST - - hide(var/i) - if(level == 1 && istype(loc, /turf/simulated)) - invisibility = i ? 101 : 0 - update_icon() - - process() - if(!parent) //This should cut back on the overhead calling build_network thousands of times per cycle - ..() - else - machines.Remove(src) - - /*if(!node1) - parent.mingle_with_turf(loc, volume) - if(!nodealert) - //world << "Missing node from [src] at [src.x],[src.y],[src.z]" - nodealert = 1 - - else if(!node2) - parent.mingle_with_turf(loc, volume) - if(!nodealert) - //world << "Missing node from [src] at [src.x],[src.y],[src.z]" - nodealert = 1 - else if (nodealert) - nodealert = 0 - - - else if(parent) - var/environment_temperature = 0 - - if(istype(loc, /turf/simulated/)) - if(loc:blocks_air) - environment_temperature = loc:temperature - else - var/datum/gas_mixture/environment = loc.return_air() - environment_temperature = environment.temperature - - else - environment_temperature = loc:temperature - - var/datum/gas_mixture/pipe_air = return_air() - - if(abs(environment_temperature-pipe_air.temperature) > minimum_temperature_difference) - parent.temperature_interact(loc, volume, thermal_conductivity) - */ //Screw you heat lag - - check_pressure(pressure) - var/datum/gas_mixture/environment = loc.return_air() - - var/pressure_difference = pressure - environment.return_pressure() - - if(pressure_difference > burst_pressure) - burst() - - else if(pressure_difference > fatigue_pressure) - //TODO: leak to turf, doing pfshhhhh - if(prob(5)) - burst() - - else return 1 - - proc/burst() - src.visible_message("\red \bold [src] bursts!"); - playsound(src.loc, 'bang.ogg', 25, 1) - - var/obj/effect/effect/water/W = new(get_turf(src)) - W.reagents = reagents - W.reagents.my_atom = W - if(!W) return - W.reagents.reaction(get_turf(W)) - for(var/atom/atm in get_turf(W)) - if(!W) return - W.reagents.reaction(atm) - sleep(1) - - del(src) - - proc/normalize_dir() - if(dir==3) - dir = 1 - else if(dir==12) - dir = 4 - - Del() - if(node1) - node1.disconnect(src) - if(node2) - node2.disconnect(src) - - ..() - - pipeline_expansion() - return list(node1, node2) - - update_icon() - if(node1&&node2) - var/C = "" - switch(color) - if ("red") C = "-r" - if ("blue") C = "-b" - if ("cyan") C = "-c" - if ("green") C = "-g" - if ("yellow") C = "-y" - if ("purple") C = "-p" - icon_state = "intact[C][invisibility ? "-f" : "" ]" - - //var/node1_direction = get_dir(src, node1) - //var/node2_direction = get_dir(src, node2) - - //dir = node1_direction|node2_direction - - else - if(!node1&&!node2) - del(src) //TODO: silent deleting looks weird - var/have_node1 = node1?1:0 - var/have_node2 = node2?1:0 - icon_state = "exposed[have_node1][have_node2][invisibility ? "-f" : "" ]" - - - initialize() - normalize_dir() - var/node1_dir - var/node2_dir - - for(var/direction in cardinal) - if(direction&initialize_directions) - if (!node1_dir) - node1_dir = direction - else if (!node2_dir) - node2_dir = direction - - for(var/obj/machinery/water/target in get_step(src,node1_dir)) - if(target.initialize_directions & get_dir(target,src)) - node1 = target - break - for(var/obj/machinery/water/target in get_step(src,node2_dir)) - if(target.initialize_directions & get_dir(target,src)) - node2 = target - break - - - var/turf/T = src.loc // hide if turf is not intact - hide(T.intact) - update_icon() - //update_icon() - - disconnect(obj/machinery/water/reference) - if(reference == node1) - if(istype(node1, /obj/machinery/water/pipe)) - del(parent) - node1 = null - - if(reference == node2) - if(istype(node2, /obj/machinery/water/pipe)) - del(parent) - node2 = null - - update_icon() - - return null - - simple/drainage - name="Drainage pipe" - color="yellow" - icon_state = "" - - simple/drainage_waste - name="Drainage waste pipe" - color="green" - icon_state = "" - - simple/supply - name="Water supply pipe" - color="cyan" - icon_state = "" - - New() - ..() - reagents_temporary = new(max_volume) - reagents_temporary.my_atom = src - reagents_temporary.add_reagent("water", max_volume / 3) - - simple/general - name="Water pipe" - color="" - icon_state = "" - - simple/drainage/visible - level = 2 - icon_state = "intact-y" - - simple/drainage/hidden - level = 1 - icon_state = "intact-y-f" - - simple/drainage_waste/visible - level = 2 - icon_state = "intact-g" - - simple/drainage_waste/hidden - level = 1 - icon_state = "intact-g-f" - - simple/supply/visible - level = 2 - icon_state = "intact-c" - - simple/supply/hidden - level = 1 - icon_state = "intact-c-f" - - simple/general/visible - level = 2 - icon_state = "intact" - - simple/general/hidden - level = 1 - icon_state = "intact-f" - - tank - icon = 'pipe_tank.dmi' - icon_state = "intact" - - name = "Pressure Tank" - desc = "A large vessel containing pressurized liquid." - - max_volume = 23000 - max_pressure = 4*ONE_ATMOSPHERE - - dir = SOUTH - initialize_directions = SOUTH - density = 1 - - var/obj/machinery/water/node1 - - New() - initialize_directions = dir - reagents_temporary = new(max_volume) - reagents_temporary.my_atom = src - ..() - - process() - if(!parent) - ..() - else - machines.Remove(src) -/* if(!node1) - parent.mingle_with_turf(loc, 200) - if(!nodealert) - //world << "Missing node from [src] at [src.x],[src.y],[src.z]" - nodealert = 1 - else if (nodealert) - nodealert = 0 -*/ - - water - name = "Pressure Tank (Water)" - icon = 'blue_water_tank.dmi' - - New() - ..() - reagents_temporary.add_reagent("water", max_volume * 0.95) - - sugar_water - name = "Pressure Tank (Sugar Water)" - - New() - ..() - reagents_temporary.add_reagent("water", max_volume * 0.475) - reagents_temporary.add_reagent("sugar", max_volume * 0.475) - - blue_paint - name = "Pressure Tank (Blue Paint)" - icon = 'blue_pipe_tank.dmi' - - New() - ..() - reagents_temporary.add_reagent("paint_blue", max_volume * 0.95) - - Del() - if(node1) - node1.disconnect(src) - - ..() - - pipeline_expansion() - return list(node1) - - update_icon() - if(node1) - icon_state = "intact" - - dir = get_dir(src, node1) - - else - icon_state = "exposed" - - initialize() - - var/connect_direction = dir - - for(var/obj/machinery/water/target in get_step(src,connect_direction)) - if(target.initialize_directions & get_dir(target,src)) - node1 = target - break - - update_icon() - - disconnect(obj/machinery/water/reference) - if(reference == node1) - if(istype(node1, /obj/machinery/water/pipe)) - del(parent) - node1 = null - - update_icon() - - return null - -/* currently pointless because reagents can't just sit on a turf (currently) - drain - icon = 'pipe_vent.dmi' - icon_state = "intact" - - name = "Drain" - desc = "A large drain" - - level = 1 - - max_volume = 200 - - dir = SOUTH - initialize_directions = SOUTH - - var/build_killswitch = 1 - - var/obj/machinery/water/node1 - New() - initialize_directions = dir - ..() - - process() - if(!parent) - if(build_killswitch <= 0) - machines.Remove(src) - else - build_killswitch-- - ..() - return - else - var/pressure = parent.return_pressure() - var/datum/gas_mixture/env_air = loc.return_air() - - if(env_air.return_pressure() > pressure) - parent.mingle_with_turf(loc, 200) -/* - if(!node1) - if(!nodealert) - //world << "Missing node from [src] at [src.x],[src.y],[src.z]" - nodealert = 1 - else if (nodealert) - nodealert = 0 -*/ - Del() - if(node1) - node1.disconnect(src) - - ..() - - pipeline_expansion() - return list(node1) - - update_icon() - if(node1) - icon_state = "intact" - - dir = get_dir(src, node1) - - else - icon_state = "exposed" - - initialize() - var/connect_direction = dir - - for(var/obj/machinery/water/target in get_step(src,connect_direction)) - if(target.initialize_directions & get_dir(target,src)) - node1 = target - break - - update_icon() - - disconnect(obj/machinery/water/reference) - if(reference == node1) - if(istype(node1, /obj/machinery/water/pipe)) - del(parent) - node1 = null - - update_icon() - - return null - - hide(var/i) //to make the little pipe section invisible, the icon changes. - if(node1) - icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]intact" - dir = get_dir(src, node1) - else - icon_state = "exposed" -*/ - - manifold - icon = 'pipe_manifold.dmi' - icon_state = "manifold-f" - - name = "pipe manifold" - desc = "A liquid manifold composed of regular pipes" - - max_volume = 750 - - dir = SOUTH - initialize_directions = EAST|NORTH|WEST - - var/obj/machinery/water/node1 - var/obj/machinery/water/node2 - var/obj/machinery/water/node3 - - level = 1 - - New() - ..() - switch(dir) - if(NORTH) - initialize_directions = EAST|SOUTH|WEST - if(SOUTH) - initialize_directions = WEST|NORTH|EAST - if(EAST) - initialize_directions = SOUTH|WEST|NORTH - if(WEST) - initialize_directions = NORTH|EAST|SOUTH - - hide(var/i) - if(level == 1 && istype(loc, /turf/simulated)) - invisibility = i ? 101 : 0 - update_icon() - - pipeline_expansion() - return list(node1, node2, node3) - - process() - if(!parent) - ..() - else - machines.Remove(src) -/* - if(!node1) - parent.mingle_with_turf(loc, 70) - if(!nodealert) - //world << "Missing node from [src] at [src.x],[src.y],[src.z]" - nodealert = 1 - else if(!node2) - parent.mingle_with_turf(loc, 70) - if(!nodealert) - //world << "Missing node from [src] at [src.x],[src.y],[src.z]" - nodealert = 1 - else if(!node3) - parent.mingle_with_turf(loc, 70) - if(!nodealert) - //world << "Missing node from [src] at [src.x],[src.y],[src.z]" - nodealert = 1 - else if (nodealert) - nodealert = 0 -*/ - Del() - if(node1) - node1.disconnect(src) - if(node2) - node2.disconnect(src) - if(node3) - node3.disconnect(src) - - ..() - - disconnect(obj/machinery/water/reference) - if(reference == node1) - if(istype(node1, /obj/machinery/water/pipe)) - del(parent) - node1 = null - - if(reference == node2) - if(istype(node2, /obj/machinery/water/pipe)) - del(parent) - node2 = null - - if(reference == node3) - if(istype(node3, /obj/machinery/water/pipe)) - del(parent) - node3 = null - - update_icon() - - ..() - - update_icon() - if(node1&&node2&&node3) - var/C = "" - switch(color) - if ("red") C = "-r" - if ("blue") C = "-b" - if ("cyan") C = "-c" - if ("green") C = "-g" - if ("yellow") C = "-y" - if ("purple") C = "-p" - icon_state = "manifold[C][invisibility ? "-f" : ""]" - - else - var/connected = 0 - var/unconnected = 0 - var/connect_directions = (NORTH|SOUTH|EAST|WEST)&(~dir) - - if(node1) - connected |= get_dir(src, node1) - if(node2) - connected |= get_dir(src, node2) - if(node3) - connected |= get_dir(src, node3) - - unconnected = (~connected)&(connect_directions) - - icon_state = "manifold_[connected]_[unconnected]" - - if(!connected) - del(src) - - return - - initialize() - var/connect_directions = (NORTH|SOUTH|EAST|WEST)&(~dir) - - for(var/direction in cardinal) - if(direction&connect_directions) - for(var/obj/machinery/water/target in get_step(src,direction)) - if(target.initialize_directions & get_dir(target,src)) - node1 = target - connect_directions &= ~direction - break - if (node1) - break - - - for(var/direction in cardinal) - if(direction&connect_directions) - for(var/obj/machinery/water/target in get_step(src,direction)) - if(target.initialize_directions & get_dir(target,src)) - node2 = target - connect_directions &= ~direction - break - if (node2) - break - - - for(var/direction in cardinal) - if(direction&connect_directions) - for(var/obj/machinery/water/target in get_step(src,direction)) - if(target.initialize_directions & get_dir(target,src)) - node3 = target - connect_directions &= ~direction - break - if (node3) - break - - var/turf/T = src.loc // hide if turf is not intact - hide(T.intact) - //update_icon() - update_icon() - - manifold/drainage - name="Drainage pipe" - color="yellow" - icon_state = "" - - manifold/drainage_waste - name="Drainage waste pipe" - color="green" - icon_state = "" - - manifold/supply - name="Water supply pipe" - color="cyan" - icon_state = "" - - New() - ..() - reagents_temporary = new(max_volume) - reagents_temporary.my_atom = src - reagents_temporary.add_reagent("water", max_volume / 3) - - manifold/general - name="Water pipe" - color="gray" - icon_state = "" - - manifold/drainage/visible - level = 2 - icon_state = "manifold-y" - - manifold/drainage/hidden - level = 1 - icon_state = "manifold-y-f" - - manifold/drainage_waste/visible - level = 2 - icon_state = "manifold-g" - - manifold/drainage_waste/hidden - level = 1 - icon_state = "manifold-g-f" - - manifold/supply/visible - level = 2 - icon_state = "manifold-c" - - manifold/supply/hidden - level = 1 - icon_state = "manifold-c-f" - - manifold/general/visible - level = 2 - icon_state = "manifold" - - manifold/general/hidden - level = 1 - icon_state = "manifold-f" - - manifold4w - icon = 'pipe_manifold.dmi' - icon_state = "manifold4w-f" - - name = "4-way pipe manifold" - desc = "A liquid manifold composed of regular pipes" - - max_volume = 1000 - - dir = SOUTH - initialize_directions = EAST|NORTH|WEST|SOUTH - - var/obj/machinery/water/node1 - var/obj/machinery/water/node2 - var/obj/machinery/water/node3 - var/obj/machinery/water/node4 - - level = 1 - - hide(var/i) - if(level == 1 && istype(loc, /turf/simulated)) - invisibility = i ? 101 : 0 - update_icon() - - pipeline_expansion() - return list(node1, node2, node3, node4) - - process() - if(!parent) - ..() - else - machines.Remove(src) -/* - if(!node1) - parent.mingle_with_turf(loc, 70) - if(!nodealert) - //world << "Missing node from [src] at [src.x],[src.y],[src.z]" - nodealert = 1 - else if(!node2) - parent.mingle_with_turf(loc, 70) - if(!nodealert) - //world << "Missing node from [src] at [src.x],[src.y],[src.z]" - nodealert = 1 - else if(!node3) - parent.mingle_with_turf(loc, 70) - if(!nodealert) - //world << "Missing node from [src] at [src.x],[src.y],[src.z]" - nodealert = 1 - else if (nodealert) - nodealert = 0 -*/ - Del() - if(node1) - node1.disconnect(src) - if(node2) - node2.disconnect(src) - if(node3) - node3.disconnect(src) - if(node4) - node4.disconnect(src) - - ..() - - disconnect(obj/machinery/water/reference) - if(reference == node1) - if(istype(node1, /obj/machinery/water/pipe)) - del(parent) - node1 = null - - if(reference == node2) - if(istype(node2, /obj/machinery/water/pipe)) - del(parent) - node2 = null - - if(reference == node3) - if(istype(node3, /obj/machinery/water/pipe)) - del(parent) - node3 = null - - if(reference == node4) - if(istype(node4, /obj/machinery/water/pipe)) - del(parent) - node3 = null - - update_icon() - - ..() - - update_icon() - overlays = new() - if(node1&&node2&&node3&&node4) - var/C = "" - switch(color) - if ("red") C = "-r" - if ("blue") C = "-b" - if ("cyan") C = "-c" - if ("green") C = "-g" - if ("yellow") C = "-y" - if ("purple") C = "-p" - icon_state = "manifold4w[C][invisibility ? "-f" : ""]" - - else - icon_state = "manifold4w_ex" - var/icon/con = new/icon('pipe_manifold.dmi',"manifold4w_con") - - if(node1) - overlays += new/image(con,dir=1) - if(node2) - overlays += new/image(con,dir=2) - if(node3) - overlays += new/image(con,dir=4) - if(node4) - overlays += new/image(con,dir=8) - - if(!node1 && !node2 && !node3 && !node4) - del(src) - return - - initialize() - for(var/obj/machinery/water/target in get_step(src,1)) - if(target.initialize_directions & get_dir(target,src)) - node1 = target - break - - for(var/obj/machinery/water/target in get_step(src,2)) - if(target.initialize_directions & get_dir(target,src)) - node2 = target - break - - for(var/obj/machinery/water/target in get_step(src,4)) - if(target.initialize_directions & get_dir(target,src)) - node3 = target - break - - for(var/obj/machinery/water/target in get_step(src,8)) - if(target.initialize_directions & get_dir(target,src)) - node4 = target - break - - var/turf/T = src.loc // hide if turf is not intact - hide(T.intact) - //update_icon() - update_icon() - - manifold4w/drainage - name="Drainage pipe" - color="yellow" - icon_state = "" - - manifold4w/drainage_waste - name="Drainage waste pipe" - color="green" - icon_state = "" - - manifold4w/supply - name="Water supply pipe" - color="cyan" - icon_state = "" - - New() - ..() - reagents_temporary = new(max_volume) - reagents_temporary.my_atom = src - reagents_temporary.add_reagent("water", max_volume / 3) - - manifold4w/general - name="Water pipe" - color="gray" - icon_state = "" - - manifold4w/drainage/visible - level = 2 - icon_state = "manifold4w-y" - - manifold4w/drainage/hidden - level = 1 - icon_state = "manifold4w-y-f" - - manifold4w/drainage_waste/visible - level = 2 - icon_state = "manifold4w-g" - - manifold4w/drainage_waste/hidden - level = 1 - icon_state = "manifold4w-g-f" - - manifold4w/supply/visible - level = 2 - icon_state = "manifold4w-c" - - manifold4w/supply/hidden - level = 1 - icon_state = "manifold4w-c-f" - - manifold4w/general/visible - level = 2 - icon_state = "manifold4w" - - manifold4w/general/hidden - level = 1 - icon_state = "manifold4w-f" - -obj/machinery/water/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (istype(src, /obj/machinery/water/pipe/tank)) - return ..() - if (istype(W, /obj/item/device/pda)) // allow reagent scanner to work - return - //if (istype(src, /obj/machinery/water/pipe/drain)) - // return ..() - if (!istype(W, /obj/item/weapon/wrench)) - return ..() - var/turf/T = src.loc - if (level==1 && isturf(T) && T.intact) - user << "\red You must remove the plating first." - return 1 - var/datum/gas_mixture/env_air = loc.return_air() - if ((parent.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." - add_fingerprint(user) - return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." - if (do_after(user, 40)) - user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") - new /obj/item/water_pipe(loc, make_from=src) - for (var/obj/machinery/water_meter/meter in T) - if (meter.target == src) - new /obj/item/water_pipe_meter(T) - del(meter) - del(src) diff --git a/icons/obj/water/blue_water_tank.dmi b/icons/obj/water/blue_water_tank.dmi deleted file mode 100644 index 2346afe5d8a..00000000000 Binary files a/icons/obj/water/blue_water_tank.dmi and /dev/null differ diff --git a/icons/obj/water/water_fixtures.dmi b/icons/obj/water/water_fixtures.dmi deleted file mode 100644 index c6b47d4fc7d..00000000000 Binary files a/icons/obj/water/water_fixtures.dmi and /dev/null differ diff --git a/icons/obj/water/water_glass_connector.dmi b/icons/obj/water/water_glass_connector.dmi deleted file mode 100644 index 39413ffa09b..00000000000 Binary files a/icons/obj/water/water_glass_connector.dmi and /dev/null differ diff --git a/icons/obj/water/water_pipe_item.dmi b/icons/obj/water/water_pipe_item.dmi deleted file mode 100644 index 6e477f7a71c..00000000000 Binary files a/icons/obj/water/water_pipe_item.dmi and /dev/null differ diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 55b09673803..ad900fd3d18 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -6033,7 +6033,7 @@ "cma" = (/obj/machinery/computer/card/centcom,/obj/item/weapon/card/id/centcom,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) "cmb" = (/turf/unsimulated/floor{tag = "icon-warning"; icon_state = "warning"},/area/centcom/control) "cmc" = (/obj/machinery/door/airlock/external{name = "Entrylock"},/obj/machinery/door/poddoor{icon_state = "pdoor1"; id = "ERTOUT"; name = "Entrylock"; p_open = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/specops/centcom) -"cmd" = (/obj/machinery/door_control{name = "Spec Ops Ready Room"; desc = "A remote control switch to block view of the singularity."; icon_state = "doorctrl0"; pixel_y = 15; req_access_txt = "11"; id = "CREED"},/obj/structure/table/woodentable{dir = 9},/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) +"cmd" = (/obj/structurodentable{dir = 10},/obj/machinery/door_control{name = "Spec Ops Ready Room"; desc = "A remote control switch to block view of the singularity."; icon_state = "doorctrl0"; pixel_y = 15; req_access_txt = "11"; id = "CREED"},/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) "cme" = (/obj/structure/stool/chair{dir = 1},/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) "cmf" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; frequency = 1441; name = "Spec Ops Intercom"; pixel_y = 28},/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) "cmg" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access_txt = "101"},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/control) @@ -6046,7 +6046,7 @@ "cmn" = (/obj/structure/stool/chair{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/specops/centcom) "cmo" = (/obj/machinery/door_control{desc = "A remote control switch for the Entrylock."; id = "ERTOUT"; name = "Entrylock Control"; pixel_x = 26},/obj/structure/stool/chair{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/specops/centcom) "cmp" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/shuttle/specops/centcom) -"cmq" = (/obj/machinery/telecomms/allinone,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) +"cmq" = (/obj/machinery/telecomms/allinone{syndi = 0},/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) "cmr" = (/obj/machinery/vending/snack,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/control) "cms" = (/obj/machinery/vending/coffee,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/control) "cmt" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-burst_r (EAST)"; icon_state = "burst_r"; dir = 4},/turf/space,/area/shuttle/specops/centcom) @@ -9588,4 +9588,4 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -"} +"} \ No newline at end of file