From 8294741b506e28801799871c0a30beee6492643a Mon Sep 17 00:00:00 2001 From: AffectedArc07 Date: Sun, 21 Jun 2020 21:12:27 +0100 Subject: [PATCH] Removes some old and broken features --- .../components/binary_devices/dp_vent_pump.dm | 14 +- .../components/unary_devices/vent_pump.dm | 8 +- .../components/unary_devices/vent_scrubber.dm | 8 +- .../game/machinery/computer/buildandrepair.dm | 3 - code/game/machinery/constructable_frame.dm | 46 - code/game/objects/items/weapons/tools.dm | 785 ------------------ code/game/world.dm | 2 +- code/hub.dm | 1 - code/modules/atmos_automation/console.dm | 454 ---------- .../implementation/digital_valves.dm | 44 - .../implementation/emitters.dm | 42 - .../implementation/injectors.dm | 83 -- .../implementation/scrubbers.dm | 153 ---- .../implementation/sensors.dm | 56 -- .../implementation/vent_pump.dm | 314 ------- code/modules/atmos_automation/statements.dm | 457 ---------- code/modules/logic/converter.dm | 143 ---- code/modules/logic/dual_input.dm | 100 --- code/modules/logic/logic_base.dm | 284 ------- code/modules/logic/mono_input.dm | 62 -- code/modules/pda/app.dm | 2 - code/modules/power/singularity/emitter.dm | 50 -- .../research/designs/autolathe_designs.dm | 8 - .../research/designs/comp_board_designs.dm | 10 - code/modules/tram/tram.dm | 251 ------ code/modules/tram/tram_control_pad.dm | 33 - code/modules/tram/tram_floor.dm | 20 - code/modules/tram/tram_rail.dm | 8 - code/modules/tram/tram_wall.dm | 21 - paradise.dme | 17 - 30 files changed, 5 insertions(+), 3474 deletions(-) delete mode 100644 code/game/objects/items/weapons/tools.dm delete mode 100644 code/modules/atmos_automation/console.dm delete mode 100644 code/modules/atmos_automation/implementation/digital_valves.dm delete mode 100644 code/modules/atmos_automation/implementation/emitters.dm delete mode 100644 code/modules/atmos_automation/implementation/injectors.dm delete mode 100644 code/modules/atmos_automation/implementation/scrubbers.dm delete mode 100644 code/modules/atmos_automation/implementation/sensors.dm delete mode 100644 code/modules/atmos_automation/implementation/vent_pump.dm delete mode 100644 code/modules/atmos_automation/statements.dm delete mode 100644 code/modules/logic/converter.dm delete mode 100644 code/modules/logic/dual_input.dm delete mode 100644 code/modules/logic/logic_base.dm delete mode 100644 code/modules/logic/mono_input.dm delete mode 100644 code/modules/tram/tram.dm delete mode 100644 code/modules/tram/tram_control_pad.dm delete mode 100644 code/modules/tram/tram_floor.dm delete mode 100644 code/modules/tram/tram_rail.dm delete mode 100644 code/modules/tram/tram_wall.dm diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index c0ed34ef206..43b3c382c95 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -26,7 +26,6 @@ var/frequency = ATMOS_VENTSCRUB var/id_tag = null var/datum/radio_frequency/radio_connection - var/advcontrol = 0//does this device listen to the AAC settagwhitelist = list("id_tag") @@ -75,7 +74,7 @@ /obj/machinery/atmospherics/binary/dp_vent_pump/update_icon(var/safety = 0) ..() - + if(!check_icon_cache()) return @@ -192,7 +191,7 @@ return 1 /obj/machinery/atmospherics/binary/dp_vent_pump/receive_signal(datum/signal/signal) - if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command") || (signal.data["advcontrol"] && !advcontrol)) + if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command")) return 0 if(signal.data["power"] != null) on = text2num(signal.data["power"]) @@ -256,14 +255,5 @@ "} - -/obj/machinery/atmospherics/binary/dp_vent_pump/multitool_topic(var/mob/user, var/list/href_list, var/obj/O) - . = ..() - if(.) - return . - if("toggleadvcontrol" in href_list) - advcontrol = !advcontrol - return TRUE diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index afdca1d19ce..66ffca0aef5 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -43,7 +43,6 @@ var/frequency = ATMOS_VENTSCRUB var/datum/radio_frequency/radio_connection Mtoollink = 1 - var/advcontrol = 0//does this device listen to the AAC var/radio_filter_out var/radio_filter_in @@ -250,7 +249,7 @@ if(stat & (NOPOWER|BROKEN)) return //log_admin("DEBUG \[[world.timeofday]\]: /obj/machinery/atmospherics/unary/vent_pump/receive_signal([signal.debug_print()])") - if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command") || (signal.data["advcontrol"] && !advcontrol)) + if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command")) return 0 if(signal.data["purge"] != null) @@ -425,15 +424,10 @@ "} /obj/machinery/atmospherics/unary/vent_pump/multitool_topic(var/mob/user, var/list/href_list, var/obj/O) - if("toggleadvcontrol" in href_list) - advcontrol = !advcontrol - return TRUE - if("set_id" in href_list) var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID tag for this machine", src, src.id_tag) as null|text), 1, MAX_MESSAGE_LEN) if(!newid) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index d9aff36688b..42863e08ea5 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -18,7 +18,6 @@ var/id_tag = null var/frequency = ATMOS_VENTSCRUB var/datum/radio_frequency/radio_connection - var/advcontrol = 0//does this device listen to the AAC? var/list/turf/simulated/adjacent_turfs = list() @@ -286,7 +285,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/receive_signal(datum/signal/signal) if(stat & (NOPOWER|BROKEN)) return - if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command") || (signal.data["advcontrol"] && !advcontrol)) + if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command")) return 0 if(signal.data["power"] != null) @@ -354,15 +353,10 @@ "} /obj/machinery/atmospherics/unary/vent_scrubber/multitool_topic(var/mob/user, var/list/href_list, var/obj/O) - if("toggleadvcontrol" in href_list) - advcontrol = !advcontrol - return TRUE - if("set_id" in href_list) var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID tag for this machine", src, src:id_tag) as null|text),1,MAX_MESSAGE_LEN) if(!newid) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 993a1c5cbaa..b502d6e5441 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -350,9 +350,6 @@ build_path = /obj/machinery/computer/telescience origin_tech = "programming=3;bluespace=3;plasmatech=4" -/obj/item/circuitboard/atmos_automation - name = "Circuit board (Atmospherics Automation)" - build_path = /obj/machinery/computer/general_air_control/atmos_automation /obj/item/circuitboard/large_tank_control name = "Circuit board (Atmospheric Tank Control)" build_path = /obj/machinery/computer/general_air_control/large_tank_control diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 96863c3e54d..ee29504fe99 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -936,49 +936,3 @@ to destroy them and players will be able to make replacements. /obj/item/stock_parts/micro_laser = 1, /obj/item/stack/cable_coil = 3, /obj/item/stack/sheet/glass = 1) - -//Selectable mode board, like vending machine boards -/obj/item/circuitboard/logic_gate - name = "circuit board (Logic Connector)" - build_path = /obj/machinery/logic_gate - board_type = "machine" - origin_tech = "programming=1" //This stuff is pretty much the absolute basis of programming, so it's mostly useless for research - req_components = list(/obj/item/stack/cable_coil = 1) - var/list/names_paths = list( - "NOT Gate" = /obj/machinery/logic_gate/not, - "OR Gate" = /obj/machinery/logic_gate/or, - "AND Gate" = /obj/machinery/logic_gate/and, - "NAND Gate" = /obj/machinery/logic_gate/nand, - "NOR Gate" = /obj/machinery/logic_gate/nor, - "XOR Gate" = /obj/machinery/logic_gate/xor, - "XNOR Gate" = /obj/machinery/logic_gate/xnor, - "STATUS Gate" = /obj/machinery/logic_gate/status, - "CONVERT Gate" = /obj/machinery/logic_gate/convert - ) - -/obj/item/circuitboard/logic_gate/New() - ..() - if(build_path == /obj/machinery/logic_gate) //If we spawn the base type board (determined by the base type machine as the build path), become a random gate board - var/new_path = names_paths[pick(names_paths)] - set_type(new_path) - -/obj/item/circuitboard/logic_gate/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/screwdriver)) - set_type(null, user) - return - return ..() - -/obj/item/circuitboard/logic_gate/proc/set_type(typepath, mob/user) - var/new_name = "Logic Base" - if(!typepath) - new_name = input("Circuit Setting", "What would you change the board setting to?") in names_paths - typepath = names_paths[new_name] - else - for(var/name in names_paths) - if(names_paths[name] == typepath) - new_name = name - break - build_path = typepath - name = "circuit board ([new_name])" - if(user) - to_chat(user, "You set the board to [new_name].") diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm deleted file mode 100644 index 012fcf79b10..00000000000 --- a/code/game/objects/items/weapons/tools.dm +++ /dev/null @@ -1,785 +0,0 @@ -#define HEALPERWELD 15 - -/* Tools! - * Note: Multitools are in devices - * - * Contains: - * Wrench - * Screwdriver - * Wirecutters - * Welding Tool - * Crowbar - * Revolver Conversion Kit - */ - -//Wrench -/obj/item/wrench - name = "wrench" - desc = "A wrench with common uses. Can be found in your hand." - icon = 'icons/obj/tools.dmi' - icon_state = "wrench" - flags = CONDUCT - slot_flags = SLOT_BELT - force = 5 - throwforce = 7 - usesound = 'sound/items/ratchet.ogg' - w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=150) - origin_tech = "materials=1;engineering=1" - attack_verb = list("bashed", "battered", "bludgeoned", "whacked") - toolspeed = 1 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) - -/obj/item/wrench/suicide_act(mob/user) - user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) - return BRUTELOSS - -/obj/item/wrench/cyborg - name = "automatic wrench" - desc = "An advanced robotic wrench. Can be found in construction cyborgs." - toolspeed = 0.5 - -/obj/item/wrench/brass - name = "brass wrench" - desc = "A brass wrench. It's faintly warm to the touch." - icon_state = "wrench_brass" - toolspeed = 0.5 - resistance_flags = FIRE_PROOF | ACID_PROOF - -/obj/item/wrench/abductor - name = "alien wrench" - desc = "A polarized wrench. It causes anything placed between the jaws to turn." - icon = 'icons/obj/abductor.dmi' - icon_state = "wrench" - usesound = 'sound/effects/empulse.ogg' - toolspeed = 0.1 - origin_tech = "materials=5;engineering=5;abductor=3" - -/obj/item/wrench/power - name = "hand drill" - desc = "A simple powered drill with a bolt bit." - icon_state = "drill_bolt" - item_state = "drill" - usesound = 'sound/items/drill_use.ogg' - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get - force = 8 //might or might not be too high, subject to change - throwforce = 8 - attack_verb = list("drilled", "screwed", "jabbed") - toolspeed = 0.25 - -/obj/item/wrench/power/attack_self(mob/user) - playsound(get_turf(user),'sound/items/change_drill.ogg', 50, 1) - var/obj/item/wirecutters/power/s_drill = new /obj/item/screwdriver/power - to_chat(user, "You attach the screwdriver bit to [src].") - qdel(src) - user.put_in_active_hand(s_drill) - -/obj/item/wrench/power/suicide_act(mob/user) - user.visible_message("[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") - return BRUTELOSS - -/obj/item/wrench/medical - name = "medical wrench" - desc = "A medical wrench with common (medical?) uses. Can be found in your hand." - icon_state = "wrench_medical" - force = 2 //MEDICAL - throwforce = 4 - origin_tech = "materials=1;engineering=1;biotech=3" - attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked") - -/obj/item/wrench/medical/suicide_act(mob/user) - user.visible_message("[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!") - // TODO Make them glow with the power of the M E D I C A L W R E N C H - // during their ascension - - // Stun stops them from wandering off - user.Stun(5) - playsound(loc, 'sound/effects/pray.ogg', 50, 1, -1) - - // Let the sound effect finish playing - sleep(20) - - if(!user) - return - - for(var/obj/item/W in user) - user.unEquip(W) - - var/obj/item/wrench/medical/W = new /obj/item/wrench/medical(loc) - W.add_fingerprint(user) - W.desc += " For some reason, it reminds you of [user.name]." - - if(!user) - return - - user.dust() - return OBLITERATION - -//Screwdriver -/obj/item/screwdriver - name = "screwdriver" - desc = "You can be totally screwy with this." - icon = 'icons/obj/tools.dmi' - icon_state = "screwdriver_map" - flags = CONDUCT - slot_flags = SLOT_BELT - force = 5 - w_class = WEIGHT_CLASS_TINY - throwforce = 5 - throw_speed = 3 - throw_range = 5 - materials = list(MAT_METAL=75) - attack_verb = list("stabbed") - hitsound = 'sound/weapons/bladeslice.ogg' - usesound = 'sound/items/screwdriver.ogg' - toolspeed = 1 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) - var/random_color = TRUE //if the screwdriver uses random coloring - -/obj/item/screwdriver/nuke - name = "screwdriver" - desc = "A screwdriver with an ultra thin tip." - icon_state = "screwdriver_nuke" - toolspeed = 0.5 - -/obj/item/screwdriver/suicide_act(mob/user) - user.visible_message("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!") - return BRUTELOSS - -/obj/item/screwdriver/New(loc, var/param_color = null) - ..() - if(random_color) - if(!param_color) - param_color = pick("red","blue","pink","brown","green","cyan","yellow") - icon_state = "screwdriver_[param_color]" - - if (prob(75)) - src.pixel_y = rand(0, 16) - -/obj/item/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user) - if(!istype(M) || user.a_intent == INTENT_HELP) - return ..() - if(user.zone_selected != "eyes" && user.zone_selected != "head") - return ..() - if(HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "You don't want to harm [M]!") - return - if((CLUMSY in user.mutations) && prob(50)) - M = user - return eyestab(M,user) - -/obj/item/screwdriver/brass - name = "brass screwdriver" - desc = "A screwdriver made of brass. The handle feels freezing cold." - icon_state = "screwdriver_brass" - toolspeed = 0.5 - random_color = FALSE - resistance_flags = FIRE_PROOF | ACID_PROOF - -/obj/item/screwdriver/abductor - name = "alien screwdriver" - desc = "An ultrasonic screwdriver." - icon = 'icons/obj/abductor.dmi' - icon_state = "screwdriver" - usesound = 'sound/items/pshoom.ogg' - toolspeed = 0.1 - random_color = FALSE - -/obj/item/screwdriver/power - name = "hand drill" - desc = "A simple hand drill with a screwdriver bit attached." - icon_state = "drill_screw" - item_state = "drill" - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get - force = 8 //might or might not be too high, subject to change - throwforce = 8 - throw_speed = 2 - throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far - attack_verb = list("drilled", "screwed", "jabbed","whacked") - hitsound = 'sound/items/drill_hit.ogg' - usesound = 'sound/items/drill_use.ogg' - toolspeed = 0.25 - random_color = FALSE - -/obj/item/screwdriver/power/suicide_act(mob/user) - user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!") - return BRUTELOSS - -/obj/item/screwdriver/power/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_drill.ogg', 50, 1) - var/obj/item/wrench/power/b_drill = new /obj/item/wrench/power - to_chat(user, "You attach the bolt driver bit to [src].") - qdel(src) - user.put_in_active_hand(b_drill) - -/obj/item/screwdriver/cyborg - name = "powered screwdriver" - desc = "An electrical screwdriver, designed to be both precise and quick." - usesound = 'sound/items/drill_use.ogg' - toolspeed = 0.5 - -//Wirecutters -/obj/item/wirecutters - name = "wirecutters" - desc = "This cuts wires." - icon = 'icons/obj/tools.dmi' - icon_state = "cutters" - flags = CONDUCT - slot_flags = SLOT_BELT - force = 6 - throw_speed = 3 - throw_range = 7 - w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=80) - origin_tech = "materials=1;engineering=1" - attack_verb = list("pinched", "nipped") - hitsound = 'sound/items/wirecutter.ogg' - usesound = 'sound/items/wirecutter.ogg' - sharp = 1 - toolspeed = 1 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) - var/random_color = TRUE - -/obj/item/wirecutters/New(loc, param_color = null) - ..() - if(random_color) - if(!param_color) - param_color = pick("yellow", "red") - icon_state = "cutters_[param_color]" - -/obj/item/wirecutters/attack(mob/living/carbon/C, mob/user) - if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable)) - user.visible_message("[user] cuts [C]'s restraints with [src]!") - QDEL_NULL(C.handcuffed) - if(C.buckled && C.buckled.buckle_requires_restraints) - C.buckled.unbuckle_mob(C) - C.update_handcuffed() - return - else - ..() - -/obj/item/wirecutters/suicide_act(mob/user) - user.visible_message("[user] is cutting at [user.p_their()] arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, usesound, 50, 1, -1) - return BRUTELOSS - -/obj/item/wirecutters/brass - name = "brass wirecutters" - desc = "A pair of wirecutters made of brass. The handle feels freezing cold to the touch." - icon_state = "cutters_brass" - toolspeed = 0.5 - random_color = FALSE - resistance_flags = FIRE_PROOF | ACID_PROOF - -/obj/item/wirecutters/abductor - name = "alien wirecutters" - desc = "Extremely sharp wirecutters, made out of a silvery-green metal." - icon = 'icons/obj/abductor.dmi' - icon_state = "cutters" - toolspeed = 0.1 - origin_tech = "materials=5;engineering=4;abductor=3" - random_color = FALSE - -/obj/item/wirecutters/cyborg - name = "wirecutters" - desc = "This cuts wires." - toolspeed = 0.5 - -/obj/item/wirecutters/power - name = "jaws of life" - desc = "A set of jaws of life, the magic of science has managed to fit it down into a device small enough to fit in a tool belt. It's fitted with a cutting head." - icon_state = "jaws_cutter" - item_state = "jawsoflife" - origin_tech = "materials=2;engineering=2" - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - usesound = 'sound/items/jaws_cut.ogg' - toolspeed = 0.25 - random_color = FALSE - -/obj/item/wirecutters/power/suicide_act(mob/user) - user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!") - playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1) - if(ishuman(user)) - var/mob/living/carbon/human/H = user - var/obj/item/organ/external/head/head = H.bodyparts_by_name["head"] - if(head) - head.droplimb(0, DROPLIMB_BLUNT, FALSE, TRUE) - playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1) - return BRUTELOSS - -/obj/item/wirecutters/power/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) - var/obj/item/crowbar/power/pryjaws = new /obj/item/crowbar/power - to_chat(user, "You attach the pry jaws to [src].") - qdel(src) - user.put_in_active_hand(pryjaws) - -//Welding Tool -/obj/item/weldingtool - name = "welding tool" - desc = "A standard edition welder provided by Nanotrasen." - icon = 'icons/obj/tools.dmi' - icon_state = "welder" - item_state = "welder" - flags = CONDUCT - slot_flags = SLOT_BELT - force = 3 - throwforce = 5 - throw_speed = 3 - throw_range = 5 - hitsound = "swing_hit" - usesound = 'sound/items/welder.ogg' - var/acti_sound = 'sound/items/welderactivate.ogg' - var/deac_sound = 'sound/items/welderdeactivate.ogg' - w_class = WEIGHT_CLASS_SMALL - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30) - resistance_flags = FIRE_PROOF - materials = list(MAT_METAL=70, MAT_GLASS=30) - origin_tech = "engineering=1;plasmatech=1" - toolspeed = 1 - var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2) - var/status = 1 //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower) - var/max_fuel = 20 //The max amount of fuel the welder can hold - var/change_icons = 1 - var/can_off_process = 0 - var/light_intensity = 2 //how powerful the emitted light is when used. - var/nextrefueltick = 0 - -/obj/item/weldingtool/New() - ..() - create_reagents(max_fuel) - reagents.add_reagent("fuel", max_fuel) - update_icon() - -/obj/item/weldingtool/examine(mob/user) - . = ..() - if(get_dist(user, src) <= 0) - . += "It contains [get_fuel()] unit\s of fuel out of [max_fuel]." - -/obj/item/weldingtool/suicide_act(mob/user) - user.visible_message("[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!") - return FIRELOSS - -/obj/item/weldingtool/proc/update_torch() - overlays.Cut() - if(welding) - overlays += "[initial(icon_state)]-on" - item_state = "[initial(item_state)]1" - else - item_state = "[initial(item_state)]" - -/obj/item/weldingtool/update_icon() - if(change_icons) - var/ratio = get_fuel() / max_fuel - ratio = Ceiling(ratio*4) * 25 - if(ratio == 100) - icon_state = initial(icon_state) - else - icon_state = "[initial(icon_state)][ratio]" - update_torch() - ..() - -/obj/item/weldingtool/process() - switch(welding) - if(0) - force = 3 - damtype = "brute" - update_icon() - if(!can_off_process) - STOP_PROCESSING(SSobj, src) - return - //Welders left on now use up fuel, but lets not have them run out quite that fast - if(1) - force = 15 - damtype = "fire" - if(prob(5)) - remove_fuel(1) - update_icon() - - //This is to start fires. process() is only called if the welder is on. - var/turf/location = loc - if(ismob(location)) - var/mob/M = location - if(M.l_hand == src || M.r_hand == src) - location = get_turf(M) - if(isturf(location)) - location.hotspot_expose(700, 5) - -/obj/item/weldingtool/attackby(obj/item/I, mob/user, params) - if(isscrewdriver(I)) - flamethrower_screwdriver(I, user) - else if(istype(I, /obj/item/stack/rods)) - flamethrower_rods(I, user) - else - ..() - -/obj/item/weldingtool/attack(mob/M, mob/user) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - var/obj/item/organ/external/S = H.bodyparts_by_name[user.zone_selected] - - if(!S) - return - - if(!S.is_robotic() || user.a_intent != INTENT_HELP || S.open == 2) - return ..() - - if(!isOn()) //why wasn't this being checked already? - to_chat(user, "Turn on [src] before attempting repairs!") - return 1 - - if(S.brute_dam > ROBOLIMB_SELF_REPAIR_CAP) - to_chat(user, "The damage is far too severe to patch over externally.") - return - - if(!S.brute_dam) - to_chat(user, "Nothing to fix!") - return - - if(get_fuel() >= 1) - if(H == user) - if(!do_mob(user, H, 10)) - return 1 - if(!remove_fuel(1,null)) - to_chat(user, "Need more welding fuel!") - var/rembrute = HEALPERWELD - var/nrembrute = 0 - var/childlist - if(!isnull(S.children)) - childlist = S.children.Copy() - var/parenthealed = FALSE - while(rembrute > 0) - var/obj/item/organ/external/E - if(S.brute_dam) - E = S - else if(LAZYLEN(childlist)) - E = pick_n_take(childlist) - if(!E.brute_dam || !E.is_robotic()) - continue - else if(S.parent && !parenthealed) - E = S.parent - parenthealed = TRUE - if(!E.brute_dam || !E.is_robotic()) - break - else - break - playsound(src.loc, usesound, 50, 1) - nrembrute = max(rembrute - E.brute_dam, 0) - E.heal_damage(rembrute,0,0,1) - rembrute = nrembrute - user.visible_message("\The [user] patches some dents on \the [M]'s [E.name] with \the [src].") - if(H.bleed_rate && H.isSynthetic()) - H.bleed_rate = 0 - user.visible_message("\The [user] patches some leaks on [M] with \the [src].") - return 1 - else - return ..() - -/obj/item/weldingtool/afterattack(atom/O, mob/user, proximity) - if(!proximity) - return - if(welding) - remove_fuel(1) - var/turf/location = get_turf(user) - location.hotspot_expose(700, 50, 1) - if(get_fuel() <= 0) - set_light(0) - - if(isliving(O)) - var/mob/living/L = O - if(L.IgniteMob()) - message_admins("[key_name_admin(user)] set [key_name_admin(L)] on fire") - log_game("[key_name(user)] set [key_name(L)] on fire") - -/obj/item/weldingtool/attack_self(mob/user) - switched_on(user) - if(welding) - set_light(light_intensity) - - update_icon() - -//Returns the amount of fuel in the welder -/obj/item/weldingtool/proc/get_fuel() - return reagents.get_reagent_amount("fuel") - -//Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use() -/obj/item/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null) - if(!welding || !check_fuel()) - return FALSE - if(get_fuel() >= amount) - reagents.remove_reagent("fuel", amount) - check_fuel() - if(M) - M.flash_eyes(light_intensity) - return TRUE - else - if(M) - to_chat(M, "You need more welding fuel to complete this task.") - return FALSE - -//Returns whether or not the welding tool is currently on. -/obj/item/weldingtool/proc/isOn() - return welding - -//Turns off the welder if there is no more fuel (does this really need to be its own proc?) -/obj/item/weldingtool/proc/check_fuel(mob/user) - if(get_fuel() <= 0 && welding) - switched_on(user) - update_icon() - //mob icon update - if(ismob(loc)) - var/mob/M = loc - M.update_inv_r_hand(0) - M.update_inv_l_hand(0) - return 0 - return 1 - -//Switches the welder on -/obj/item/weldingtool/proc/switched_on(mob/user) - if(!status) - to_chat(user, "[src] can't be turned on while unsecured!") - return - welding = !welding - if(welding) - if(get_fuel() >= 1) - to_chat(user, "You switch [src] on.") - playsound(loc, acti_sound, 50, 1) - force = 15 - damtype = "fire" - hitsound = 'sound/items/welder.ogg' - update_icon() - START_PROCESSING(SSobj, src) - else - to_chat(user, "You need more fuel!") - switched_off(user) - else - if(user) - to_chat(user, "You switch [src] off.") - playsound(loc, deac_sound, 50, 1) - switched_off(user) - -//Switches the welder off -/obj/item/weldingtool/proc/switched_off(mob/user) - welding = 0 - set_light(0) - - force = 3 - damtype = "brute" - hitsound = "swing_hit" - update_icon() - -/obj/item/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user) - if(welding) - to_chat(user, "Turn it off first!") - return - status = !status - if(status) - to_chat(user, "You resecure [src].") - else - to_chat(user, "[src] can now be attached and modified.") - add_fingerprint(user) - -/obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user) - if(!status) - var/obj/item/stack/rods/R = I - if(R.use(1)) - var/obj/item/flamethrower/F = new /obj/item/flamethrower(user.loc) - if(!remove_item_from_storage(F)) - user.unEquip(src) - loc = F - F.weldtool = src - add_fingerprint(user) - to_chat(user, "You add a rod to a welder, starting to build a flamethrower.") - user.put_in_hands(F) - else - to_chat(user, "You need one rod to start building a flamethrower!") - -/obj/item/weldingtool/largetank - name = "Industrial Welding Tool" - desc = "A slightly larger welder with a larger tank." - icon_state = "indwelder" - max_fuel = 40 - materials = list(MAT_METAL=70, MAT_GLASS=60) - origin_tech = "engineering=2;plasmatech=2" - -/obj/item/weldingtool/largetank/cyborg - name = "integrated welding tool" - desc = "An advanced welder designed to be used in robotic systems." - toolspeed = 0.5 - -/obj/item/weldingtool/largetank/flamethrower_screwdriver() - return - -/obj/item/weldingtool/mini - name = "emergency welding tool" - desc = "A miniature welder used during emergencies." - icon_state = "miniwelder" - max_fuel = 10 - w_class = WEIGHT_CLASS_TINY - materials = list(MAT_METAL=30, MAT_GLASS=10) - change_icons = 0 - -/obj/item/weldingtool/mini/flamethrower_screwdriver() - return - -/obj/item/weldingtool/abductor - name = "alien welding tool" - desc = "An alien welding tool. Whatever fuel it uses, it never runs out." - icon = 'icons/obj/abductor.dmi' - icon_state = "welder" - toolspeed = 0.1 - light_intensity = 0 - change_icons = 0 - origin_tech = "plasmatech=5;engineering=5;abductor=3" - can_off_process = 1 - -/obj/item/weldingtool/abductor/process() - if(get_fuel() <= max_fuel) - reagents.add_reagent("fuel", 1) - ..() - -/obj/item/weldingtool/hugetank - name = "Upgraded Welding Tool" - desc = "An upgraded welder based off the industrial welder." - icon_state = "upindwelder" - item_state = "upindwelder" - max_fuel = 80 - materials = list(MAT_METAL=70, MAT_GLASS=120) - origin_tech = "engineering=3;plasmatech=2" - -/obj/item/weldingtool/experimental - name = "Experimental Welding Tool" - desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes." - icon_state = "exwelder" - item_state = "exwelder" - max_fuel = 40 - materials = list(MAT_METAL=70, MAT_GLASS=120) - origin_tech = "materials=4;engineering=4;bluespace=3;plasmatech=4" - change_icons = 0 - can_off_process = 1 - light_intensity = 1 - toolspeed = 0.5 - var/last_gen = 0 - -/obj/item/weldingtool/experimental/brass - name = "brass welding tool" - desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch." - icon_state = "brasswelder" - item_state = "brasswelder" - resistance_flags = FIRE_PROOF | ACID_PROOF - -obj/item/weldingtool/experimental/process() - ..() - if(get_fuel() < max_fuel && nextrefueltick < world.time) - nextrefueltick = world.time + 10 - reagents.add_reagent("fuel", 1) - -//Crowbar -/obj/item/crowbar - name = "pocket crowbar" - desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors." - icon = 'icons/obj/tools.dmi' - icon_state = "crowbar" - item_state = "crowbar" - usesound = 'sound/items/crowbar.ogg' - flags = CONDUCT - slot_flags = SLOT_BELT - force = 5 - throwforce = 7 - item_state = "crowbar" - w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=50) - origin_tech = "engineering=1;combat=1" - attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") - toolspeed = 1 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) - -/obj/item/crowbar/red - icon_state = "crowbar_red" - item_state = "crowbar_red" - force = 8 - -/obj/item/crowbar/brass - name = "brass crowbar" - desc = "A brass crowbar. It feels faintly warm to the touch." - icon_state = "crowbar_brass" - item_state = "crowbar_brass" - toolspeed = 0.5 - resistance_flags = FIRE_PROOF | ACID_PROOF - -/obj/item/crowbar/abductor - name = "alien crowbar" - desc = "A hard-light crowbar. It appears to pry by itself, without any effort required." - icon = 'icons/obj/abductor.dmi' - usesound = 'sound/weapons/sonic_jackhammer.ogg' - icon_state = "crowbar" - toolspeed = 0.1 - origin_tech = "combat=4;engineering=4;abductor=3" - -/obj/item/crowbar/large - name = "crowbar" - desc = "It's a big crowbar. It doesn't fit in your pockets, because its too big." - force = 12 - w_class = WEIGHT_CLASS_NORMAL - throw_speed = 3 - throw_range = 3 - materials = list(MAT_METAL=70) - icon_state = "crowbar_large" - item_state = "crowbar_large" - toolspeed = 0.5 - -/obj/item/crowbar/cyborg - name = "hydraulic crowbar" - desc = "A hydraulic prying tool, compact but powerful. Designed to replace crowbar in construction cyborgs." - usesound = 'sound/items/jaws_pry.ogg' - force = 10 - toolspeed = 0.5 - -/obj/item/crowbar/power - name = "jaws of life" - desc = "A set of jaws of life, the magic of science has managed to fit it down into a device small enough to fit in a tool belt. It's fitted with a prying head." - icon_state = "jaws_pry" - item_state = "jawsoflife" - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - origin_tech = "materials=2;engineering=2" - usesound = 'sound/items/jaws_pry.ogg' - force = 15 - toolspeed = 0.25 - var/airlock_open_time = 100 // Time required to open powered airlocks - -/obj/item/crowbar/power/suicide_act(mob/user) - user.visible_message("[user] is putting [user.p_their()] head in [src]. It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1) - return BRUTELOSS - -/obj/item/crowbar/power/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) - var/obj/item/wirecutters/power/cutjaws = new /obj/item/wirecutters/power - to_chat(user, "You attach the cutting jaws to [src].") - qdel(src) - user.put_in_active_hand(cutjaws) - -// Conversion kit -/obj/item/conversion_kit - name = "\improper Revolver Conversion Kit" - desc = "A professional conversion kit used to convert any knock off revolver into the real deal capable of shooting lethal .357 rounds without the possibility of catastrophic failure." - icon_state = "kit" - flags = CONDUCT - w_class = WEIGHT_CLASS_SMALL - origin_tech = "combat=2" - var/open = 0 - -/obj/item/conversion_kit/New() - ..() - update_icon() - -/obj/item/conversion_kit/update_icon() - icon_state = "[initial(icon_state)]_[open]" - -/obj/item/conversion_kit/attack_self(mob/user) - open = !open - to_chat(user, "You [open ? "open" : "close"] the conversion kit.") - update_icon() diff --git a/code/game/world.dm b/code/game/world.dm index c1f6a076677..dd9711515f8 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -246,7 +246,7 @@ GLOBAL_VAR_INIT(world_topic_spam_protect_time, world.timeofday) if(!key_valid) return keySpamProtect(addr) if(input["req"] == "public") - hub_password = hub_password_base + hub_password = initial(hub_password) update_status() return "Set listed status to public." else diff --git a/code/hub.dm b/code/hub.dm index 665193a9d5b..32fe613399e 100644 --- a/code/hub.dm +++ b/code/hub.dm @@ -3,7 +3,6 @@ hub = "Exadv1.spacestation13" hub_password = "kMZy3U5jJHSiBQjr" name = "Space Station 13" - /var/hub_password_base = "kMZy3U5jJHSiBQjr" /* This is for any host that would like their server to appear on the main SS13 hub. To use it, simply replace the password above, with the password found below, and it should work. If not, let us know on the main tgstation IRC channel of irc.rizon.net #tgstation13 we can help you there. diff --git a/code/modules/atmos_automation/console.dm b/code/modules/atmos_automation/console.dm deleted file mode 100644 index 8d23bb390aa..00000000000 --- a/code/modules/atmos_automation/console.dm +++ /dev/null @@ -1,454 +0,0 @@ -/obj/machinery/computer/general_air_control/atmos_automation - icon = 'icons/obj/computer.dmi' - icon_screen = "area_atmos" - icon_keyboard = "atmos_key" - circuit = /obj/item/circuitboard/atmos_automation - req_one_access_txt = "24;10" - Mtoollink = 1 - - show_sensors = 0 - var/on = 0 - - name = "Atmospherics Automations Console" - - var/list/datum/automation/automations = list() - -/obj/machinery/computer/general_air_control/atmos_automation/receive_signal(datum/signal/signal) - if(!signal || signal.encryption) return - - var/id_tag = signal.data["tag"] - if(!id_tag) - return - - sensor_information[id_tag] = signal.data - -/obj/machinery/computer/general_air_control/atmos_automation/process() - if(on) - for(var/datum/automation/A in automations) - A.process() - -/obj/machinery/computer/general_air_control/atmos_automation/update_icon() - icon_state = initial(icon_state) - // Broken - if(stat & BROKEN) - icon_state += "b" - - // Powered - else if(stat & NOPOWER) - icon_state = initial(icon_state) - icon_state += "0" - else if(on) - icon_state += "_active" - -/obj/machinery/computer/general_air_control/atmos_automation/proc/request_device_refresh(device) - send_signal(list("tag"=device, "status")) - -/obj/machinery/computer/general_air_control/atmos_automation/proc/send_signal(list/data, filter = RADIO_ATMOSIA)//filter's here so the AAC can cross communicate to things like vents, which have a different filter - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.source = src - signal.data=data - signal.data["sigtype"]="command" - signal.data["advcontrol"]=1//AAC balancing, you need to manually get up to the machine to make it listen to this - radio_connection.post_signal(src, signal, range = 8, filter = filter) - -/obj/machinery/computer/general_air_control/atmos_automation/proc/selectValidChildFor(datum/automation/parent, mob/user, list/valid_returntypes) - var/list/choices=list() - for(var/childtype in GLOB.automation_types) - var/datum/automation/A = new childtype(src) - if(A.returntype == null) - continue - if(!(A.returntype in valid_returntypes)) - continue - choices[A.name]=A - if(choices.len==0) - testing("Unable to find automations with returntype in [english_list(valid_returntypes)]!") - return 0 - var/label=input(user, "Select new automation:", "Automations", "Cancel") as null|anything in choices - if(!label) - return 0 - return choices[label] - -/obj/machinery/computer/general_air_control/atmos_automation/return_text() - var/out=..() - - if(on) - out += "RUNNING" - else - out += "STOPPED" - - out += {" -

Automations

-

\[ - - Add - - | - - Reset All - - | - - Clear - - \]

-

\[ - - Export - - | - - Import - - \]

"} - if(automations.len==0) - out += "No automations present." - else - for(var/datum/automation/A in automations) - out += {" -
- - [A.label] - (Reset | - ×) - - [A.GetText()] -
- "} - return out - -/obj/machinery/computer/general_air_control/atmos_automation/Topic(href,href_list) - if(..()) - return 1 - - if(href_list["on"]) - on = !on - updateUsrDialog() - update_icon() - return 1 - - if(href_list["add"]) - var/new_child=selectValidChildFor(null,usr,list(0)) - if(!new_child) - return 1 - automations += new_child - updateUsrDialog() - return 1 - - if(href_list["label"]) - var/datum/automation/A=locate(href_list["label"]) - if(!A) return 1 - var/nl=input(usr, "Please enter a label for this automation task.") as text|null - if(!nl) return 1 - nl = copytext(sanitize(nl), 1, 50) - A.label=nl - updateUsrDialog() - return 1 - - if(href_list["reset"]) - if(href_list["reset"]=="*") - for(var/datum/automation/A in automations) - if(!A) continue - A.OnReset() - else - var/datum/automation/A=locate(href_list["reset"]) - if(!A) return 1 - A.OnReset() - updateUsrDialog() - return 1 - - if(href_list["remove"]) - if(href_list["remove"]=="*") - var/confirm=alert("Are you sure you want to remove ALL automations?","Automations","Yes","No") - if(confirm == "No") return 0 - for(var/datum/automation/A in automations) - if(!A) continue - A.OnRemove() - automations.Remove(A) - else - var/datum/automation/A=locate(href_list["remove"]) - if(!A) return 1 - A.OnRemove() - automations.Remove(A) - updateUsrDialog() - return 1 - - if(href_list["read"]) - var/code = input("Input exported AAC code.","Automations","") as message|null - if(!code) return 0 - ReadCode(code) - updateUsrDialog() - return 1 - - if(href_list["dump"]) - input("Exported AAC code:","Automations",DumpCode()) as message|null - return 0 - -/obj/machinery/computer/general_air_control/atmos_automation/proc/MakeCompare(datum/automation/a, datum/automation/b, comparetype) - var/datum/automation/compare/compare=new(src) - compare.comparator = comparetype - compare.children[1] = a - compare.children[2] = b - return compare - -/obj/machinery/computer/general_air_control/atmos_automation/proc/MakeNumber(value) - var/datum/automation/static_value/val = new(src) - val.value=value - return val - -/obj/machinery/computer/general_air_control/atmos_automation/proc/MakeGetSensorData(sns_tag,field) - var/datum/automation/get_sensor_data/sensor=new(src) - sensor.sensor=sns_tag - sensor.field=field - return sensor - -/obj/machinery/computer/general_air_control/atmos_automation/proc/DumpCode() - var/list/json[0] - for(var/datum/automation/A in automations) - json += list(A.Export()) - return json_encode(json) - -/obj/machinery/computer/general_air_control/atmos_automation/proc/ReadCode(jsonStr) - automations.Cut() - var/list/json = json_decode(jsonStr) - if(json.len>0) - for(var/list/cData in json) - if(isnull(cData) || !("type" in cData)) - testing("AAC: Null cData in root JS array.") - continue - var/Atype=text2path(cData["type"]) - if(!(Atype in GLOB.automation_types)) - testing("AAC: Unrecognized Atype [Atype].") - continue - var/datum/automation/A = new Atype(src) - A.Import(cData) - automations += A - -/obj/machinery/computer/general_air_control/atmos_automation/burnchamber - var/injector_tag="inc_in" - var/output_tag="inc_out" - var/sensor_tag="inc_sensor" - frequency=AIRLOCK_FREQ - var/temperature=1000 - -/obj/machinery/computer/general_air_control/atmos_automation/burnchamber/New() - ..() - - // On State - // Pretty much this: - /* - if(get_sensor("inc_sensor","temperature") < 200) - set_injector_state("inc_in",1) - set_vent_pump_power("inc_out",0) - else - set_vent_pump_power("inc_out",1 - */ - - var/datum/automation/get_sensor_data/sensor=new(src) - sensor.sensor=sensor_tag - sensor.field="temperature" - - var/datum/automation/static_value/val = new(src) - val.value=temperature - 800 - - var/datum/automation/compare/compare=new(src) - compare.comparator = "Less Than" - compare.children[1] = sensor - compare.children[2] = val - - var/datum/automation/set_injector_power/inj_on=new(src) - inj_on.injector=injector_tag - inj_on.state=1 - - var/datum/automation/set_vent_pump_power/vp_on=new(src) - vp_on.vent_pump=output_tag - vp_on.state=1 - - var/datum/automation/set_vent_pump_power/vp_off=new(src) - vp_off.vent_pump=output_tag - vp_off.state=0 - - var/datum/automation/if_statement/i = new (src) - i.label = "Fuel Injector On" - i.condition = compare - i.children_then.Add(inj_on) - i.children_then.Add(vp_off) - i.children_else.Add(vp_on) - - automations += i - - // Off state - /* - if(get_sensor("inc_sensor","temperature") > 1000) - set_injector_state("inc_in",0) - */ - sensor=new(src) - sensor.sensor=sensor_tag - sensor.field="temperature" - - val = new(src) - val.value=temperature - - compare=new(src) - compare.comparator = "Greater Than" - compare.children[1] = sensor - compare.children[2] = val - - var/datum/automation/set_injector_power/inj_off=new(src) - inj_off.injector=injector_tag - inj_off.state=0 - - i = new (src) - i.label = "Fuel Injector Off" - i.condition = compare - i.children_then.Add(inj_off) - - automations += i - -/obj/machinery/computer/general_air_control/atmos_automation/air_mixing - var/n2_injector_tag="air_n2_in" - var/o2_injector_tag="air_o2_in" - var/output_tag="air_out" - var/sensor_tag="air_sensor" - frequency=ATMOS_DISTRO_FREQ - var/temperature=1000 - -/obj/machinery/computer/general_air_control/atmos_automation/air_mixing/New() - ..() - buildO2() - buildN2() - buildOutletVent() - -/obj/machinery/computer/general_air_control/atmos_automation/air_mixing/proc/buildO2() - /////////////////////////////////////////////////////////////// - // Oxygen Injection - /////////////////////////////////////////////////////////////// - - var/datum/automation/set_injector_power/inj_on=new(src) - inj_on.injector=o2_injector_tag - inj_on.state=1 - - var/datum/automation/set_injector_power/inj_off=new(src) - inj_off.injector=o2_injector_tag - inj_off.state=0 - - var/datum/automation/if_statement/i = new (src) - i.label = "Oxygen Injection" - i.condition = MakeCompare( - MakeGetSensorData(sensor_tag,"oxygen"), - MakeNumber(20), - "Less Than or Equal to" - ) - i.children_then.Add(inj_on) - i.children_else.Add(inj_off) - - automations += i - -/obj/machinery/computer/general_air_control/atmos_automation/air_mixing/proc/buildN2() - /////////////////////////////////////////////////////////////// - // Nitrogen Injection - /////////////////////////////////////////////////////////////// - /* - if(get_sensor_data("pressure") < 100) - injector_on() - else - if(get_sensor_data("pressure") > 5000) - injector_off() - */ - - var/datum/automation/set_injector_power/inj_on=new(src) - inj_on.injector=n2_injector_tag - inj_on.state=1 - - var/datum/automation/set_injector_power/inj_off=new(src) - inj_off.injector=n2_injector_tag - inj_off.state=0 - - var/datum/automation/if_statement/if_on = new (src) - if_on.label = "Nitrogen Injection" - if_on.condition = MakeCompare( - MakeGetSensorData(sensor_tag,"pressure"), - MakeNumber(100), - "Less Than" - ) - if_on.children_then.Add(inj_on) - - - var/datum/automation/if_statement/if_off=new(src) - if_off.condition=MakeCompare( - MakeGetSensorData(sensor_tag,"pressure"), - MakeNumber(5000), - "Greater Than" - ) - if_off.children_then.Add(inj_off) - - if_on.children_else.Add(if_off) - - automations += if_on - -/obj/machinery/computer/general_air_control/atmos_automation/air_mixing/proc/buildOutletVent() - /////////////////////////////////////////////////////////////// - // Outlet Management - /////////////////////////////////////////////////////////////// - /* - if(get_sensor_data("pressure") >= 5000 && get_sensor_data("oxygen") >= 20) - vent_on() - else - if(get_sensor_data("oxygen") < 20 || get_sensor_data("pressure") < 100) - vent_off() - */ - - var/datum/automation/set_vent_pump_power/vp_on=new(src) - vp_on.vent_pump=output_tag - vp_on.state=1 - - var/datum/automation/set_vent_pump_power/vp_off=new(src) - vp_off.vent_pump=output_tag - vp_off.state=0 - - var/datum/automation/if_statement/if_on=new(src) - if_on.label="Air Output" - - var/datum/automation/and/and_on=new(src) - and_on.children.Add( - MakeCompare( - MakeGetSensorData(sensor_tag,"pressure"), - MakeNumber(5000), - "Greater Than or Equal to" - ) - ) - and_on.children.Add( - MakeCompare( - MakeGetSensorData(sensor_tag,"oxygen"), - MakeNumber(20), - "Greater Than or Equal to" - ) - ) - if_on.condition=and_on - if_on.children_then.Add(vp_on) - - ////////////////////////////// - - var/datum/automation/if_statement/if_off=new(src) - - var/datum/automation/or/or_off=new(src) - or_off.children.Add( - MakeCompare( - MakeGetSensorData(sensor_tag,"pressure"), - MakeNumber(100), - "Less Than" - ) - ) - or_off.children.Add( - MakeCompare( - MakeGetSensorData(sensor_tag,"oxygen"), - MakeNumber(20), - "Less Than" - ) - ) - if_off.condition=or_off - if_off.children_then.Add(vp_off) - - if_on.children_else.Add(if_off) - - automations += if_on diff --git a/code/modules/atmos_automation/implementation/digital_valves.dm b/code/modules/atmos_automation/implementation/digital_valves.dm deleted file mode 100644 index dc0d0b2be00..00000000000 --- a/code/modules/atmos_automation/implementation/digital_valves.dm +++ /dev/null @@ -1,44 +0,0 @@ - - -/datum/automation/set_valve_state - name = "Digital Valve: Set Open/Closed" - var/valve=null - var/state=0 - - Export() - var/list/json = ..() - json["valve"]=valve - json["state"]=state - return json - - Import(var/list/json) - ..(json) - valve = json["valve"] - state = text2num(json["state"]) - - process() - if(valve) - parent.send_signal(list ("tag" = valve, "command"="valve_set","valve_set"=state)) - return 0 - - GetText() - return "Set digital valve [fmtString(valve)] to [state?"open":"closed"]." - - Topic(href,href_list) - if(..()) - return 1 - if(href_list["set_state"]) - state=!state - parent.updateUsrDialog() - return 1 - if(href_list["set_subject"]) - var/list/valves=list() - for(var/obj/machinery/atmospherics/binary/valve/digital/V in world) - if(!isnull(V.id_tag) && V.frequency == parent.frequency) - valves|=V.id_tag - if(valves.len==0) - to_chat(usr, "Unable to find any digital valves on this frequency.") - return - valve = input("Select a valve:", "Sensor Data", valve) as null|anything in valves - parent.updateUsrDialog() - return 1 diff --git a/code/modules/atmos_automation/implementation/emitters.dm b/code/modules/atmos_automation/implementation/emitters.dm deleted file mode 100644 index e6315fbceb2..00000000000 --- a/code/modules/atmos_automation/implementation/emitters.dm +++ /dev/null @@ -1,42 +0,0 @@ -/datum/automation/set_emitter_power - name = "Emitter: Set Power" - var/emitter=null - var/on=0 - - Export() - var/list/json = ..() - json["emitter"]=emitter - json["on"]=on - return json - - Import(var/list/json) - ..(json) - emitter = json["emitter"] - on = text2num(json["on"]) - - process() - if(emitter) - parent.send_signal(list("tag" = emitter, "command"="set", "state" = on, "hiddenprints" = parent.fingerprintshidden)) - return 0 - - GetText() - return "Set emitter [fmtString(emitter)] to [on?"on":"off"]." - - Topic(href,href_list) - if(..()) - return 1 - if(href_list["set_power"]) - on=!on - parent.updateUsrDialog() - return 1 - if(href_list["set_subject"]) - var/list/emitters=list() - for(var/obj/machinery/power/emitter/E in GLOB.machines) - if(!isnull(E.id_tag) && E.frequency == parent.frequency) - emitters|=E.id_tag - if(emitters.len==0) - to_chat(usr, "Unable to find any emitters on this frequency.") - return - emitter = input("Select an emitter:", "Emitter", emitter) as null|anything in emitters - parent.updateUsrDialog() - return 1 diff --git a/code/modules/atmos_automation/implementation/injectors.dm b/code/modules/atmos_automation/implementation/injectors.dm deleted file mode 100644 index d6747f31447..00000000000 --- a/code/modules/atmos_automation/implementation/injectors.dm +++ /dev/null @@ -1,83 +0,0 @@ - -//////////////////////////////////////////// -// Injector -//////////////////////////////////////////// -/datum/automation/set_injector_power - name = "Injector: Power" - var/injector=null - var/state=0 - - Export() - var/list/json = ..() - json["injector"]=injector - json["state"]=state - return json - - Import(var/list/json) - ..(json) - injector = json["injector"] - state = text2num(json["state"]) - - process() - if(injector) - parent.send_signal(list ("tag" = injector, "power"=state)) - return 0 - - GetText() - return "Set injector [fmtString(injector)] power to [state ? "on" : "off"]." - - Topic(href,href_list) - if(..()) - return 1 - if(href_list["toggle_state"]) - state = !state - parent.updateUsrDialog() - return 1 - if(href_list["set_injector"]) - var/list/injector_names=list() - for(var/obj/machinery/atmospherics/unary/outlet_injector/I in GLOB.machines) - if(!isnull(I.id_tag) && I.frequency == parent.frequency) - injector_names|=I.id_tag - injector = input("Select an injector:", "Sensor Data", injector) as null|anything in injector_names - parent.updateUsrDialog() - return 1 - -/datum/automation/set_injector_rate - name = "Injector: Rate" - var/injector = null - var/rate = 0 - - Export() - var/list/json = ..() - json["injector"] = injector - json["rate"] = rate - return json - - Import(var/list/json) - ..(json) - injector = json["injector"] - rate = text2num(json["rate"]) - - process() - if(injector) - parent.send_signal(list ("tag" = injector, "set_volume_rate"=rate)) - return 0 - - GetText() - return "Set injector [fmtString(injector)] transfer rate to [rate] L/s." - - Topic(href,href_list) - if(..()) - return 1 - if(href_list["set_rate"]) - rate = input("Set rate in L/s.", "Rate", rate) as num - parent.updateUsrDialog() - return 1 - if(href_list["set_injector"]) - var/list/injector_names=list() - for(var/obj/machinery/atmospherics/unary/outlet_injector/I in GLOB.machines) - if(!isnull(I.id_tag) && I.frequency == parent.frequency) - injector_names|=I.id_tag - injector = input("Select an injector:", "Sensor Data", injector) as null|anything in injector_names - parent.updateUsrDialog() - return 1 diff --git a/code/modules/atmos_automation/implementation/scrubbers.dm b/code/modules/atmos_automation/implementation/scrubbers.dm deleted file mode 100644 index 54829d01cea..00000000000 --- a/code/modules/atmos_automation/implementation/scrubbers.dm +++ /dev/null @@ -1,153 +0,0 @@ -/datum/automation/set_scrubber_mode - name="Scrubber: Mode" - - var/scrubber=null - var/mode=1 - - Export() - var/list/json = ..() - json["scrubber"]=scrubber - json["mode"]=mode - return json - - Import(var/list/json) - ..(json) - scrubber = json["scrubber"] - mode = text2num(json["mode"]) - - New(var/obj/machinery/computer/general_air_control/atmos_automation/aa) - ..(aa) - children=list(null) - - process() - if(scrubber) - parent.send_signal(list ("tag" = scrubber, "sigtype"="command", "scrubbing"=mode),filter = RADIO_FROM_AIRALARM) - return 0 - - GetText() - return "Set Scrubber [fmtString(scrubber)] mode to [mode?"Scrubbing":"Syphoning"]." - - Topic(href,href_list) - if(..()) return - if(href_list["set_mode"]) - mode=!mode - parent.updateUsrDialog() - return 1 - if(href_list["set_scrubber"]) - var/list/injector_names=list() - for(var/obj/machinery/atmospherics/unary/vent_scrubber/S in GLOB.machines) - if(!isnull(S.id_tag) && S.frequency == parent.frequency) - injector_names|=S.id_tag - scrubber = input("Select a scrubber:", "Scrubbers", scrubber) as null|anything in injector_names - parent.updateUsrDialog() - return 1 - -/datum/automation/set_scrubber_power - name="Scrubber: Power" - - var/scrubber=null - var/state=0 - - Export() - var/list/json = ..() - json["scrubber"]=scrubber - json["state"]=state - return json - - Import(var/list/json) - ..(json) - scrubber = json["scrubber"] - state = text2num(json["state"]) - - New(var/obj/machinery/computer/general_air_control/atmos_automation/aa) - ..(aa) - - process() - if(scrubber) - parent.send_signal(list ("tag" = scrubber, "sigtype"="command", "power"=state),filter = RADIO_FROM_AIRALARM) - - GetText() - return "Set Scrubber [fmtString(scrubber)] power to [state ? "on" : "off"]." - - Topic(href,href_list) - if(..()) return - if(href_list["set_power"]) - state = !state - parent.updateUsrDialog() - return 1 - if(href_list["set_scrubber"]) - var/list/injector_names=list() - for(var/obj/machinery/atmospherics/unary/vent_scrubber/S in GLOB.machines) - if(!isnull(S.id_tag) && S.frequency == parent.frequency) - injector_names|=S.id_tag - scrubber = input("Select a scrubber:", "Scrubbers", scrubber) as null|anything in injector_names - parent.updateUsrDialog() - return 1 - -GLOBAL_LIST_INIT(gas_labels, list( - "co2" = "CO2", - "tox" = "Plasma", - "n2o" = "N2O", - "o2" = "O2", - "n2" = "N2" -)) -/datum/automation/set_scrubber_gasses - name="Scrubber: Gasses" - - var/scrubber=null - var/list/gasses=list( - "co2" = 1, - "tox" = 0, - "n2o" = 0, - "o2" = 0, - "n2" = 0 - ) - - Export() - var/list/json = ..() - json["scrubber"]=scrubber - json["gasses"]=gasses - return json - - Import(var/list/json) - ..(json) - scrubber = json["scrubber"] - - var/list/newgasses=json["gasses"] - for(var/key in newgasses) - gasses[key]=newgasses[key] - - - New(var/obj/machinery/computer/general_air_control/atmos_automation/aa) - ..(aa) - - process() - if(scrubber) - var/list/data = list ("tag" = scrubber, "sigtype"="command") - for(var/gas in gasses) - data[gas+"_scrub"]=gasses[gas] - parent.send_signal(data,filter = RADIO_FROM_AIRALARM) - - GetText() - var/txt = "Set Scrubber [fmtString(scrubber)] to scrub " - for(var/gas in gasses) - txt += " [GLOB.gas_labels[gas]] ([gasses[gas] ? "on" : "off"])," - return txt - - Topic(href,href_list) - if(..()) return - if(href_list["tog_gas"]) - var/gas = href_list["tog_gas"] - if(!(gas in gasses)) - return - gasses[gas] = !gasses[gas] - parent.updateUsrDialog() - return 1 - if(href_list["set_scrubber"]) - var/list/injector_names=list() - for(var/obj/machinery/atmospherics/unary/vent_scrubber/S in GLOB.machines) - if(!isnull(S.id_tag) && S.frequency == parent.frequency) - injector_names|=S.id_tag - scrubber = input("Select a scrubber:", "Scrubbers", scrubber) as null|anything in injector_names - parent.updateUsrDialog() - return 1 diff --git a/code/modules/atmos_automation/implementation/sensors.dm b/code/modules/atmos_automation/implementation/sensors.dm deleted file mode 100644 index e1ef348a617..00000000000 --- a/code/modules/atmos_automation/implementation/sensors.dm +++ /dev/null @@ -1,56 +0,0 @@ - -/////////////////////////////////////////// -// sensor data -/////////////////////////////////////////// - -/datum/automation/get_sensor_data - name = "Sensor: Get Data" - var/field="temperature" - var/sensor=null - - returntype=AUTOM_RT_NUM - - Export() - var/list/json = ..() - json["sensor"]=sensor - json["field"]=field - return json - - Import(var/list/json) - ..(json) - sensor = json["sensor"] - field = json["field"] - - Evaluate() - if(sensor && field && (sensor in parent.sensor_information)) - return parent.sensor_information[sensor][field] - return 0 - - GetText() - return "[fmtString(field)] from sensor [fmtString(sensor)]" - - Topic(href,href_list) - if(..()) - return 1 - if(href_list["set_field"]) - field = input("Select a sensor output:", "Sensor Data", field) as null|anything in list( - "temperature", - "pressure", - "oxygen", - "toxins", - "nitrogen", - "carbon_dioxide" - ) - parent.updateUsrDialog() - return 1 - if(href_list["set_sensor"]) - var/list/sensor_list = list() - for(var/obj/machinery/air_sensor/G in GLOB.machines) - if(!isnull(G.id_tag) && G.frequency == parent.frequency) - sensor_list|=G.id_tag - for(var/obj/machinery/meter/M in GLOB.machines) - if(!isnull(M.id_tag) && M.frequency == parent.frequency) - sensor_list|=M.id_tag - sensor = input("Select a sensor:", "Sensor Data", field) as null|anything in sensor_list - parent.updateUsrDialog() - return 1 diff --git a/code/modules/atmos_automation/implementation/vent_pump.dm b/code/modules/atmos_automation/implementation/vent_pump.dm deleted file mode 100644 index 71d728b316d..00000000000 --- a/code/modules/atmos_automation/implementation/vent_pump.dm +++ /dev/null @@ -1,314 +0,0 @@ -/datum/automation/set_vent_pump_mode - name="Vent Pump: Mode" - - var/vent_pump = null - var/mode = "stabilize" - var/vent_type = 0//0 for unary vents, 1 for DP vents - - var/list/modes = list("stabilize","purge") - - Export() - var/list/json = ..() - json["vent_pump"] = vent_pump - json["mode"] = mode - json["vent_type"] = vent_type - return json - - Import(var/list/json) - ..(json) - vent_pump = json["vent_pump"] - mode = json["mode"] - vent_type = text2num(json["vent_type"]) - - process() - if(vent_pump) - var/dirvalue = (mode == "stabilize" ? 1 : mode == "purge" ? 0 : 1) - parent.send_signal(list("tag" = vent_pump, "direction" = dirvalue), filter = (vent_type ? RADIO_ATMOSIA : RADIO_FROM_AIRALARM)) - return 0 - - GetText() - return "Set [vent_type ? "Dual-Port" : "Unary"] vent pump [fmtString(vent_pump)] mode to [mode]." - - Topic(href,href_list) - if(..()) - return 1 - - if(href_list["set_mode"]) - mode = input("Select a mode to put this pump into.",mode) in modes - parent.updateUsrDialog() - return 1 - - if(href_list["set_vent_pump"]) - var/list/injector_names = list() - if(!vent_type) - for(var/obj/machinery/atmospherics/unary/vent_pump/I in GLOB.machines) - if(!isnull(I.id_tag) && I.frequency == parent.frequency) - injector_names |= I.id_tag - else - for(var/obj/machinery/atmospherics/binary/dp_vent_pump/I in world) -// to_chat(world, "test") - if(!isnull(I.id_tag) && I.frequency == parent.frequency) - injector_names |= I.id_tag - - vent_pump = input("Select a vent:", "Vent Pumps", vent_pump) as null|anything in injector_names - parent.updateUsrDialog() - return 1 - - if(href_list["toggle_type"]) - vent_type = !vent_type - parent.updateUsrDialog() - return 1 - -/datum/automation/set_vent_pump_power - name="Vent Pump: Power" - - var/vent_pump = null - var/state = 0 - var/mode = 0//0 for unary vents, 1 for DP vents. - - Export() - var/list/json = ..() - json["vent_pump"] = vent_pump - json["state"] = state - json["mode"] = mode - return json - - Import(var/list/json) - ..(json) - vent_pump = json["vent_pump"] - state = text2num(json["state"]) - mode = text2num(json["mode"]) - - process() - if(vent_pump) - parent.send_signal(list ("tag" = vent_pump, "power" = state), filter = (mode ? RADIO_ATMOSIA : RADIO_FROM_AIRALARM)) - - GetText() - return "Set [mode ? "Dual-Port" : "Unary"] vent pump [fmtString(vent_pump)] power to [state ? "on" : "off"]." - - Topic(href,href_list) - if(..()) - return 1 - - if(href_list["set_power"]) - state = !state - parent.updateUsrDialog() - return 1 - - if(href_list["set_vent_pump"]) - var/list/injector_names=list() - if(!mode) - for(var/obj/machinery/atmospherics/unary/vent_pump/I in GLOB.machines) - if(!isnull(I.id_tag) && I.frequency == parent.frequency) - injector_names|=I.id_tag - else - for(var/obj/machinery/atmospherics/binary/dp_vent_pump/I in world) - if(!isnull(I.id_tag) && I.frequency == parent.frequency) - injector_names|=I.id_tag - vent_pump = input("Select a vent:", "Vent Pumps", vent_pump) as null|anything in injector_names - parent.updateUsrDialog() - return 1 - - if(href_list["toggle_mode"]) - mode = !mode - parent.updateUsrDialog() - return 1 - -/datum/automation/set_vent_pump_pressure//controls the internal/external pressure bounds of a vent pump. - name = "Vent Pump: Pressure Settings" - - var/vent_pump = null - var/intpressureout = 0//these 2 are for DP vents, if it's a unary vent you're sending to it will take intpressureout as var - var/intpressurein = 0 - var/extpressure = 0 - var/mode = 0//0 for unary vents, 1 for DP vents. - - Export() - var/list/json = ..() - json["vent_pump"] = vent_pump - json["intpressureout"] = intpressureout - json["intpressurein"] = intpressurein - json["extpressure"] = extpressure - json["mode"] = mode - return json - - Import(var/list/json) - ..(json) - vent_pump = json["vent_pump"] - intpressureout = text2num(json["intpressureout"]) - intpressurein = text2num(json["intpressurein"]) - extpressure = text2num(json["extpressure"]) - mode = text2num(json["mode"]) - - New(var/obj/machinery/computer/general_air_control/atmos_automation/aa) - ..(aa) - - process() - if(vent_pump) - var/list/data = list( \ - "tag" = vent_pump, \ - ) - var/filter = RADIO_ATMOSIA - if(mode)//it's a DP vent - if(intpressurein) - data.Add(list("set_input_pressure" = intpressurein)) - if(intpressureout) - data.Add(list("set_output_pressure" = intpressureout)) - if(extpressure) - data.Add(list("set_external_pressure" = extpressure)) - - else - if(intpressureout) - data.Add(list("set_internal_pressure" = intpressureout)) - if(extpressure) - data.Add(list("set_external_pressure" = extpressure)) - filter = RADIO_FROM_AIRALARM - - parent.send_signal(data, filter) - - GetText() - if(mode)//DP vent - return {"Set dual-port vent pump [fmtString(vent_pump)] - pressure bounds: internal outwards: [fmtString(intpressureout)] - internal inwards: [fmtString(intpressurein)] - external: [fmtString(extpressure)] - "}//well that was a lot to type - else - return {"Set unary vent pump [fmtString(vent_pump)] - pressure bounds: internal: [fmtString(intpressureout)] - external: [fmtString(extpressure)] - "}//copy paste FTW - - Topic(href, href_list) - if(..()) - return 1 - - if(href_list["set_vent_pump"]) - var/list/injector_names=list() - if(mode)//DP vent selection - for(var/obj/machinery/atmospherics/binary/dp_vent_pump/I in world) - if(!isnull(I.id_tag) && I.frequency == parent.frequency) - injector_names|=I.id_tag - else - for(var/obj/machinery/atmospherics/unary/vent_pump/I in GLOB.machines) - if(!isnull(I.id_tag) && I.frequency == parent.frequency) - injector_names|=I.id_tag - vent_pump = input("Select a vent:", "Vent Pumps", vent_pump) as null|anything in injector_names - parent.updateUsrDialog() - return 1 - - if(href_list["set_intpressure_out"]) - var/response = input("Set new pressure, in kPa. \[0-[50*ONE_ATMOSPHERE]\]") as num - intpressureout = text2num(response) - intpressureout = between(0, intpressureout, 50*ONE_ATMOSPHERE) - parent.updateUsrDialog() - return 1 - - if(href_list["set_intpressure_in"]) - var/response = input("Set new pressure, in kPa. \[0-[50*ONE_ATMOSPHERE]\]") as num - intpressurein = text2num(response) - intpressurein = between(0, intpressurein, 50*ONE_ATMOSPHERE) - parent.updateUsrDialog() - return 1 - - if(href_list["set_external"]) - var/response = input(usr,"Set new pressure, in kPa. \[0-[50*ONE_ATMOSPHERE]\]") as num - extpressure = text2num(response) - extpressure = between(0, extpressure, 50*ONE_ATMOSPHERE) - parent.updateUsrDialog() - return 1 - - if(href_list["swap_modes"]) - mode = !mode - vent_pump = null//if we don't clear this is could get glitchy, by which I mean not at all, whatever, stay clean - parent.updateUsrDialog() - return 1 - -/datum/automation/set_vent_pressure_checks - name = "Vent Pump: Pressure Checks" - - var/vent_pump = null - var/checks = 1 - var/mode = 0//1 for DP vent, 0 for unary vent -/* -checks bitflags -1 = external -2 = internal in (regular internal for unaries) -4 = internal out (ignored by unaries) -*/ - - - Export() - var/list/json = ..() - json["vent_pump"] = vent_pump - json["checks"] = checks - json["mode"] = mode - return json - - Import(var/list/json) - ..(json) - vent_pump = json["vent_pump"] - checks = text2num(json["checks"]) - mode = text2num(json["mode"]) - - New(var/obj/machinery/computer/general_air_control/atmos_automation/aa) - ..(aa) - - process() - if(vent_pump) - parent.send_signal(list("tag" = vent_pump, "checks" = checks), filter = (mode ? RADIO_ATMOSIA : RADIO_FROM_AIRALARM))//not gonna bother with a sanity check here, there *should* not be any problems - - GetText() - if(mode) - return {"Set dual-port vent pump [fmtString(vent_pump)] pressure checks to: - external [checks&1 ? "Enabled" : "Disabled"] - internal inwards [checks&2 ? "Enabled" : "Disabled"] - internal outwards [checks&4 ? "Enabled" : "Disabled"] - "} - else - return {"Set unary vent pump [fmtString(vent_pump)] pressure checks to: - external: [checks&1 ? "Enabled" : "Disabled"], - internal: [checks&2 ? "Enabled" : "Disabled"] - "} - - Topic(href, href_list) - if(..()) - return 1 - - if(href_list["set_vent_pump"]) - var/list/injector_names=list() - if(mode)//DP vent selection - for(var/obj/machinery/atmospherics/binary/dp_vent_pump/I in world) - if(!isnull(I.id_tag) && I.frequency == parent.frequency) - injector_names|=I.id_tag - else - for(var/obj/machinery/atmospherics/unary/vent_pump/I in GLOB.machines) - if(!isnull(I.id_tag) && I.frequency == parent.frequency) - injector_names|=I.id_tag - vent_pump = input("Select a vent:", "Vent Pumps", vent_pump) as null|anything in injector_names - parent.updateUsrDialog() - return 1 - - if(href_list["swap_modes"]) - mode = !mode - vent_pump = null//if we don't clear this is could get glitchy, by which I mean not at all, whatever, stay clean - if(!mode && checks&4)//disable this bitflag since we're switching to unaries - checks &= ~4 - parent.updateUsrDialog() - return 1 - - if(href_list["togglecheck"]) - var/bitflagvalue = text2num(href_list["togglecheck"]) - if(mode) - if(!(bitflagvalue in list(1, 2, 4))) - return 0 - else if(!(bitflagvalue in list(1, 2))) - return 0 - - if(checks&bitflagvalue)//the bitflag is on ATM - checks &= ~bitflagvalue - else//can't not be off - checks |= bitflagvalue - parent.updateUsrDialog() - return 1 - diff --git a/code/modules/atmos_automation/statements.dm b/code/modules/atmos_automation/statements.dm deleted file mode 100644 index 3f5ed0fb6a7..00000000000 --- a/code/modules/atmos_automation/statements.dm +++ /dev/null @@ -1,457 +0,0 @@ -GLOBAL_LIST_INIT(automation_types, subtypesof(/datum/automation)) - -#define AUTOM_RT_NULL 0 -#define AUTOM_RT_NUM 1 -#define AUTOM_RT_STRING 2 -/datum/automation - // Name of the Automation - var/name="Base Automation" - - // For labelling what shit does on the AAC. - var/label="Unnamed Script" - var/desc ="No Description." - - var/obj/machinery/computer/general_air_control/atmos_automation/parent - var/list/valid_child_returntypes=list() - var/list/datum/automation/children=list() - - var/returntype=AUTOM_RT_NULL - -/datum/automation/New(var/obj/machinery/computer/general_air_control/atmos_automation/aa) - parent=aa - -/datum/automation/proc/GetText() - return "[type] doesn't override GetText()!" - -/datum/automation/proc/OnReset() - return - -/datum/automation/proc/OnRemove() - return - -/datum/automation/process() - return - -/datum/automation/proc/Evaluate() - return 0 - -/datum/automation/proc/Export() - var/list/R = list("type"=type) - - if(initial(label)!=label) - R["label"]=label - - if(initial(desc)!=desc) - R["desc"]=desc - - if(children.len>0) - var/list/C=list() - for(var/datum/automation/A in children) - C += list(A.Export()) - R["children"]=C - - return R - -/datum/automation/proc/unpackChild(var/list/cData) - if(isnull(cData) || !("type" in cData)) - return null - var/Atype=text2path(cData["type"]) - if(!(Atype in GLOB.automation_types)) - return null - var/datum/automation/A = new Atype(parent) - A.Import(cData) - return A - -/datum/automation/proc/unpackChildren(var/list/childList) - . = list() - if(childList.len>0) - for(var/list/cData in childList) - if(isnull(cData) || !("type" in cData)) - . += null - continue - var/Atype=text2path(cData["type"]) - if(!(Atype in GLOB.automation_types)) - continue - var/datum/automation/A = new Atype(parent) - A.Import(cData) - . += A - -/datum/automation/proc/packChildren(var/list/childList) - . = list() - if(childList.len>0) - for(var/datum/automation/A in childList) - if(isnull(A) || !istype(A)) - . += null - continue - . += list(A.Export()) - -/datum/automation/proc/Import(var/list/json) - if("label" in json) - label = json["label"] - - if("desc" in json) - desc = json["desc"] - - if("children" in json) - children = unpackChildren(json["children"]) - -/datum/automation/proc/fmtString(var/str) - if(str==null || str == "") - return "-----" - return str - -/datum/automation/Topic(href,href_list) - if(parent.Topic("src=[parent.UID()]", list("src" = parent)))//dumb hack to check sanity, empty topic shouldn't trigger a 1 on anything but sanity checks - return 1 - - if(href_list["add"]) - var/new_child=selectValidChildFor(usr) - if(!new_child) return 1 - children += new_child - parent.updateUsrDialog() - return 1 - - if(href_list["remove"]) - if(href_list["remove"]=="*") - var/confirm=alert("Are you sure you want to remove ALL automations?","Automations","Yes","No") - if(confirm == "No") return 0 - for(var/datum/automation/A in children) - A.OnRemove() - children.Remove(A) - else - var/datum/automation/A=locate(href_list["remove"]) - if(!A) return 1 - var/confirm=alert("Are you sure you want to remove this automation?","Automations","Yes","No") - if(confirm == "No") return 0 - A.OnRemove() - children.Remove(A) - parent.updateUsrDialog() - return 1 - - if(href_list["reset"]) - if(href_list["reset"]=="*") - for(var/datum/automation/A in children) - A.OnReset() - else - var/datum/automation/A=locate(href_list["reset"]) - if(!A) return 1 - A.OnReset() - parent.updateUsrDialog() - return 1 - return 0 // 1 if handled - -/datum/automation/proc/selectValidChildFor(var/mob/user, var/list/returntypes=valid_child_returntypes) - return parent.selectValidChildFor(src, user, returntypes) - -/////////////////////////////////////////// -// AND -/////////////////////////////////////////// -/datum/automation/and - name = "AND statement" - returntype=AUTOM_RT_NUM - valid_child_returntypes=list(AUTOM_RT_NUM) - - Evaluate() - if(children.len==0) return 0 - for(var/datum/automation/stmt in children) - if(!stmt.Evaluate()) - return 0 - return 1 - - GetText() - var/out="AND (Add)" - if(children.len>0) - out += "" - else - out += "
No statements to evaluate.
" - return out - -/////////////////////////////////////////// -// OR -/////////////////////////////////////////// - -/datum/automation/or - name = "OR statement" - returntype=AUTOM_RT_NUM - valid_child_returntypes=list(AUTOM_RT_NUM) - - Evaluate() - if(children.len==0) return 0 - for(var/datum/automation/stmt in children) - if(stmt.Evaluate()) - return 1 - return 0 - - GetText() - var/out="OR (Add)" - if(children.len>0) - out += "" - else - out += "
No statements to evaluate.
" - return out - -/////////////////////////////////////////// -// if .. then -/////////////////////////////////////////// - -/datum/automation/if_statement - name = "IF statement" - var/datum/automation/condition=null - valid_child_returntypes=list(AUTOM_RT_NULL) - var/list/valid_conditions=list(AUTOM_RT_NUM) - - var/list/children_then=list() - var/list/children_else=list() - - Export() - var/list/R = ..() - - if(children_then.len>0) - R["then"]=packChildren(children_then) - - if(children_else.len>0) - R["else"]=packChildren(children_else) - - if(condition) - R["condition"]=condition.Export() - - return R - - Import(var/list/json) - ..(json) - - if("then" in json) - children_then = unpackChildren(json["then"]) - - if("else" in json) - children_else = unpackChildren(json["else"]) - - if("condition" in json) - condition = unpackChild(json["condition"]) - - GetText() - var/out="IF (SET):
" - if(condition) - out += condition.GetText() - else - out += "Not set" - out += "
" - out += "THEN: (Add)" - if(children_then.len>0) - out += "" - else - out += "
(No statements to run)
" - out += "ELSE: (Add)" - if(children_then.len>0) - out += "" - else - out += "
(No statements to run)
" - return out - - Topic(href,href_list) - if(href_list["add"]) - var/new_child=selectValidChildFor(usr) - if(!new_child) return 1 - switch(href_list["add"]) - if("then") - children_then += new_child - if("else") - children_else += new_child - else - warning("Unknown add value given to [type]/Topic():[__LINE__]: [href]") - return 1 - parent.updateUsrDialog() - return 1 - if(href_list["remove"]) - if(href_list["remove"]=="*") - var/confirm=input("Are you sure you want to remove ALL automations?","Automations","No") in list("Yes","No") - if(confirm == "No") return 0 - for(var/datum/automation/A in children_then) - A.OnRemove() - children_then.Remove(A) - for(var/datum/automation/A in children_else) - A.OnRemove() - children_else.Remove(A) - else - var/datum/automation/A=locate(href_list["remove"]) - if(!A) return 1 - var/confirm=input("Are you sure you want to remove this automation?","Automations","No") in list("Yes","No") - if(confirm == "No") return 0 - A.OnRemove() - switch(href_list["context"]) - if("then") - children_then.Remove(A) - if("else") - children_else.Remove(A) - parent.updateUsrDialog() - return 1 - if(href_list["reset"]) - if(href_list["reset"]=="*") - for(var/datum/automation/A in children_then) - A.OnReset() - for(var/datum/automation/A in children_else) - A.OnReset() - else - var/datum/automation/A=locate(href_list["reset"]) - if(!A) return 1 - A.OnReset() - parent.updateUsrDialog() - return 1 - if(href_list["set_condition"]) - var/new_condition = selectValidChildFor(usr,valid_conditions) - testing("Selected condition: [new_condition]") - if(!new_condition) - return 1 - condition = new_condition - parent.updateUsrDialog() - return 1 - - process() - if(condition) - if(condition.Evaluate()) - for(var/datum/automation/stmt in children_then) - stmt.process() - else - for(var/datum/automation/stmt in children_else) - stmt.process() - -/////////////////////////////////////////// -// compare -/////////////////////////////////////////// - -/datum/automation/compare - name = "comparison" - var/comparator="Greater Than" - returntype=AUTOM_RT_NUM - valid_child_returntypes=list(AUTOM_RT_NUM) - - New(var/obj/machinery/computer/general_air_control/atmos_automation/aa) - ..(aa) - children=list(null,null) - - Export() - var/list/json = ..() - json["cmp"]=comparator - return json - - Import(var/list/json) - ..(json) - comparator = json["cmp"] - - Evaluate() - if(children.len<2) - return 0 - var/datum/automation/d_left =children[1] - var/datum/automation/d_right=children[2] - if(!d_left || !d_right) - return 0 - var/left=d_left.Evaluate() - var/right=d_right.Evaluate() - switch(comparator) - if("Greater Than") - return left>right - if("Greater Than or Equal to") - return left>=right - if("Less Than") - return left(Set Left) (" - if(left==null) - out += "-----" - else - out += left.GetText() - - out += ") is [comparator]: (Set Right) (" - - if(right==null) - out += "-----" - else - out += right.GetText() - out +=")" - return out - - Topic(href,href_list) - if(href_list["set_comparator"]) - comparator = input("Select a comparison operator:", "Compare", "Greater Than") in list("Greater Than","Greater Than or Equal to","Less Than","Less Than or Equal to","Equal to","NOT Equal To") - parent.updateUsrDialog() - return 1 - if(href_list["set_field"]) - var/idx = text2num(href_list["set_field"]) - var/new_child = selectValidChildFor(usr) - if(!new_child) - return 1 - children[idx] = new_child - parent.updateUsrDialog() - return 1 - -/////////////////////////////////////////// -// static value -/////////////////////////////////////////// - -/datum/automation/static_value - name = "Number" - - var/value=0 - - returntype=AUTOM_RT_NUM - - Evaluate() - return value - - Export() - var/list/json = ..() - json["value"]=value - return json - - Import(var/list/json) - ..(json) - value = text2num(json["value"]) - - GetText() - return "[value]" - - Topic(href,href_list) - if(href_list["set_value"]) - value = input("Set a value:", "Static Value", value) as num - parent.updateUsrDialog() - return 1 diff --git a/code/modules/logic/converter.dm b/code/modules/logic/converter.dm deleted file mode 100644 index c54e3fe4882..00000000000 --- a/code/modules/logic/converter.dm +++ /dev/null @@ -1,143 +0,0 @@ - -////////////////////////////////// -// Converter Gate // -////////////////////////////////// - -/* - This gate is special enough to warrant its own file, as it overrides a lot of the logic_gate procs as well as adds a new one. - - CONVERT Gates convert signaler and logic signals, to allow logic gates to actually be used in tandem with assemblies and station equipment like doors. - - While technically a mono-input device, the input and output are actually completely different types of signals, and thus incompatible without this gate. - - A signaler must be attached manually before the gate is fully functional, and will retain any frequency and code settings it had when attached. - - You can adjust these settings through a link in the multitool menu, but the receiving mode is automatically controlled by the converter. - - While attached, the ability to manually send the signal on the signaler through its menu is also disabled, to avoid messing up the logic system. -*/ - -//CONVERT Gate -/obj/machinery/logic_gate/convert - name = "CONVERT Gate" - desc = "Converts signals between radio and logic types, allowing for signaller input/output from logic systems." - icon_state = "logic_convert" - mono_input = 1 - - var/logic_output = 0 //When set to 1, the logic signal is the output. When set to 0, the logic signal is the input. - var/obj/item/assembly/signaler/attached_signaler = null - -/obj/machinery/logic_gate/convert/handle_logic() - output_state = input1_state - return - -/obj/machinery/logic_gate/convert/attackby(obj/item/O, mob/user, params) - if(tamperproof) //Extra precaution to avoid people attaching/removing signalers from tamperproofed converters - return - if(istype(O, /obj/item/assembly/signaler)) - var/obj/item/assembly/signaler/S = O - if(S.secured) - to_chat(user, "The [S] is already secured.") - return - if(attached_signaler) - to_chat(user, "There is already a device attached, remove it first.") - return - user.unEquip(S) - S.forceMove(src) - S.holder = src - S.toggle_secure() - if(logic_output) //Make sure we are set to receive if the converter is set to output logic, and send if the converter is set to accept logic input - S.receiving = 1 - else - S.receiving = 0 - attached_signaler = S - to_chat(user, "You attach \the [S] to the I/O connection port and secure it.") - return - if(attached_signaler && istype(O, /obj/item/screwdriver)) //Makes sure we remove the attached signaler before we can open up and deconstruct the machine - var/obj/item/assembly/signaler/S = attached_signaler - attached_signaler = null - S.forceMove(get_turf(src)) - S.holder = null - S.toggle_secure() - to_chat(user, "You unsecure and detach \the [S] from the I/O connection port.") - return - return ..() - -/obj/machinery/logic_gate/convert/multitool_menu(var/mob/user, var/obj/item/multitool/P) - var/logic_state_string - var/menu_contents = {" -
- "} - if(logic_output) - switch(output_state) - if(LOGIC_OFF) - logic_state_string = "OFF" - if(LOGIC_ON) - logic_state_string = "ON" - if(LOGIC_FLICKER) - logic_state_string = "FLICKER" - else - logic_state_string = "ERROR: UNKNOWN STATE" - menu_contents += {" -
Output: [format_tag("ID Tag","output_id_tag")]
-
Output State: [logic_state_string]
- "} - else - switch(input1_state) - if(LOGIC_OFF) - logic_state_string = "OFF" - if(LOGIC_ON) - logic_state_string = "ON" - if(LOGIC_FLICKER) - logic_state_string = "FLICKER" - else - logic_state_string = "ERROR: UNKNOWN STATE" - menu_contents += {" -
Input: [format_tag("ID Tag","input1_id_tag")]
-
Input State: [logic_state_string]
- "} - menu_contents += {" -
Logic Signal Designation: [logic_output ? "Output" : "Input"]
- "} - if(attached_signaler) - menu_contents += "
Adjust Signaler Settings
" - else - menu_contents += "
NO SIGNALER ATTACHED!
" - menu_contents += {" -
- "} - return menu_contents - -/obj/machinery/logic_gate/convert/multitool_topic(var/mob/user,var/list/href_list,var/obj/O) - ..() - if("toggle_logic" in href_list) - logic_output = !logic_output - if(attached_signaler) //If we have a signaler attached, make sure we update it to send/receive when we change the logic signal desgination - if(logic_output) - attached_signaler.receiving = 1 - else - attached_signaler.receiving = 0 - if(("adjust_signaler" in href_list) && attached_signaler) //Make sure that we have a signaler attached to handle this one, otherwise ignore this command - attached_signaler.interact(user, 1) - update_multitool_menu(user) - -/obj/machinery/logic_gate/convert/receive_signal(datum/signal/signal, receive_method, receive_param) - if(logic_output) - if(attached_signaler) - attached_signaler.receive_signal(signal) - return - else - ..() - -/obj/machinery/logic_gate/convert/handle_output() - if(logic_output) - ..() - else - if(attached_signaler && (output_state == LOGIC_ON || output_state == LOGIC_FLICKER)) - attached_signaler.signal() - return - -/obj/machinery/logic_gate/convert/proc/process_activation(var/obj/item/D) - if(!logic_output) //Don't bother if our input is a logic signal - return - if(D == attached_signaler) //Ignore if we somehow got called by a device that isn't what we have attached - input1_state = LOGIC_FLICKER - spawn(LOGIC_FLICKER_TIME) - if(input1_state == LOGIC_FLICKER) - input1_state = LOGIC_OFF - return diff --git a/code/modules/logic/dual_input.dm b/code/modules/logic/dual_input.dm deleted file mode 100644 index b8f915ff46d..00000000000 --- a/code/modules/logic/dual_input.dm +++ /dev/null @@ -1,100 +0,0 @@ - -////////////////////////////////// -// Dual-Input Gates // -////////////////////////////////// - - -// OR Gate -/obj/machinery/logic_gate/or - name = "OR Gate" - desc = "Outputs ON when at least one input is ON." - icon_state = "logic_or" - -/obj/machinery/logic_gate/or/handle_logic() - if(input1_state == LOGIC_ON || input1_state == LOGIC_FLICKER || input2_state == LOGIC_ON || input2_state == LOGIC_FLICKER) - if(input1_state == LOGIC_ON || input2_state == LOGIC_ON) //continuous signal takes priority in determining what to output - output_state = LOGIC_ON - else - output_state = LOGIC_FLICKER - else //Both inputs were off, so input is off - output_state = LOGIC_OFF - return - -// AND Gate -/obj/machinery/logic_gate/and - name = "AND Gate" - desc = "Outputs ON only when both inputs are ON." - icon_state = "logic_and" - -/obj/machinery/logic_gate/and/handle_logic() - if((input1_state == LOGIC_ON || input1_state == LOGIC_FLICKER) && (input2_state == LOGIC_ON || input2_state == LOGIC_FLICKER)) - if(input1_state == LOGIC_ON && input2_state == LOGIC_ON) //only output a continuous signal when both inputs are continuous signals - output_state = LOGIC_ON - else - output_state = LOGIC_FLICKER - else //At least one input was off, so output is off - output_state = LOGIC_OFF - return - -// NAND Gate -/obj/machinery/logic_gate/nand - name = "NAND Gate" - desc = "Outputs OFF only when both inputs are ON." - output_state = LOGIC_ON - icon_state = "logic_nand" - -/obj/machinery/logic_gate/nand/handle_logic() - if((input1_state == LOGIC_ON || input1_state == LOGIC_FLICKER) && (input2_state == LOGIC_ON || input2_state == LOGIC_FLICKER)) - output_state = LOGIC_OFF //Both inputs are ON/FLICKER, so output is off - else - output_state = LOGIC_ON //This can only output continuous signals - return - -// NOR Gate -/obj/machinery/logic_gate/nor - name = "NOR Gate" - desc = "Outputs OFF when at least one input is ON." - icon_state = "logic_nor" - output_state = LOGIC_ON - -/obj/machinery/logic_gate/nor/handle_logic() - if(input1_state == LOGIC_OFF && input2_state == LOGIC_OFF) //Both inputs are OFF, so output is ON - output_state = LOGIC_ON //This can only output continuous signals - else - output_state = LOGIC_OFF - return - -// XOR Gate -/obj/machinery/logic_gate/xor - name = "XOR Gate" - desc = "Outputs ON when only one input is ON." - icon_state = "logic_xor" - -/obj/machinery/logic_gate/xor/handle_logic() - if((input1_state == LOGIC_ON || input1_state == LOGIC_FLICKER) && (input2_state == LOGIC_OFF)) //Only input1 is ON/FLICKER, so output matches input1 - output_state = input1_state - else if((input2_state == LOGIC_ON || input2_state == LOGIC_FLICKER) && (input1_state == LOGIC_OFF)) //Only input2 is ON/FLICKER, so output matches input2 - output_state = input2_state - else //Both inputs are ON or OFF, so output is OFF - output_state = LOGIC_OFF - return - - -// XNOR Gate -/obj/machinery/logic_gate/xnor - name = "XNOR Gate" - desc = "Outputs ON when both inputs are ON or OFF." - icon_state = "logic_xnor" - output_state = LOGIC_ON - -/obj/machinery/logic_gate/xnor/handle_logic() - if((input1_state == LOGIC_ON || input1_state == LOGIC_FLICKER) && (input2_state == LOGIC_ON || input2_state == LOGIC_FLICKER)) //Both inputs are ON/FLICKER - if(input1_state == LOGIC_ON && input2_state == LOGIC_ON) //Only continuous signal when both inputs are ON - output_state = LOGIC_ON - else //If at least one input is FLICKER, output FLICKER - output_state = LOGIC_FLICKER - else if(input1_state == LOGIC_OFF && input2_state == LOGIC_OFF) //Both inputs are OFF - output_state = LOGIC_ON //Always continuous in this case - else //Only one input is ON/FLICKER - output_state = LOGIC_OFF - return diff --git a/code/modules/logic/logic_base.dm b/code/modules/logic/logic_base.dm deleted file mode 100644 index 542cb09bc7f..00000000000 --- a/code/modules/logic/logic_base.dm +++ /dev/null @@ -1,284 +0,0 @@ - -/obj/machinery/logic_gate - name = "Logic Base" - desc = "This does nothing except connect to things. Highly illogical, report to a coder at once if you see this in-game." - icon = 'icons/obj/computer3.dmi' - icon_state = "serverframe" - density = 1 - anchored = 1 - - settagwhitelist = list("input1_id_tag", "input2_id_tag", "output_id_tag") - - var/tamperproof = 0 //if set, will make the machine unable to be destroyed, adjusted, etc. via in-game interaction (USE ONLY FOR MAPPING STUFF) - var/mono_input = 0 //if set, will ignore input2 - - var/datum/radio_frequency/radio_connection - var/frequency = 0 - - /* - Some notes on Input/Output: - - Multiple things can be linked to the same input or output tag, just like how wires can connect multiple sources and receivers. - - For inputs, only the last signal received BEFORE a process() call will be used in the logic handling. - - Input states are updated immediately whenever an input signal is received, so it is possible to update multiple times within a single process cycle. - - This means if you have multiple connected inputs, but the last signal received before the process() call is OFF, it won't matter if the others are both ON. - - For this reason, please set up your logic properly. You can theoretically chain these infinitely, so there's no need to link multiple things to a single input. - - For outputs, the signal will attempt to be sent out every process() call, to ensure newly connected things are updated within one process cycle - - Connecting an output to multiple inputs should not cause issues, as long as you don't have multiple connections to a given input (see previous notes on inputs). - - The output state is determined immediately preceeding the signal broadcast, using the input states at the time of the process() call, not when a signal is received. - - Because of how the process cycle works, it is possible that it may take multiple cycles for a signal to fully propogate through a logic chain. - - This is because machines attempt to process in the order they were added to the scheduler. - - Building the logic gates at the end of the chain first may cause delays in signal propogation. - If you take all this into consideration when linking and using logic machinery, you should have no unexpected issues with input/output. Your design flaws are on you though. - */ - - var/input1_id_tag = null - var/input1_state = LOGIC_OFF - var/input2_id_tag = null - var/input2_state = LOGIC_OFF - var/output_id_tag = null - var/output_state = LOGIC_OFF - -/obj/machinery/logic_gate/New() - if(tamperproof) //doing this during New so we don't have to worry about forgetting to set these vars during editting / defining - resistance_flags |= ACID_PROOF - ..() - if(SSradio) - set_frequency(frequency) - component_parts = list() - var/obj/item/circuitboard/logic_gate/LG = new(null) - LG.set_type(type) - component_parts += LG - component_parts += new /obj/item/stack/cable_coil(null, 1) - -/obj/machinery/logic_gate/Initialize() - ..() - set_frequency(frequency) - -/obj/machinery/logic_gate/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency, RADIO_LOGIC) - return - -/obj/machinery/logic_gate/Destroy() - if(SSradio) - SSradio.remove_object(src, frequency) - radio_connection = null - return ..() - -/obj/machinery/logic_gate/process() - handle_logic() - handle_output() //All output will send for at least one cycle, and will attempt to send every cycle. Hopefully this won't be too taxing. - return - -/obj/machinery/logic_gate/proc/handle_logic() - return - -/obj/machinery/logic_gate/proc/handle_output() - if(!radio_connection) //can't output without this - return - - if(output_id_tag == null) //Don't output to an undefined id_tag - return - - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.source = src - - signal.data = list( - "tag" = output_id_tag, - "sigtype" = "logic", - "state" = output_state, - ) - - radio_connection.post_signal(src, signal, filter = RADIO_LOGIC) - -/obj/machinery/logic_gate/receive_signal(datum/signal/signal, receive_method, receive_param) - if(!signal.data["tag"] || ((signal.data["tag"] != input1_id_tag) && (signal.data["tag"] != input2_id_tag)) || (signal.data["sigtype"] != "logic")) - //If the signal lacks tag data, the signal's tag data doesn't match either input id tag, or is not a "logic" signal, ignore it since it's not for us - return - - if(signal.data["tag"] == input1_id_tag) //If the signal is for input1 - if(signal.data["state"] == input1_state) //If we already match, ignore the new signal since nothing changes - return - if(signal.data["state"] == LOGIC_OFF) //Shut it down and keep it off - input1_state = LOGIC_OFF - return - if(signal.data["state"] == LOGIC_ON) //Turn it on and keep it on - input1_state = LOGIC_ON - return - if(signal.data["state"] == LOGIC_FLICKER) //Turn it on then turn it off - if(input1_state == LOGIC_ON) //An existing continuous ON state overrides new flicker signals - return - input1_state = LOGIC_FLICKER - spawn(LOGIC_FLICKER_TIME) - if(input1_state == LOGIC_FLICKER) //Make sure we didn't get a new continuous signal set while we waited (those take priority) - input1_state = LOGIC_OFF - return - - //Now, you may be wondering why I included those returns. - //The answer is "If you link both inputs to the same source, you're an idiot and deserve to have it break", so yeah. Deal with it. - - if(mono_input) - //We only care about input1, so if we didn't receive a signal for that, we're done. - return - - if(signal.data["tag"] == input2_id_tag) //If the signal is for input2 (reaching this point assumes mono_input is not set) - if(signal.data["state"] == input2_state) //If we already match, ignore the new signal since nothing changes - return - if(signal.data["state"] == LOGIC_OFF) //Shut it down and keep it off - input2_state = LOGIC_OFF - return - if(signal.data["state"] == LOGIC_ON) //Turn it on and keep it on - input2_state = LOGIC_ON - return - if(signal.data["state"] == LOGIC_FLICKER) //Turn it on then turn it off - if(input2_state == LOGIC_ON) //An existing continuous ON state overrides new flicker signals - return - input2_state = LOGIC_FLICKER - spawn(LOGIC_FLICKER_TIME) - if(input2_state == LOGIC_FLICKER) //Make sure we didn't get a new continuous signal set while we waited (those take priority) - input2_state = LOGIC_OFF - return - -/obj/machinery/logic_gate/multitool_menu(var/mob/user, var/obj/item/multitool/P) - var/input1_state_string - var/input2_state_string - var/output_state_string - - switch(input1_state) - if(LOGIC_OFF) - input1_state_string = "OFF" - if(LOGIC_ON) - input1_state_string = "ON" - if(LOGIC_FLICKER) - input1_state_string = "FLICKER" - else - input1_state_string = "ERROR: UNKNOWN STATE" - - switch(input2_state) - if(LOGIC_OFF) - input2_state_string = "OFF" - if(LOGIC_ON) - input2_state_string = "ON" - if(LOGIC_FLICKER) - input2_state_string = "FLICKER" - else - input2_state_string = "ERROR: UNKNOWN STATE" - - switch(output_state) - if(LOGIC_OFF) - output_state_string = "OFF" - if(LOGIC_ON) - output_state_string = "ON" - if(LOGIC_FLICKER) - output_state_string = "FLICKER" - else - output_state_string = "ERROR: UNKNOWN STATE" - var/menu_contents = {" -
-
Input: [format_tag("ID Tag","input1_id_tag")]
-
Input State: [input1_state_string]
- "} - if(!mono_input) - menu_contents = {" -
Input 1: [format_tag("ID Tag","input1_id_tag")]
-
Input 1 State: [input1_state_string]
-
Input 2: [format_tag("ID Tag","input2_id_tag")]
-
Input 2 State: [input2_state_string]
- "} - menu_contents += {" -
Output: [format_tag("ID Tag","output_id_tag")]
-
Output State: [output_state_string]
-
- "} - return menu_contents - -/obj/machinery/logic_gate/convert/multitool_topic(var/mob/user,var/list/href_list,var/obj/O) - ..() - update_multitool_menu(user) - -/obj/machinery/logic_gate/attackby(obj/item/O, mob/user, params) - if(tamperproof) - to_chat(user, "The [src] appears to be tamperproofed! You can't interact with it!") - return 0 - if(istype(O, /obj/item/multitool)) - update_multitool_menu(user) - return 1 - if(istype(O, /obj/item/screwdriver)) - panel_open = !panel_open - to_chat(user, "You [panel_open ? "open" : "close"] the access panel.") - return 1 - if(panel_open && istype(O, /obj/item/crowbar)) - default_deconstruction_crowbar(user, O) - return 1 - return ..() - -////////////////////////////////////// -// Attack procs // -////////////////////////////////////// - -/obj/machinery/logic_gate/attack_ai(mob/user) - if(tamperproof) - to_chat(user, "The [src] appears to be tamperproofed! You can't interface with it!") - return 0 - add_hiddenprint(user) - return ui_interact(user) - -/obj/machinery/logic_gate/attack_ghost(mob/user) - if(tamperproof) - to_chat(user, "The [src] appears to be tamperproofed! You can't haunt it!") - return 0 - return ui_interact(user) - -/obj/machinery/logic_gate/attack_hand(mob/user) - if(tamperproof) - to_chat(user, "The [src] appears to be tamperproofed! You can't interact with it!") - return 0 - . = ..() - if(.) - return 0 - return interact(user) - -/obj/machinery/logic_gate/attack_alien(mob/user) //No xeno logic, that's too silly. - to_chat(user, "The [src] appears to be too complex! You can't comprehend it and back off in fear!") - return 0 - -/obj/machinery/logic_gate/attack_animal(mob/user) //No animal logic either. - to_chat(user, "The [src] appears to be beyond your comprehension! You can't fathom it!") - return 0 - -/obj/machinery/logic_gate/attack_slime(mob/user) //No slime logic. Seriously. - to_chat(user, "The [src] appears to be beyond your gelatinous understanding! You ignore it!") - return 0 - -/obj/machinery/logic_gate/emp_act(severity) - if(tamperproof) - return 0 - ..() - -/obj/machinery/logic_gate/ex_act(severity) - if(tamperproof) - return 0 - ..() - -/obj/machinery/logic_gate/blob_act(obj/structure/blob/B) - if(!tamperproof) - return ..() - -/obj/machinery/logic_gate/singularity_act() - if(tamperproof) - //This is some top-level tamperproofing right here, that's for sure. It can even defy a singularity! - return 0 - ..() - -/obj/machinery/logic_gate/bullet_act() - if(tamperproof) - return 0 - ..() - -/obj/machinery/logic_gate/tesla_act(var/power) - if(tamperproof) - tesla_zap(src, 3, power) //If we're tamperproof, we'll just bounce the full shock of the tesla zap we got hit by, so it continues on normally without diminishing - return 0 - ..() diff --git a/code/modules/logic/mono_input.dm b/code/modules/logic/mono_input.dm deleted file mode 100644 index 58b76232fa0..00000000000 --- a/code/modules/logic/mono_input.dm +++ /dev/null @@ -1,62 +0,0 @@ - -////////////////////////////////// -// Mono-Input Gates // -////////////////////////////////// - -//NOT Gate -/obj/machinery/logic_gate/not - name = "NOT Gate" - desc = "Accepts one input and outputs the reverse state." - icon_state = "logic_not" - mono_input = 1 //NOT Gates are the simplest logic gate because they only utilize one input. - output_state = LOGIC_ON //Starts with an active output, since the input will be OFF at start -/* - A quick note regarding NOT Gates: - - Connecting multiple things to the input of a NOT Gate can cause weird behaviour due to updating both when it receives a signal and when it calls process(). - - This means it will attempt to output once for every logic machine connected to its input's own process() call. - - It will then attempt to output an additional time based on the current state when it comes to its own process() call. - - For this reason, it is HIGHLY RECOMMENDED that you only connect a single signal source to the input of a NOT Gate to avoid signal spasms. - - Connecting multiple things to the output of a NOT Gate should not cause this unusual behavior. -*/ -/obj/machinery/logic_gate/not/handle_logic() //Our output will always be a continuous signal, even with a FLICKER, it just will update the output when the FLICKER ends - if(input1_state == LOGIC_ON) //Output is OFF while input is ON - output_state = LOGIC_OFF - else if(input1_state == LOGIC_FLICKER) //Output is OFF while input is FLICKER, then output returns to ON when input returns to OFF - output_state = LOGIC_OFF - spawn(LOGIC_FLICKER_TIME + 1) //Call handle_logic again after this delay (the input should update from the spawn(LOGIC_FLICKER_TIME) in receive_signal() by then) - handle_logic() - else //Output is ON while input is OFF - output_state = LOGIC_ON - handle_output() - return - -//STATUS Gate -/obj/machinery/logic_gate/status - name = "Status Gate" - desc = "Accepts one input and outputs the same state, showing a colored light based on current state." - icon_state = "logic_status" - mono_input = 1 //STATUS Gate doesn't actually perform logic operations, but instead acts as a testing conduit. - -/* - STATUS Gates are largely a diagnostics tool, but I'm sure someone will still make a logic gate rave with them anyways. - - There is no need to actually connect an output for these to work, they just need an input to sample from. - - STATUS Gates attempt to update their lights whenever they receive a signal. -*/ - -/obj/machinery/logic_gate/status/receive_signal(datum/signal/signal, receive_method, receive_params) - ..() - handle_logic() //STATUS Gate calls handle_logic() when it receives a signal to update its light and output_state - -/obj/machinery/logic_gate/status/handle_logic() - output_state = input1_state //Output is equal to input, since it is simply a connection with an attached light - if(output_state == LOGIC_OFF) //Red light when OFF - set_light(2,2,"#ff0000") - return - if(output_state == LOGIC_ON) //Green light when ON - set_light(2,2,"#009933") - return - if(output_state == LOGIC_FLICKER) //Orange light when FLICKER, then update after LOGIC_FLICKER_TIME + 1 to reflect the changed state - set_light(2,2,"#ff9900") - spawn(LOGIC_FLICKER_TIME + 1) - handle_logic() - return diff --git a/code/modules/pda/app.dm b/code/modules/pda/app.dm index 189f354446f..655bb891de5 100644 --- a/code/modules/pda/app.dm +++ b/code/modules/pda/app.dm @@ -50,8 +50,6 @@ if(!pda.notifying_programs.len) pda.overlays -= image('icons/obj/pda.dmi', "pda-r") -/datum/data/pda/proc/ - // An app has a button on the home screen and its own UI /datum/data/pda/app name = "App" diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 9579fcc6bf4..ceb3b578588 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -21,11 +21,8 @@ var/state = 0 var/locked = 0 - var/frequency = 0 - var/id_tag = null var/projectile_type = /obj/item/projectile/beam/emitter var/projectile_sound = 'sound/weapons/emitter.ogg' - var/datum/radio_frequency/radio_connection var/datum/effect_system/spark_spread/sparks /obj/machinery/power/emitter/Initialize(mapload) @@ -40,8 +37,6 @@ sparks = new sparks.attach(src) sparks.set_up(5, 1, src) - if(frequency) - set_frequency(frequency) /obj/machinery/power/emitter/RefreshParts() var/max_firedelay = 120 @@ -59,14 +54,6 @@ power_usage -= 50 * M.rating active_power_usage = power_usage - //Radio remote control -/obj/machinery/power/emitter/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - if(frequency) - radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA) - - /obj/machinery/power/emitter/verb/rotate() set name = "Rotate" set category = "Object" @@ -86,44 +73,7 @@ return rotate() -/obj/machinery/power/emitter/multitool_menu(var/mob/user,var/obj/item/multitool/P) - return {" - - "} - -/obj/machinery/power/emitter/receive_signal(datum/signal/signal) - if(!signal.data["tag"] || (signal.data["tag"] != id_tag)) - return 0 - - var/on=0 - switch(signal.data["command"]) - if("on") - on=1 - - if("off") - on=0 - - if("set") - on = signal.data["state"] > 0 - - if("toggle") - on = !active - - if(anchored && state == 2 && on != active) - active=on - var/statestr=on?"on":"off" - // Spammy message_admins("Emitter turned [statestr] by radio signal ([signal.data["command"]] @ [frequency]) in [formatJumpTo(src)]",0,1) - log_game("Emitter turned [statestr] by radio signal ([signal.data["command"]] @ [frequency]) in ([x], [y], [z]) AAC prints: [jointext(signal.data["hiddenprints"], "")]") - investigate_log("turned [statestr] by radio signal ([signal.data["command"]] @ [frequency]) AAC prints: [jointext(signal.data["hiddenprints"], "")]","singulo") - update_icon() - /obj/machinery/power/emitter/Destroy() - if(SSradio) - SSradio.remove_object(src, frequency) - radio_connection = null msg_admin_attack("Emitter deleted at ([x],[y],[z] - [ADMIN_JMP(src)])", ATKLOG_FEW) log_game("Emitter deleted at ([x],[y],[z])") investigate_log("deleted at ([x],[y],[z])","singulo") diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index d907e46247e..1a57f2e2aee 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -880,14 +880,6 @@ build_path = /obj/item/assembly/mousetrap category = list("initial", "Miscellaneous") -/datum/design/logic_board - name = "Logic Circuit" - id = "logic_board" - build_type = AUTOLATHE - materials = list(MAT_METAL = 50, MAT_GLASS = 50) - build_path = /obj/item/circuitboard/logic_gate - category = list("initial", "Electronics") - /datum/design/vendor name = "Machine Board (Vendor)" desc = "The circuit board for a Vendor." diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index 67f797ee964..826bdbf16aa 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -332,16 +332,6 @@ build_path = /obj/item/circuitboard/large_tank_control category = list("Computer Boards") -/datum/design/AAC - name = "Console Board (Atmospheric Automations Console)" - desc = "Allows for the construction of circuit boards used to build an Atmospheric Automations Console." - id = "AAC" - req_tech = list("programming" = 4, "magnets" = 2) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000) - build_path = /obj/item/circuitboard/atmos_automation - category = list("Computer Boards") - /datum/design/xenobiocamera name = "Console Board (Xenobiology Console)" desc = "Allows for the construction of circuit boards used to build xenobiology camera computers." diff --git a/code/modules/tram/tram.dm b/code/modules/tram/tram.dm deleted file mode 100644 index ea43f3fd659..00000000000 --- a/code/modules/tram/tram.dm +++ /dev/null @@ -1,251 +0,0 @@ -/obj/tram/tram_controller - name = "" - desc = "tram controller" - anchored = 1 - - var/list/tram_floors = list() - var/list/tram_walls = list() - var/list/controllers = list() - - var/list/tram = list() - - var/list/collide_list = list() - - var/list/stored_anchor = list() - var/last_played_rail - - var/automode = 0 - var/fast_mode = 0 - - var/activated = 0 - var/looptick = 0 - - var/delay_timer = null - - var/list/blacklist = list(/obj/tram/rail) - var/list/ancwhitelist = list(/obj/tram, /obj/vehicle, /obj/structure/chair, /obj/structure/grille, /obj/structure/window) - -/obj/tram/tram_controller/New() - spawn(1) - init_floors() //Search and link floors - init_walls() //Search and link walls - spawn(1) - init_tram() //Combine walls and floors and anything inside the tram - init_controllers() //Find control pads - gen_collision() //Generate collision system - -/obj/tram/tram_controller/Destroy() - for(var/obj/tram/floor/F in tram_floors) - remove_floor(F) - for(var/obj/tram/wall/TW in tram_walls) - remove_wall(TW) - for(var/obj/tram/controlpad/CP in controllers) - remove_controller(CP) - killLoop() - return ..() - -/obj/tram/tram_controller/emp_act(severity) - if(automode) automode = 0 - ..() - -/obj/tram/tram_controller/proc/startLoop() - if(activated) return - activated = 1 - spawn(0) - while(activated) - process() - looptick++ - sleep(1) - -/obj/tram/tram_controller/proc/killLoop() - activated = 0 - looptick = 0 - -/obj/tram/tram_controller/process() - update_tram() //Update combine to account for new mobs and/or objects - if(automode) - tram_rail_follow() - if(fast_mode) - tram_rail_follow() - -/obj/tram/tram_controller/proc/update_tram() - tram.Cut() - init_tram() - -/obj/tram/tram_controller/proc/tram_rail_follow() - var/stored_rail = null - if(delay_timer >= world.time) return - for(var/obj/tram/rail/RT in get_turf(src)) - if(RT.stop_duration && !delay_timer) - delay_timer = world.time + RT.stop_duration - return - if(RT.godir) - handle_move(RT.godir) - last_played_rail = RT - return - stored_rail = RT - for(var/cdir in GLOB.cardinal) - for(var/obj/tram/rail/R in get_step(src,cdir)) - if(!istype(R)) continue - if(R != last_played_rail) - handle_move(get_dir(src,R)) - last_played_rail = stored_rail - return - -//INITIALIZATION PROCS - -/obj/tram/tram_controller/proc/init_floors() - var/turf/T = get_turf(src) - if(!T) return - var/obj/tram/floor/TTF = locate(/obj/tram/floor) in T - if(istype(TTF)) add_floor(TTF) //Find and link floor on controller turf - for(var/cdir in GLOB.cardinal) - var/turf/T2 = get_step(T,cdir) - var/obj/tram/floor/TF = locate(/obj/tram/floor) in T2 - if(istype(TF)) - if(TF in tram_floors) continue - add_floor(TF) //Find and link all cardinally surrounding floors - spawn(1) - TF.spread_floors() //Do the same thing over again from the floor itself - -/obj/tram/tram_controller/proc/init_walls() - var/turf/T = get_turf(src) - if(!T) return - if(!tram_floors.len) return - var/obj/tram/floor/TTW = locate(/obj/tram/wall) in T //Find and link wall on controller turf - if(istype(TTW)) add_wall(TTW) - for(var/obj/tram/floor/TF in tram_floors) - for(var/cdir in GLOB.cardinal) - var/obj/tram/wall/TW = locate(/obj/tram/wall) in get_step(TF,cdir) - if(istype(TW)) - if(TW in tram_walls) continue - add_wall(TW) //Find and link all cardinally surrounding walls - spawn(1) - TW.spread_walls() //Do the same thing over again from the wall itself - -/obj/tram/tram_controller/proc/init_tram() - tram = tram_floors + tram_walls //Tram is everything that makes up the tram - for(var/obj/tram/OT in tram) - var/turf/T = get_turf(OT) - for(var/atom/movable/AM in T) //Including anything inside of it - if(AM in tram) continue - if(!check_validity(AM)) continue - tram += AM - if(!(src in tram)) - tram += src - -/obj/tram/tram_controller/proc/check_validity(var/atom/movable/AM) - if(!AM) - return FALSE - - if(!AM.simulated) - return FALSE - - if(is_type_in_list(AM, blacklist)) - return FALSE - - if(AM.anchored) - if(is_type_in_list(AM, ancwhitelist)) - return TRUE - return FALSE - return TRUE - -/obj/tram/tram_controller/proc/init_controllers() - for(var/obj/tram/controlpad/CCP in tram) - add_controller(CCP) //Control pad not necessary until now, easiest to search through tram - -//SYNC PROCS -//These procs are used for un/linking floors, walls, and control pads to the central tram controller - -/obj/tram/tram_controller/proc/add_floor(var/obj/tram/floor/TF) - if(!istype(TF)) return - if(TF in tram_floors) return - tram_floors += TF - TF.controller = src - -/obj/tram/tram_controller/proc/remove_floor(var/obj/tram/floor/TF) - if(!istype(TF)) return - if(TF in tram_floors) - tram_floors -= TF - TF.controller = null - -/obj/tram/tram_controller/proc/add_wall(var/obj/tram/wall/TW) - if(!istype(TW)) return - if(TW in tram_walls) return - tram_walls += TW - TW.controller = src - -/obj/tram/tram_controller/proc/remove_wall(var/obj/tram/wall/TW) - if(!istype(TW)) return - if(TW in tram_walls) - tram_walls -= TW - TW.controller = null - -/obj/tram/tram_controller/proc/add_controller(var/obj/tram/controlpad/CCT) - if(!istype(CCT)) return - if(CCT in controllers) return - controllers += CCT - CCT.tram_linked = src - -/obj/tram/tram_controller/proc/remove_controller(var/obj/tram/controlpad/CCT) - if(!istype(CCT)) return - if(CCT in controllers) - controllers -= CCT - CCT.tram_linked = null - -//COLLISION & MOVEMENT -//Collision detection system to prevent going through walls -//Tram does not use built-in byond Move(), it uses it's own logic and then forceMove()s itself. - -/obj/tram/tram_controller/proc/gen_collision() - collide_list.Cut() - var/list/collisions = list() - for(var/obj/tram/wall/W in tram_walls) - for(var/cdir in GLOB.cardinal) - var/turf/T = get_step(W, cdir) - if(istype(T)) - if(T.density) - collisions += cdir - if(!T.density) - for(var/atom/movable/A in T) - if(A.density) - if(tram.Find(A)) continue - collisions += cdir - for(var/obj/tram/floor/F in tram_floors) - for(var/cdir in GLOB.cardinal) - var/turf/T = get_step(F, cdir) - if(istype(T)) - if(T.density) - collisions += cdir - if(!T.density) - for(var/atom/movable/A in T) - if(A.density) - if(tram.Find(A)) continue - collisions += cdir - collide_list = collisions - -/obj/tram/tram_controller/proc/handle_move(var/dir) - delay_timer = null //reset delay - gen_collision() //Look for collisions - if(dir in collide_list) //Prevent moving if there are collisions in that direction - return 0 - for(var/atom/movable/A in tram) - var/turf/T = get_step(A,dir) - A.forceMove(T) //Move everything inside the tram and the tram itself manually - if(A.light_range) - A.set_light() - gen_collision() //Generate collision again - return 1 - -/obj/tram/attack_animal(var/mob/living/simple_animal/M as mob) - if(M.melee_damage_upper == 0) return - if(prob(M.melee_damage_upper)) - qdel(src) - src.visible_message("[M] has [M.attacktext] [src]!") - M.create_attack_log("attacked [src.name]") - add_attack_logs(M, src, "attacked") - -/obj/tram/bullet_act(var/obj/item/projectile/proj) - if(prob(proj.damage)) - qdel(src) - ..() diff --git a/code/modules/tram/tram_control_pad.dm b/code/modules/tram/tram_control_pad.dm deleted file mode 100644 index 3bbb3811de2..00000000000 --- a/code/modules/tram/tram_control_pad.dm +++ /dev/null @@ -1,33 +0,0 @@ -/obj/tram/controlpad - name = "tram controller interface" - desc = "Controls a tram." - icon = 'icons/obj/airlock_machines.dmi' - icon_state = "airlock_control_standby" - anchored = 1 - var/obj/tram/tram_controller/tram_linked - -/obj/tram/controlpad/attack_hand(var/mob/user) - usr.set_machine(src) - if(!tram_linked) return - var/dat = "Tram Controller" - dat += "
Tram engine: [tram_linked.automode ? "On" : "Off"]" - dat += "
Close console" - user << browse(dat, "window=trampad") - onclose(user,"trampad") - -/obj/tram/controlpad/Topic(href, href_list) - if(..()) - usr << browse(null, "window=publiclibrary") - onclose(usr, "publiclibrary") - return - - if(href_list["engine_toggle"]) - tram_linked.automode = !tram_linked.automode - if(tram_linked.automode) tram_linked.startLoop() - else tram_linked.killLoop() - else if(href_list["close"]) - usr.unset_machine() - usr << browse(null, "window=trampad") - - src.add_fingerprint(usr) - src.updateUsrDialog() diff --git a/code/modules/tram/tram_floor.dm b/code/modules/tram/tram_floor.dm deleted file mode 100644 index ede3013567b..00000000000 --- a/code/modules/tram/tram_floor.dm +++ /dev/null @@ -1,20 +0,0 @@ -/obj/tram/floor - name = "tram platform" - desc = "A holding space for a tram system." - icon = 'icons/turf/floors.dmi' - icon_state = "floor" - var/obj/tram/tram_controller/controller - anchored = 1 - layer = TURF_LAYER + 0.2 - -/obj/tram/floor/proc/spread_floors() - var/turf/T = get_turf(src) - if(!T) return - if(!controller) return - for(var/cdir in GLOB.cardinal) - var/turf/T2 = get_step(T,cdir) - var/obj/tram/floor/TF = locate(/obj/tram/floor) in T2 - if(istype(TF)) - if(TF in controller.tram_floors) continue - controller.add_floor(TF) - TF.spread_floors() diff --git a/code/modules/tram/tram_rail.dm b/code/modules/tram/tram_rail.dm deleted file mode 100644 index 254f2e8636b..00000000000 --- a/code/modules/tram/tram_rail.dm +++ /dev/null @@ -1,8 +0,0 @@ -/obj/tram/rail - name = "tram rail" - desc = "A guiding rail for trams" - icon = 'icons/obj/tram/tram_rail.dmi' - icon_state = "rail" - var/godir = null - var/stop_duration = null - layer = TURF_LAYER + 0.1 diff --git a/code/modules/tram/tram_wall.dm b/code/modules/tram/tram_wall.dm deleted file mode 100644 index b39417f5f85..00000000000 --- a/code/modules/tram/tram_wall.dm +++ /dev/null @@ -1,21 +0,0 @@ -/obj/tram/wall - name = "reinforced tram wall" - desc = "A huge chunk of reinforced metal used to shield a tram system." - icon = 'icons/turf/walls.dmi' - icon_state = "r_wall" - var/obj/tram/tram_controller/controller - anchored = 1 - density = 1 - opacity = 1 - -/obj/tram/wall/proc/spread_walls() - var/turf/T = get_turf(src) - if(!T) return - if(!controller) return - for(var/cdir in GLOB.cardinal) - var/turf/T2 = get_step(T,cdir) - var/obj/tram/wall/TW = locate(/obj/tram/wall) in T2 - if(istype(TW)) - if(TW in controller.tram_walls) continue - controller.add_wall(TW) - TW.spread_walls() diff --git a/paradise.dme b/paradise.dme index b83ea6be6df..4f93bf2fdcf 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1285,14 +1285,6 @@ #include "code\modules\assembly\signaler.dm" #include "code\modules\assembly\timer.dm" #include "code\modules\assembly\voice.dm" -#include "code\modules\atmos_automation\console.dm" -#include "code\modules\atmos_automation\statements.dm" -#include "code\modules\atmos_automation\implementation\digital_valves.dm" -#include "code\modules\atmos_automation\implementation\emitters.dm" -#include "code\modules\atmos_automation\implementation\injectors.dm" -#include "code\modules\atmos_automation\implementation\scrubbers.dm" -#include "code\modules\atmos_automation\implementation\sensors.dm" -#include "code\modules\atmos_automation\implementation\vent_pump.dm" #include "code\modules\awaymissions\corpse.dm" #include "code\modules\awaymissions\exile.dm" #include "code\modules\awaymissions\gateway.dm" @@ -1674,10 +1666,6 @@ #include "code\modules\lighting\lighting_setup.dm" #include "code\modules\lighting\lighting_source.dm" #include "code\modules\lighting\lighting_turf.dm" -#include "code\modules\logic\converter.dm" -#include "code\modules\logic\dual_input.dm" -#include "code\modules\logic\logic_base.dm" -#include "code\modules\logic\mono_input.dm" #include "code\modules\map_fluff\cyberiad.dm" #include "code\modules\map_fluff\delta.dm" #include "code\modules\map_fluff\maps.dm" @@ -2483,11 +2471,6 @@ #include "code\modules\telesci\telepad.dm" #include "code\modules\telesci\telesci_computer.dm" #include "code\modules\tooltip\tooltip.dm" -#include "code\modules\tram\tram.dm" -#include "code\modules\tram\tram_control_pad.dm" -#include "code\modules\tram\tram_floor.dm" -#include "code\modules\tram\tram_rail.dm" -#include "code\modules\tram\tram_wall.dm" #include "code\modules\vehicle\ambulance.dm" #include "code\modules\vehicle\atv.dm" #include "code\modules\vehicle\janicart.dm"