diff --git a/code/ATMOSPHERICS/datum_pipeline.dm b/code/ATMOSPHERICS/datum_pipeline.dm index cd936d1370d..1ca353d8945 100644 --- a/code/ATMOSPHERICS/datum_pipeline.dm +++ b/code/ATMOSPHERICS/datum_pipeline.dm @@ -344,7 +344,7 @@ var/pipenetwarnings = 10 corresponding.moles = trace_gas.moles*gas.volume/air_transient.volume return 1 -proc/equalize_gases(datum/gas_mixture/list/gases) +/proc/equalize_gases(datum/gas_mixture/list/gases) //Perfectly equalize all gases members instantly //Calculate totals from individual components diff --git a/code/LINDA/LINDA_system.dm b/code/LINDA/LINDA_system.dm index e5ac4ef3038..515197b7b99 100644 --- a/code/LINDA/LINDA_system.dm +++ b/code/LINDA/LINDA_system.dm @@ -32,13 +32,13 @@ if(!R) return 1 -atom/movable/proc/CanAtmosPass() +/atom/movable/proc/CanAtmosPass() return 1 -atom/proc/CanPass(atom/movable/mover, turf/target, height=1.5) +/atom/proc/CanPass(atom/movable/mover, turf/target, height=1.5) return (!density || !height) -turf/CanPass(atom/movable/mover, turf/target, height=1.5) +/turf/CanPass(atom/movable/mover, turf/target, height=1.5) if(!target) return 0 if(istype(mover)) // turf/Enter(...) will perform more advanced checks diff --git a/code/LINDA/LINDA_turf_tile.dm b/code/LINDA/LINDA_turf_tile.dm index d0abe20a58a..3fa64d47bae 100644 --- a/code/LINDA/LINDA_turf_tile.dm +++ b/code/LINDA/LINDA_turf_tile.dm @@ -1,17 +1,17 @@ -turf +/turf var/pressure_difference = 0 var/pressure_direction = 0 var/atmos_adjacent_turfs = 0 var/atmos_adjacent_turfs_amount = 0 var/atmos_supeconductivity = 0 -turf/assume_air(datum/gas_mixture/giver) //use this for machines to adjust air +/turf/assume_air(datum/gas_mixture/giver) //use this for machines to adjust air del(giver) return 0 -turf/return_air() +/turf/return_air() //Create gas mixture to hold data for passing var/datum/gas_mixture/GM = new @@ -24,7 +24,7 @@ turf/return_air() return GM -turf/remove_air(amount as num) +/turf/remove_air(amount as num) var/datum/gas_mixture/GM = new var/sum = oxygen + carbon_dioxide + nitrogen + toxins @@ -39,7 +39,7 @@ turf/remove_air(amount as num) return GM -turf/simulated +/turf/simulated var/datum/excited_group/excited_group var/excited = 0 var/recently_active = 0 @@ -51,7 +51,7 @@ turf/simulated var/temperature_archived //USED ONLY FOR SOLIDS -turf/simulated/New() +/turf/simulated/New() ..() if(!blocks_air) @@ -64,12 +64,12 @@ turf/simulated/New() air.temperature = temperature -turf/simulated/Del() +/turf/simulated/Del() if(active_hotspot) active_hotspot.Kill() ..() -turf/simulated/assume_air(datum/gas_mixture/giver) +/turf/simulated/assume_air(datum/gas_mixture/giver) if(!giver) return 0 var/datum/gas_mixture/receiver = air if(istype(receiver)) @@ -83,22 +83,22 @@ turf/simulated/assume_air(datum/gas_mixture/giver) else return ..() -turf/simulated/proc/copy_air_with_tile(turf/simulated/T) +/turf/simulated/proc/copy_air_with_tile(turf/simulated/T) if(istype(T) && T.air && air) air.copy_from(T.air) -turf/simulated/proc/copy_air(datum/gas_mixture/copy) +/turf/simulated/proc/copy_air(datum/gas_mixture/copy) if(air && copy) air.copy_from(copy) -turf/simulated/return_air() +/turf/simulated/return_air() if(air) return air else return ..() -turf/simulated/remove_air(amount as num) +/turf/simulated/remove_air(amount as num) if(air) var/datum/gas_mixture/removed = null @@ -112,7 +112,7 @@ turf/simulated/remove_air(amount as num) else return ..() -turf/simulated/proc/mimic_temperature_solid(turf/model, conduction_coefficient) +/turf/simulated/proc/mimic_temperature_solid(turf/model, conduction_coefficient) var/delta_temperature = (temperature_archived - model.temperature) if((heat_capacity > 0) && (abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)) @@ -120,7 +120,7 @@ turf/simulated/proc/mimic_temperature_solid(turf/model, conduction_coefficient) (heat_capacity*model.heat_capacity/(heat_capacity+model.heat_capacity)) temperature -= heat/heat_capacity -turf/simulated/proc/share_temperature_mutual_solid(turf/simulated/sharer, conduction_coefficient) +/turf/simulated/proc/share_temperature_mutual_solid(turf/simulated/sharer, conduction_coefficient) var/delta_temperature = (temperature_archived - sharer.temperature_archived) if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER && heat_capacity && sharer.heat_capacity) @@ -270,10 +270,10 @@ turf/simulated/proc/share_temperature_mutual_solid(turf/simulated/sharer, conduc -atom/movable/var/pressure_resistance = 5 -atom/movable/var/last_forced_movement = 0 +/atom/movable/var/pressure_resistance = 5 +/atom/movable/var/last_forced_movement = 0 -atom/movable/proc/experience_pressure_difference(pressure_difference, direction) +/atom/movable/proc/experience_pressure_difference(pressure_difference, direction) if(last_forced_movement >= world.time-10) return 0 else if(!anchored) @@ -371,7 +371,7 @@ atom/movable/proc/experience_pressure_difference(pressure_difference, direction) -turf/simulated/proc/super_conduct() +/turf/simulated/proc/super_conduct() var/conductivity_directions = 0 if(blocks_air) //Does not participate in air exchange, so will conduct heat across all four borders at this time @@ -437,7 +437,7 @@ turf/simulated/proc/super_conduct() SSair.active_super_conductivity -= src return 0 -turf/simulated/proc/consider_superconductivity(starting) +/turf/simulated/proc/consider_superconductivity(starting) if(!thermal_conductivity) return 0 @@ -453,7 +453,7 @@ turf/simulated/proc/consider_superconductivity(starting) SSair.active_super_conductivity |= src return 1 -turf/simulated/proc/radiate_to_spess() //Radiate excess tile heat to space +/turf/simulated/proc/radiate_to_spess() //Radiate excess tile heat to space if(temperature > T0C) //Considering 0 degC as te break even point for radiation in and out var/delta_temperature = (temperature_archived - 2.7) //hardcoded space temperature if((heat_capacity > 0) && (abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)) diff --git a/code/__HELPERS/bygex/bygex.dm b/code/__HELPERS/bygex/bygex.dm index b06ac322e6a..0d791273b34 100644 --- a/code/__HELPERS/bygex/bygex.dm +++ b/code/__HELPERS/bygex/bygex.dm @@ -29,7 +29,7 @@ #define LIBREGEX_LIBRARY "bin/bygex" #endif -proc +/proc regEx_compare(str, exp) return new /datum/regex(str, exp, call(LIBREGEX_LIBRARY, "regEx_compare")(str, exp)) diff --git a/code/__HELPERS/bygex/demo.dm b/code/__HELPERS/bygex/demo.dm index 00266d1338e..f89be30ded2 100644 --- a/code/__HELPERS/bygex/demo.dm +++ b/code/__HELPERS/bygex/demo.dm @@ -1,4 +1,4 @@ -mob +/mob var/expression = "\\S+" var/format = "*" diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index cc7b16db52b..ad4b622f5d9 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -150,7 +150,7 @@ //slower then list2text, but correctly processes associative lists. -proc/tg_list2text(list/list, glue=",") +/proc/tg_list2text(list/list, glue=",") if(!istype(list) || !list.len) return var/output diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 9046b9392cc..d30bba2b562 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -57,7 +57,7 @@ return -obj/item/proc/get_clamped_volume() +/obj/item/proc/get_clamped_volume() if(src.force && src.w_class) return Clamp((src.force + src.w_class) * 4, 30, 100)// Add the item's force to its weight class and multiply by 4, then clamp the value between 30 and 100 else if(!src.force && src.w_class) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index ba766fbee8c..d86f0351d75 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -177,7 +177,7 @@ var/const/tk_maxrange = 15 overlays += icon(focus.icon,focus.icon_state) return -obj/item/tk_grab/suicide_act(mob/user) +/obj/item/tk_grab/suicide_act(mob/user) user.visible_message("[user] is using \his telekinesis to choke \himself! It looks like \he's trying to commit suicide.") return (OXYLOSS) diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index 8aaafde67b2..4a7c4765b00 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -23,7 +23,7 @@ var/global/datum/getrev/revdata = new() world.log << revision return -client/verb/showrevinfo() +/client/verb/showrevinfo() set category = "OOC" set name = "Show Server Revision" set desc = "Check the current server code revision" diff --git a/code/datums/spells/lightning.dm b/code/datums/spells/lightning.dm index 352539c9bfb..47c3730349c 100644 --- a/code/datums/spells/lightning.dm +++ b/code/datums/spells/lightning.dm @@ -37,7 +37,7 @@ Discharge() sleep(1) -obj/effect/proc_holder/spell/targeted/lightning/proc/Reset(mob/user = usr) +/obj/effect/proc_holder/spell/targeted/lightning/proc/Reset(mob/user = usr) ready = 0 energy = 0 if(halo) diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index a67331a051f..740bd5e274f 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -59,7 +59,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/ var/list/teleportlocs = list() -proc/process_teleport_locs() +/proc/process_teleport_locs() for(var/area/AR in world) if(istype(AR, /area/shuttle) || istype(AR, /area/wizard_station)) continue if(teleportlocs.Find(AR.name)) continue diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm index 1ad2722026c..d5ecec94553 100644 --- a/code/game/asteroid.dm +++ b/code/game/asteroid.dm @@ -2,7 +2,7 @@ var/global/list/possiblethemes = list("organharvest","cult","wizden","cavein","x var/global/max_secret_rooms = 6 -proc/spawn_room(var/atom/start_loc, var/x_size, var/y_size, var/list/walltypes, var/floor, var/name) +/proc/spawn_room(var/atom/start_loc, var/x_size, var/y_size, var/list/walltypes, var/floor, var/name) var/list/room_turfs = list("walls"=list(),"floors"=list()) for(var/x = 0, x < x_size, x++) //sets the size of the room on the x axis @@ -36,7 +36,7 @@ proc/spawn_room(var/atom/start_loc, var/x_size, var/y_size, var/list/walltypes, ////////////// -proc/make_mining_asteroid_secret() +/proc/make_mining_asteroid_secret() var/valid = 0 var/turf/T = null var/sanity = 0 diff --git a/code/game/dna.dm b/code/game/dna.dm index 3c8e2370029..128b7aa1fc6 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -954,7 +954,7 @@ //value in range 1 to values. values must be greater than 0 //all arguments assumed to be positive integers -proc/construct_block(value, values, blocksize=DNA_BLOCK_SIZE) +/proc/construct_block(value, values, blocksize=DNA_BLOCK_SIZE) var/width = round((16**blocksize)/values) if(value < 1) value = 1 @@ -962,7 +962,7 @@ proc/construct_block(value, values, blocksize=DNA_BLOCK_SIZE) return num2hex(value, blocksize) //value is hex -proc/deconstruct_block(value, values, blocksize=DNA_BLOCK_SIZE) +/proc/deconstruct_block(value, values, blocksize=DNA_BLOCK_SIZE) var/width = round((16**blocksize)/values) value = round(hex2num(value) / width) + 1 if(value > values) diff --git a/code/game/gamemodes/abduction/gland.dm b/code/game/gamemodes/abduction/gland.dm index 17f7416f268..ccb60820159 100644 --- a/code/game/gamemodes/abduction/gland.dm +++ b/code/game/gamemodes/abduction/gland.dm @@ -50,7 +50,7 @@ uses = -1 icon_state = "health" -obj/item/gland/heals/activate() +/obj/item/gland/heals/activate() host << "You feel weird." host.adjustBruteLoss(-20) host.adjustOxyLoss(-20) @@ -62,7 +62,7 @@ obj/item/gland/heals/activate() uses = -1 icon_state = "slime" -obj/item/gland/slime/activate() +/obj/item/gland/slime/activate() host << "You feel weird." host.visible_message("[host] vomits on the floor!", \ diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index 9dd7ef6cbc7..936f3f47662 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -96,7 +96,7 @@ feedback_add_details("changeling_powers","TS") return 1 -obj/effect/proc_holder/changeling/sting/extract_dna +/obj/effect/proc_holder/changeling/sting/extract_dna name = "Extract DNA Sting" desc = "We stealthily sting a target and extract their DNA." helptext = "Will give you the DNA of your target, allowing you to transform into them." @@ -115,7 +115,7 @@ obj/effect/proc_holder/changeling/sting/extract_dna feedback_add_details("changeling_powers","ED") return 1 -obj/effect/proc_holder/changeling/sting/mute +/obj/effect/proc_holder/changeling/sting/mute name = "Mute Sting" desc = "We silently sting a human, completely silencing them for a short time." helptext = "Does not provide a warning to the victim that they have been stung, until they try to speak and cannot." @@ -129,7 +129,7 @@ obj/effect/proc_holder/changeling/sting/mute feedback_add_details("changeling_powers","MS") return 1 -obj/effect/proc_holder/changeling/sting/blind +/obj/effect/proc_holder/changeling/sting/blind name = "Blind Sting" desc = "Temporarily blinds the target." helptext = "This sting completely blinds a target for a short time." @@ -146,7 +146,7 @@ obj/effect/proc_holder/changeling/sting/blind feedback_add_details("changeling_powers","BS") return 1 -obj/effect/proc_holder/changeling/sting/LSD +/obj/effect/proc_holder/changeling/sting/LSD name = "Hallucination Sting" desc = "Causes terror in the target." helptext = "We evolve the ability to sting a target with a powerful hallucinogenic chemical. The target does not notice they have been stung, and the effect occurs after 30 to 60 seconds." @@ -162,7 +162,7 @@ obj/effect/proc_holder/changeling/sting/LSD feedback_add_details("changeling_powers","HS") return 1 -obj/effect/proc_holder/changeling/sting/cryo +/obj/effect/proc_holder/changeling/sting/cryo name = "Cryogenic Sting" desc = "We silently sting a human with a cocktail of chemicals that freeze them." helptext = "Does not provide a warning to the victim, though they will likely realize they are suddenly freezing." diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 3f5ebd20fa6..4bfeecb2247 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -418,7 +418,7 @@ ////////////////////////// //Reports player logouts// ////////////////////////// -proc/display_roundstart_logout_report() +/proc/display_roundstart_logout_report() var/msg = "Roundstart logout report\n\n" for(var/mob/living/L in mob_list) diff --git a/code/game/gamemodes/sandbox/airlock_maker.dm b/code/game/gamemodes/sandbox/airlock_maker.dm index 81f99c6297c..597064a68f0 100644 --- a/code/game/gamemodes/sandbox/airlock_maker.dm +++ b/code/game/gamemodes/sandbox/airlock_maker.dm @@ -4,7 +4,7 @@ -Sayu */ -obj/structure/door_assembly +/obj/structure/door_assembly var/datum/airlock_maker/maker = null /obj/structure/door_assembly/attack_hand() diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 92142cfe394..c55ada2a766 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -2,7 +2,7 @@ var/hsboxspawn = 1 -mob +/mob var/datum/hSB/sandbox = null /mob/proc/CanBuild() if(master_mode == "sandbox") diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 7f8ade33d02..351f87f9c37 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -188,7 +188,7 @@ return -proc/makeNewConstruct(var/mob/living/simple_animal/construct/ctype, var/mob/target, var/mob/stoner = null, cultoverride = 0) +/proc/makeNewConstruct(var/mob/living/simple_animal/construct/ctype, var/mob/target, var/mob/stoner = null, cultoverride = 0) var/mob/living/simple_animal/construct/newstruct = new ctype(get_turf(target)) newstruct.faction |= "\ref[stoner]" newstruct.key = target.key diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 00bbda4014e..6bb063181f0 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -426,7 +426,7 @@ "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer") -proc/get_all_job_icons() //For all existing HUD icons +/proc/get_all_job_icons() //For all existing HUD icons return get_all_jobs() + list("Prisoner") /proc/get_all_centcom_jobs() diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index 1bedd230c64..bc593f7fc69 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -1,14 +1,14 @@ #define AIRLOCK_CONTROL_RANGE 5 // This code allows for airlocks to be controlled externally by setting an id_tag and comm frequency (disables ID access) -obj/machinery/door/airlock +/obj/machinery/door/airlock var/id_tag var/frequency var/shockedby = list() var/datum/radio_frequency/radio_connection -obj/machinery/door/airlock/receive_signal(datum/signal/signal) +/obj/machinery/door/airlock/receive_signal(datum/signal/signal) if(!signal || signal.encryption) return if(id_tag != signal.data["tag"] || !signal.data["command"]) return @@ -49,7 +49,7 @@ obj/machinery/door/airlock/receive_signal(datum/signal/signal) send_status() -obj/machinery/door/airlock/proc/send_status() +/obj/machinery/door/airlock/proc/send_status() if(radio_connection) var/datum/signal/signal = new signal.transmission_method = 1 //radio signal @@ -62,42 +62,42 @@ obj/machinery/door/airlock/proc/send_status() radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK) -obj/machinery/door/airlock/open(surpress_send) +/obj/machinery/door/airlock/open(surpress_send) . = ..() if(!surpress_send) send_status() -obj/machinery/door/airlock/close(surpress_send) +/obj/machinery/door/airlock/close(surpress_send) . = ..() if(!surpress_send) send_status() -obj/machinery/door/airlock/proc/set_frequency(new_frequency) +/obj/machinery/door/airlock/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) if(new_frequency) frequency = new_frequency radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK) -obj/machinery/door/airlock/initialize() +/obj/machinery/door/airlock/initialize() if(frequency) set_frequency(frequency) update_icon() -obj/machinery/door/airlock/New() +/obj/machinery/door/airlock/New() ..() if(radio_controller) set_frequency(frequency) -obj/machinery/door/airlock/Destroy() +/obj/machinery/door/airlock/Destroy() if(frequency && radio_controller) radio_controller.remove_object(src,frequency) ..() -obj/machinery/airlock_sensor +/obj/machinery/airlock_sensor icon = 'icons/obj/airlock_machines.dmi' icon_state = "airlock_sensor_off" name = "airlock sensor" @@ -115,7 +115,7 @@ obj/machinery/airlock_sensor var/alert = 0 -obj/machinery/airlock_sensor/update_icon() +/obj/machinery/airlock_sensor/update_icon() if(on) if(alert) icon_state = "airlock_sensor_alert" @@ -124,7 +124,7 @@ obj/machinery/airlock_sensor/update_icon() else icon_state = "airlock_sensor_off" -obj/machinery/airlock_sensor/attack_hand(mob/user) +/obj/machinery/airlock_sensor/attack_hand(mob/user) var/datum/signal/signal = new signal.transmission_method = 1 //radio signal signal.data["tag"] = master_tag @@ -133,7 +133,7 @@ obj/machinery/airlock_sensor/attack_hand(mob/user) radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK) flick("airlock_sensor_cycle", src) -obj/machinery/airlock_sensor/process() +/obj/machinery/airlock_sensor/process() if(on) var/datum/signal/signal = new signal.transmission_method = 1 //radio signal @@ -151,21 +151,21 @@ obj/machinery/airlock_sensor/process() update_icon() -obj/machinery/airlock_sensor/proc/set_frequency(new_frequency) +/obj/machinery/airlock_sensor/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) frequency = new_frequency radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK) -obj/machinery/airlock_sensor/initialize() +/obj/machinery/airlock_sensor/initialize() set_frequency(frequency) -obj/machinery/airlock_sensor/New() +/obj/machinery/airlock_sensor/New() ..() if(radio_controller) set_frequency(frequency) -obj/machinery/airlock_sensor/Destroy() +/obj/machinery/airlock_sensor/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) ..() \ No newline at end of file diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 6020d4dad4d..87eb95b4f42 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -2,7 +2,7 @@ // AIR SENSOR (found in gaz tanks) ///////////////////////////////////////////////////////////// -obj/machinery/air_sensor +/obj/machinery/air_sensor icon = 'icons/obj/stationobjs.dmi' icon_state = "gsensor1" name = "gas sensor" @@ -26,10 +26,10 @@ obj/machinery/air_sensor var/datum/radio_frequency/radio_connection -obj/machinery/air_sensor/update_icon() +/obj/machinery/air_sensor/update_icon() icon_state = "gsensor[on]" -obj/machinery/air_sensor/process_atmos() +/obj/machinery/air_sensor/process_atmos() if(on) var/datum/signal/signal = new signal.transmission_method = 1 //radio signal @@ -63,21 +63,21 @@ obj/machinery/air_sensor/process_atmos() radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) -obj/machinery/air_sensor/proc/set_frequency(new_frequency) +/obj/machinery/air_sensor/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) frequency = new_frequency radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) -obj/machinery/air_sensor/initialize() +/obj/machinery/air_sensor/initialize() set_frequency(frequency) -obj/machinery/air_sensor/New() +/obj/machinery/air_sensor/New() ..() SSair.atmos_machinery += src if(radio_controller) set_frequency(frequency) -obj/machinery/air_sensor/Destroy() +/obj/machinery/air_sensor/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) ..() @@ -86,7 +86,7 @@ obj/machinery/air_sensor/Destroy() // GENERAL AIR CONTROL (a.k.a atmos computer) ///////////////////////////////////////////////////////////// -obj/machinery/computer/general_air_control +/obj/machinery/computer/general_air_control icon = 'icons/obj/computer.dmi' icon_state = "tank" @@ -99,29 +99,29 @@ obj/machinery/computer/general_air_control var/list/sensor_information = list() var/datum/radio_frequency/radio_connection -obj/machinery/computer/general_air_control/New() +/obj/machinery/computer/general_air_control/New() ..() if(radio_controller) set_frequency(frequency) -obj/machinery/computer/general_air_control/attack_hand(mob/user) +/obj/machinery/computer/general_air_control/attack_hand(mob/user) if(..(user)) return interact(user) //UpdateDialog() is calling /interact each tick, not attack_hand() -obj/machinery/computer/general_air_control/interact(mob/user) +/obj/machinery/computer/general_air_control/interact(mob/user) var/datum/browser/popup = new(user, "computer", name, 480, 490) //update the content every tick popup.set_content(return_text()) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) popup.open() -obj/machinery/computer/general_air_control/process() +/obj/machinery/computer/general_air_control/process() if(..()) //if the computer is not broken or unpowered src.updateDialog() -obj/machinery/computer/general_air_control/receive_signal(datum/signal/signal) +/obj/machinery/computer/general_air_control/receive_signal(datum/signal/signal) if(!signal || signal.encryption) return var/id_tag = signal.data["tag"] @@ -129,7 +129,7 @@ obj/machinery/computer/general_air_control/receive_signal(datum/signal/signal) sensor_information[id_tag] = signal.data -obj/machinery/computer/general_air_control/proc/return_text() +/obj/machinery/computer/general_air_control/proc/return_text() var/sensor_data var/count = 0 if(sensors.len) @@ -177,20 +177,20 @@ obj/machinery/computer/general_air_control/proc/return_text() return output -obj/machinery/computer/general_air_control/Destroy() +/obj/machinery/computer/general_air_control/Destroy() if(radio_controller) radio_controller.remove_object(src, frequency) ..() -obj/machinery/computer/general_air_control/proc/set_frequency(new_frequency) +/obj/machinery/computer/general_air_control/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) frequency = new_frequency radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) -obj/machinery/computer/general_air_control/initialize() +/obj/machinery/computer/general_air_control/initialize() set_frequency(frequency) -obj/machinery/computer/general_air_control/Topic(href, href_list) +/obj/machinery/computer/general_air_control/Topic(href, href_list) if(..()) return @@ -209,7 +209,7 @@ obj/machinery/computer/general_air_control/Topic(href, href_list) // LARGE TANK CONTROL ///////////////////////////////////////////////////////////// -obj/machinery/computer/general_air_control/large_tank_control +/obj/machinery/computer/general_air_control/large_tank_control icon = 'icons/obj/computer.dmi' icon_state = "tank" @@ -223,7 +223,7 @@ obj/machinery/computer/general_air_control/large_tank_control var/pressure_setting = ONE_ATMOSPHERE * 45 -obj/machinery/computer/general_air_control/large_tank_control/proc/reconnect(mob/user) //This hacky madness is the evidence of the fact that a lot of machines were never meant to be constructable, im so sorry you had to see this +/obj/machinery/computer/general_air_control/large_tank_control/proc/reconnect(mob/user) //This hacky madness is the evidence of the fact that a lot of machines were never meant to be constructable, im so sorry you had to see this var/list/IO = list() var/datum/radio_frequency/air_freq = radio_controller.return_frequency(1443) var/datum/radio_frequency/gas_freq = radio_controller.return_frequency(1441) @@ -263,7 +263,7 @@ obj/machinery/computer/general_air_control/large_tank_control/proc/reconnect(mob for(var/obj/machinery/atmospherics/unary/vent_pump/U in devices) U.broadcast_status() -obj/machinery/computer/general_air_control/large_tank_control/return_text() +/obj/machinery/computer/general_air_control/large_tank_control/return_text() var/output = "Reconnect
" if(sensors.len) //if recieving signals from nearby sensors... output += ..() //... get the data. @@ -296,7 +296,7 @@ Rate: [volume_rate] L/sec
"} return output -obj/machinery/computer/general_air_control/large_tank_control/receive_signal(datum/signal/signal) +/obj/machinery/computer/general_air_control/large_tank_control/receive_signal(datum/signal/signal) if(!signal || signal.encryption) return var/id_tag = signal.data["tag"] @@ -308,7 +308,7 @@ obj/machinery/computer/general_air_control/large_tank_control/receive_signal(dat else ..(signal) -obj/machinery/computer/general_air_control/large_tank_control/Topic(href, href_list) +/obj/machinery/computer/general_air_control/large_tank_control/Topic(href, href_list) if(..()) return @@ -352,7 +352,7 @@ obj/machinery/computer/general_air_control/large_tank_control/Topic(href, href_l // FUEL INJECTION ///////////////////////////////////////////////////////////// -obj/machinery/computer/general_air_control/fuel_injection +/obj/machinery/computer/general_air_control/fuel_injection icon = 'icons/obj/computer.dmi' icon_state = "atmos" @@ -364,7 +364,7 @@ obj/machinery/computer/general_air_control/fuel_injection var/cutoff_temperature = 2000 var/on_temperature = 1200 -obj/machinery/computer/general_air_control/fuel_injection/process() +/obj/machinery/computer/general_air_control/fuel_injection/process() if(automation) if(!radio_connection) return 0 @@ -393,7 +393,7 @@ obj/machinery/computer/general_air_control/fuel_injection/process() ..() -obj/machinery/computer/general_air_control/fuel_injection/return_text() +/obj/machinery/computer/general_air_control/fuel_injection/return_text() var/output = ..() output += "Fuel Injection System
" @@ -415,7 +415,7 @@ Rate: [volume_rate] L/sec
"} return output -obj/machinery/computer/general_air_control/fuel_injection/receive_signal(datum/signal/signal) +/obj/machinery/computer/general_air_control/fuel_injection/receive_signal(datum/signal/signal) if(!signal || signal.encryption) return var/id_tag = signal.data["tag"] @@ -425,7 +425,7 @@ obj/machinery/computer/general_air_control/fuel_injection/receive_signal(datum/s else ..(signal) -obj/machinery/computer/general_air_control/fuel_injection/Topic(href, href_list) +/obj/machinery/computer/general_air_control/fuel_injection/Topic(href, href_list) if(..()) return diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index 79d7d10aedf..8c6d3893202 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -371,7 +371,7 @@ Example usage: patient = scan(/mob/living/carbon/human, oldpatient, 1) The proc would return a human next to the bot to be set to the patient var. Pass the desired type path itself, declaring a temporary var beforehand is not required. */ -obj/machinery/bot/proc/scan(var/scan_type, var/old_target, var/scan_range = DEFAULT_SCAN_RANGE) +/obj/machinery/bot/proc/scan(var/scan_type, var/old_target, var/scan_range = DEFAULT_SCAN_RANGE) var/final_result for (var/scan in view (scan_range, src) ) //Search for something in range! if(!istype(scan, scan_type)) //Check that the thing we found is the type we want! @@ -386,7 +386,7 @@ obj/machinery/bot/proc/scan(var/scan_type, var/old_target, var/scan_range = DEFA return final_result //When the scan finds a target, run bot specific processing to select it for the next step. Empty by default. -obj/machinery/bot/proc/process_scan(var/scan_target) +/obj/machinery/bot/proc/process_scan(var/scan_target) return scan_target @@ -401,7 +401,7 @@ obj/machinery/bot/proc/process_scan(var/scan_target) Movement proc for stepping a bot through a path generated through A-star. Pass a positive integer as an argument to override a bot's default speed. */ -obj/machinery/bot/proc/bot_move(var/dest, var/move_speed) +/obj/machinery/bot/proc/bot_move(var/dest, var/move_speed) if(!dest || !path || path.len == 0) //A-star failed or a path/destination was not set. path = list() @@ -429,7 +429,7 @@ obj/machinery/bot/proc/bot_move(var/dest, var/move_speed) return 1 -obj/machinery/bot/proc/bot_step(var/dest) +/obj/machinery/bot/proc/bot_step(var/dest) if(path && path.len > 1) step_towards(src, path[1]) if(get_turf(src) == path[1]) //Successful move @@ -509,7 +509,7 @@ obj/machinery/bot/proc/bot_reset() patrol_step() return -obj/machinery/bot/proc/start_patrol() +/obj/machinery/bot/proc/start_patrol() if(tries >= 4) //Bot is trapped, so stop trying to patrol. auto_patrol = 0 @@ -648,7 +648,7 @@ obj/machinery/bot/proc/start_patrol() return -obj/machinery/bot/proc/bot_summon() +/obj/machinery/bot/proc/bot_summon() // summoned to PDA summon_step() return diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index dd5674f8f30..1f5862fc01c 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -33,7 +33,7 @@ return -proc/crewmonitor(mob/user,var/atom/source) +/proc/crewmonitor(mob/user,var/atom/source) var/jobs[0] jobs["Captain"] = 00 jobs["Head of Personnel"] = 50 @@ -138,7 +138,7 @@ proc/crewmonitor(mob/user,var/atom/source) popup.open() -proc/crewscan() +/proc/crewscan() var/list/tracked = list() for(var/mob/living/carbon/human/H in mob_list) if(istype(H.w_uniform, /obj/item/clothing/under)) diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm index e8e0fd7d30d..165d546e404 100644 --- a/code/game/machinery/overview.dm +++ b/code/game/machinery/overview.dm @@ -340,13 +340,13 @@ return -proc/getr(col) +/proc/getr(col) return hex2num( copytext(col, 2,4)) -proc/getg(col) +/proc/getg(col) return hex2num( copytext(col, 4,6)) -proc/getb(col) +/proc/getb(col) return hex2num( copytext(col, 6)) diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm index 7c3e0130a29..55b9d068630 100644 --- a/code/game/mecha/combat/honker.dm +++ b/code/game/mecha/combat/honker.dm @@ -137,7 +137,7 @@ squeak = 0 return result -obj/mecha/combat/honker/Topic(href, href_list) +/obj/mecha/combat/honker/Topic(href, href_list) ..() if (href_list["play_sound"]) switch(href_list["play_sound"]) @@ -145,7 +145,7 @@ obj/mecha/combat/honker/Topic(href, href_list) playsound(src, 'sound/misc/sadtrombone.ogg', 50) return -proc/rand_hex_color() +/proc/rand_hex_color() var/list/colors = list("0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f") var/color="" for (var/i=0;i<6;i++) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 83f69c9f94c..ec69ca4c4a3 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -204,7 +204,7 @@ return 1 -obj/mecha/proc/can_use(mob/user) +/obj/mecha/proc/can_use(mob/user) if(user != src.occupant) return 0 if(user && ismob(user)) diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index 2fbe83f9bf5..e24d2ec12d2 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -72,7 +72,7 @@ //############################## THE ACTUAL DECALS ########################### -obj/structure/sign/poster +/obj/structure/sign/poster name = "poster" desc = "A large piece of space-resistant printed paper." icon = 'icons/obj/contraband.dmi' @@ -81,7 +81,7 @@ obj/structure/sign/poster var/ruined = 0 var/subtype = 0 -obj/structure/sign/poster/New(serial,subtype) +/obj/structure/sign/poster/New(serial,subtype) serial_number = serial if(serial_number == loc) @@ -302,7 +302,7 @@ obj/structure/sign/poster/New(serial,subtype) desc += " This is a bug, please report the circumstances under which you encountered this poster at https://github.com/NTStation/NTstation13/issues." ..() -obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) +/obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wirecutters)) playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1) if(ruined) diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index 4f6350832ae..f881f095ae0 100644 --- a/code/game/objects/empulse.dm +++ b/code/game/objects/empulse.dm @@ -1,4 +1,4 @@ -proc/empulse(turf/epicenter, heavy_range, light_range, log=0) +/proc/empulse(turf/epicenter, heavy_range, light_range, log=0) if(!epicenter) return if(!istype(epicenter, /turf)) diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 0324bba060b..63620b72676 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -6,7 +6,7 @@ if(dx>=dy) return dx + (0.5*dy) //The longest side add half the shortest side approximates the hypotenuse else return dy + (0.5*dx) -proc/trange(var/Dist=0,var/turf/Center=null)//alternative to range (ONLY processes turfs and thus less intensive) +/proc/trange(var/Dist=0,var/turf/Center=null)//alternative to range (ONLY processes turfs and thus less intensive) if(Center==null) return //var/x1=((Center.x-Dist)<1 ? 1 : Center.x-Dist) @@ -19,7 +19,7 @@ proc/trange(var/Dist=0,var/turf/Center=null)//alternative to range (ONLY process return block(x1y1,x2y2) -proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1, ignorecap = 0, flame_range = 0 ,silent = 0) +/proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1, ignorecap = 0, flame_range = 0 ,silent = 0) src = null //so we don't abort once src is deleted epicenter = get_turf(epicenter) @@ -135,6 +135,6 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa -proc/secondaryexplosion(turf/epicenter, range) +/proc/secondaryexplosion(turf/epicenter, range) for(var/turf/tile in trange(range, epicenter)) tile.ex_act(2) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index e86736fbef4..58c98b443d8 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -137,7 +137,7 @@ wielded = 1 -obj/item/weapon/twohanded/ +/obj/item/weapon/twohanded/ /* * Fireaxe diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index a4fb3d5fbcb..9ac736d1a28 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -95,7 +95,7 @@ /obj/item/weapon/katana/IsShield() return 1 -obj/item/weapon/wirerod +/obj/item/weapon/wirerod name = "wired rod" desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit." icon_state = "wiredrod" @@ -107,7 +107,7 @@ obj/item/weapon/wirerod m_amt = 1875 attack_verb = list("hit", "bludgeoned", "whacked", "bonked") -obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params) ..() if(istype(I, /obj/item/weapon/shard)) var/obj/item/weapon/twohanded/spear/S = new /obj/item/weapon/twohanded/spear diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index e67788c29e0..dcffa3e0891 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -1,4 +1,4 @@ -obj/structure/door_assembly +/obj/structure/door_assembly icon = 'icons/obj/doors/door_assembly.dmi' name = "airlock assembly" @@ -17,7 +17,7 @@ obj/structure/door_assembly var/created_name = null var/heat_proof_finished = 0 //whether to heat-proof the finished airlock -obj/structure/door_assembly/New() +/obj/structure/door_assembly/New() base_icon_state = copytext(icon_state,1,lentext(icon_state)) /obj/structure/door_assembly/door_assembly_0 @@ -563,7 +563,7 @@ obj/structure/door_assembly/New() var/obj/item/stack/sheet/G = W if(G) if(G.get_amount() >= 1) - if(istype(G, /obj/item/stack/sheet/rglass) || istype(G, /obj/item/stack/sheet/glass)) + if(istype(G, /obj/item/stack/sheet/rglass) || istype(G, /obj/item/stack/sheet/glass)) playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] adds [G.name] to the airlock assembly.", \ "You start to install [G.name] into the airlock assembly...") diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 1c173316ec3..b3a52450234 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -9,7 +9,7 @@ */ -obj/structure/windoor_assembly +/obj/structure/windoor_assembly icon = 'icons/obj/doors/windoor.dmi' name = "windoor Assembly" @@ -27,12 +27,12 @@ obj/structure/windoor_assembly var/secure = 0 //Whether or not this creates a secure windoor var/state = "01" //How far the door assembly has progressed -obj/structure/windoor_assembly/New(dir=NORTH) +/obj/structure/windoor_assembly/New(dir=NORTH) ..() src.ini_dir = src.dir air_update_turf(1) -obj/structure/windoor_assembly/Destroy() +/obj/structure/windoor_assembly/Destroy() density = 0 air_update_turf(1) ..() diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 07f5ad2b6a9..cfb2758ce80 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -161,7 +161,7 @@ Note that all maps except F are oriented with north towards A. A and F are oriented with north towards D. The characters on the second cube should be upside down in this illustration, but aren't because of a lack of unicode support. */ -proc/setup_map_transitions() //listamania +/proc/setup_map_transitions() //listamania var/list/unplaced_z_levels = accessable_z_levels var/list/free_zones = list("A", "B", "C", "D", "E", "F") diff --git a/code/js/byjax.dm b/code/js/byjax.dm index c776b8ac776..bf9d7789891 100644 --- a/code/js/byjax.dm +++ b/code/js/byjax.dm @@ -34,7 +34,7 @@ callback_args - arguments for callback function Be sure to include required js functions in your page, or it'll raise an exception. */ -proc/send_byjax(receiver, control_id, target_element, new_content=null, callback=null, list/callback_args=null) +/proc/send_byjax(receiver, control_id, target_element, new_content=null, callback=null, list/callback_args=null) if(receiver && target_element && control_id) // && winexists(receiver, control_id)) var/list/argums = list(target_element, new_content) if(callback) diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index b3aa7455c17..9687091df9a 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -1,6 +1,6 @@ //Blocks an attempt to connect before even creating our client datum thing. -world/IsBanned(key,address,computer_id) +/world/IsBanned(key,address,computer_id) if (!key || !address || !computer_id) log_access("Failed Login (invalid data): [key] [address]-[computer_id]") return list("reason"="invalid login data", "desc"="Your computer provided invalid or blank information to the server on connection (byond username, IP, and Computer ID.) Provided information for reference: Username:'[key]' IP:'[address]' Computer ID:'[computer_id]' If you continue to get this error, please restart byond or contact byond support.") @@ -76,7 +76,7 @@ world/IsBanned(key,address,computer_id) world.log << "Ban database connection failure. Key [ckeytext] not checked" diary << "Ban database connection failure. Key [ckeytext] not checked" return - + var/ipquery = "" var/cidquery = "" if(address) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 8bb956f8580..069df2c14b8 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -856,7 +856,7 @@ var/global/floorIsLava = 0 //Kicks all the clients currently in the lobby. The second parameter (kick_only_afk) determins if an is_afk() check is ran, or if all clients are kicked //defaults to kicking everyone (afk + non afk clients in the lobby) //returns a list of ckeys of the kicked clients -proc/kick_clients_in_lobby(var/message, var/kick_only_afk = 0) +/proc/kick_clients_in_lobby(var/message, var/kick_only_afk = 0) var/list/kicked_client_names = list() for(var/client/C in clients) if(istype(C.mob, /mob/new_player)) diff --git a/code/modules/admin/banappearance.dm b/code/modules/admin/banappearance.dm index be59efff4f7..9b9aadc49bb 100644 --- a/code/modules/admin/banappearance.dm +++ b/code/modules/admin/banappearance.dm @@ -94,7 +94,7 @@ DEBUG return 0 /* -proc/DB_ban_isappearancebanned(var/playerckey) +/proc/DB_ban_isappearancebanned(var/playerckey) establish_db_connection() if(!dbcon.IsConnected()) return diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 52524559573..d3300a758cd 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -104,7 +104,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return -proc/send2irc_adminless_only(source, msg, requiredflags = R_BAN) +/proc/send2irc_adminless_only(source, msg, requiredflags = R_BAN) var/admin_number_total = 0 //Total number of admins var/admin_number_afk = 0 //Holds the number of admins who are afk var/admin_number_ignored = 0 //Holds the number of admins without +BAN (so admins who are not really admins) @@ -131,7 +131,7 @@ proc/send2irc_adminless_only(source, msg, requiredflags = R_BAN) send2irc(source, "[msg] - All admins AFK ([admin_number_afk]/[admin_number_total]) or skipped ([admin_number_ignored]/[admin_number_total])") return admin_number_present -proc/send2irc(msg,msg2) +/proc/send2irc(msg,msg2) if(config.useircbot) shell("python nudge.py [msg] [msg2]") return \ No newline at end of file diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 4ea28b8d491..0f869613fa7 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -1,4 +1,4 @@ -client/proc/one_click_antag() +/client/proc/one_click_antag() set name = "Create Antagonist" set desc = "Auto-create an antagonist of your choice" set category = "Admin" diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index c8a8f98ea55..87ebd141d1d 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -96,7 +96,7 @@ feedback_add_details("admin_verb","GOD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -proc/cmd_admin_mute(whom, mute_type, automute = 0) +/proc/cmd_admin_mute(whom, mute_type, automute = 0) if(!whom) return diff --git a/code/modules/assembly/helpers.dm b/code/modules/assembly/helpers.dm index ddef24d49b0..0c8005ad0bc 100644 --- a/code/modules/assembly/helpers.dm +++ b/code/modules/assembly/helpers.dm @@ -1,29 +1,29 @@ -proc/isassembly(O) +/proc/isassembly(O) if(istype(O, /obj/item/device/assembly)) return 1 return 0 -proc/isigniter(O) +/proc/isigniter(O) if(istype(O, /obj/item/device/assembly/igniter)) return 1 return 0 -proc/isinfared(O) +/proc/isinfared(O) if(istype(O, /obj/item/device/assembly/infra)) return 1 return 0 -proc/isprox(O) +/proc/isprox(O) if(istype(O, /obj/item/device/assembly/prox_sensor)) return 1 return 0 -proc/issignaler(O) +/proc/issignaler(O) if(istype(O, /obj/item/device/assembly/signaler)) return 1 return 0 -proc/istimer(O) +/proc/istimer(O) if(istype(O, /obj/item/device/assembly/timer)) return 1 return 0 diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index baba97a0b2c..8a5621d4148 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -49,7 +49,7 @@ explosion(loc,2,5,11) reload = 0 -/*mob/proc/openfire() +/*/mob/proc/openfire() var/A A = input("Area to jump bombard", "Open Fire", A) in teleportlocs var/area/thearea = teleportlocs[A] diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 3a8ef41caef..7859b0d9b98 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -49,7 +49,7 @@ -obj/machinery/gateway/centerstation/process() +/obj/machinery/gateway/centerstation/process() if(stat & (NOPOWER)) if(active) toggleoff() return diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index f578a34ce14..dd24a3399c1 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -1,4 +1,4 @@ -proc/createRandomZlevel() +/proc/createRandomZlevel() if(awaydestinations.len) //crude, but it saves another var! return diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 51f560c29f9..f223ca126fb 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -212,19 +212,19 @@ icon_state = "cold" item_state = "cold" -obj/item/clothing/glasses/heat +/obj/item/clothing/glasses/heat name = "heat goggles" desc = "A pair of goggles meant for high temperatures." icon_state = "heat" item_state = "heat" -obj/item/clothing/glasses/orange +/obj/item/clothing/glasses/orange name = "orange glasses" desc = "A sweet pair of orange shades." icon_state = "orangeglasses" item_state = "orangeglasses" -obj/item/clothing/glasses/red +/obj/item/clothing/glasses/red name = "red glasses" desc = "A sweet pair of red shades." icon_state = "redglasses" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index cc4c13cfa43..16e472094d2 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -146,7 +146,7 @@ item_state = "gladiator" flags_inv = HIDEMASK|HIDEEARS|HIDEEYES -obj/item/clothing/head/helmet/redtaghelm +/obj/item/clothing/head/helmet/redtaghelm name = "red laser tag helmet" desc = "They have chosen their own end." icon_state = "redtaghelm" @@ -156,7 +156,7 @@ obj/item/clothing/head/helmet/redtaghelm // Offer about the same protection as a hardhat. flags_inv = HIDEEARS|HIDEEYES -obj/item/clothing/head/helmet/bluetaghelm +/obj/item/clothing/head/helmet/bluetaghelm name = "blue laser tag helmet" desc = "They'll need more men." icon_state = "bluetaghelm" diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index f70bffdf3d7..bf59b9d3278 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -226,7 +226,7 @@ icon_state = "clown" item_state = "clown_hat" -obj/item/clothing/mask/gas/clown_hat/attack_self(mob/user) +/obj/item/clothing/mask/gas/clown_hat/attack_self(mob/user) var/mob/M = usr var/list/options = list() diff --git a/code/modules/detectivework/detective_work.dm b/code/modules/detectivework/detective_work.dm index ee5b0f262eb..9be12ce096e 100644 --- a/code/modules/detectivework/detective_work.dm +++ b/code/modules/detectivework/detective_work.dm @@ -1,8 +1,8 @@ //CONTAINS: Suit fibers and Detective's Scanning Computer -atom/var/list/suit_fibers +/atom/var/list/suit_fibers -atom/proc/add_fibers(mob/living/carbon/human/M) +/atom/proc/add_fibers(mob/living/carbon/human/M) if(M.gloves && istype(M.gloves,/obj/item/clothing/)) var/obj/item/clothing/gloves/G = M.gloves if(G.transfer_blood > 1) //bloodied gloves transfer blood to touched objects diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index 8729f1b1627..eb933f8ce7a 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -1,4 +1,4 @@ -mob/living/carbon/proc/dream() +/mob/living/carbon/proc/dream() dreaming = 1 var/list/dreams = list( "an ID card","a bottle","a familiar face","a crewmember","a toolbox","a security officer","the captain", @@ -20,7 +20,7 @@ mob/living/carbon/proc/dream() dreaming = 0 return 1 -mob/living/carbon/proc/handle_dreams() +/mob/living/carbon/proc/handle_dreams() if(prob(5) && !dreaming) dream() -mob/living/carbon/var/dreaming = 0 \ No newline at end of file +/mob/living/carbon/var/dreaming = 0 \ No newline at end of file diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 6ca06a27ee7..e3aa865a141 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -11,7 +11,7 @@ Gunshots/explosions/opening doors/less rare audio (done) */ -mob/living/carbon/ +/mob/living/carbon/ var/image/halimage var/image/halbody var/obj/halitem @@ -19,7 +19,7 @@ mob/living/carbon/ var/handling_hal = 0 var/hal_crit = 0 -mob/living/carbon/proc/handle_hallucinations() +/mob/living/carbon/proc/handle_hallucinations() if(handling_hal) return handling_hal = 1 diff --git a/code/modules/flufftext/TextFilters.dm b/code/modules/flufftext/TextFilters.dm index 64a0ea5e688..f7f6929d2e1 100644 --- a/code/modules/flufftext/TextFilters.dm +++ b/code/modules/flufftext/TextFilters.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 //is this shit even used at all -proc/NewStutter(phrase,stunned) +/proc/NewStutter(phrase,stunned) phrase = html_decode(phrase) var/list/split_phrase = text2list(phrase," ") //Split it up into words. @@ -37,10 +37,10 @@ proc/NewStutter(phrase,stunned) return sanitize(list2text(split_phrase," ")) -proc/Stagger(mob/M,d) //Technically not a filter, but it relates to drunkenness. +/proc/Stagger(mob/M,d) //Technically not a filter, but it relates to drunkenness. step(M, pick(d,turn(d,90),turn(d,-90))) -proc/Ellipsis(original_msg, chance = 50, keep_words) +/proc/Ellipsis(original_msg, chance = 50, keep_words) if(chance <= 0) return "..." if(chance >= 100) return original_msg diff --git a/code/modules/food&drinks/kitchen machinery/smartfridge.dm b/code/modules/food&drinks/kitchen machinery/smartfridge.dm index 35c84a26620..9746ee4a83c 100644 --- a/code/modules/food&drinks/kitchen machinery/smartfridge.dm +++ b/code/modules/food&drinks/kitchen machinery/smartfridge.dm @@ -217,7 +217,7 @@ toggle_drying(1) update_icon() -obj/machinery/smartfridge/drying_rack/load() //For updating the filled overlay +/obj/machinery/smartfridge/drying_rack/load() //For updating the filled overlay ..() update_icon() diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index fa9772f3517..78a92dc1481 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -98,7 +98,7 @@ ..() return -obj/machinery/hydroponics/process() +/obj/machinery/hydroponics/process() var/needs_update = 0 // Checks if the icon needs updating so we don't redraw empty trays every time @@ -205,7 +205,7 @@ obj/machinery/hydroponics/process() update_icon() return -obj/machinery/hydroponics/proc/nutrimentMutation() +/obj/machinery/hydroponics/proc/nutrimentMutation() if (mutmod == 0) return if (mutmod == 1) @@ -224,7 +224,7 @@ obj/machinery/hydroponics/proc/nutrimentMutation() return return -obj/machinery/hydroponics/update_icon() +/obj/machinery/hydroponics/update_icon() //Refreshes the icon and sets the luminosity overlays.Cut() @@ -277,7 +277,7 @@ obj/machinery/hydroponics/update_icon() return -obj/machinery/hydroponics/proc/UpdateDescription() +/obj/machinery/hydroponics/proc/UpdateDescription() desc = null if (planted) desc = "[src] has [myseed.plantname] planted." @@ -286,7 +286,7 @@ obj/machinery/hydroponics/proc/UpdateDescription() else if (harvest) desc += " It's ready to harvest." -obj/machinery/hydroponics/proc/weedinvasion() // If a weed growth is sufficient, this happens. +/obj/machinery/hydroponics/proc/weedinvasion() // If a weed growth is sufficient, this happens. dead = 0 var/oldPlantName if(myseed) // In case there's nothing in the tray beforehand @@ -322,7 +322,7 @@ obj/machinery/hydroponics/proc/weedinvasion() // If a weed growth is sufficient, visible_message("[oldPlantName] overtaken by [myseed.plantname].") -obj/machinery/hydroponics/proc/mutate(var/lifemut = 2, var/endmut = 5, var/productmut = 1, var/yieldmut = 2, var/potmut = 25) // Mutates the current seed +/obj/machinery/hydroponics/proc/mutate(var/lifemut = 2, var/endmut = 5, var/productmut = 1, var/yieldmut = 2, var/potmut = 25) // Mutates the current seed if(!planted) return adjustSLife(rand(-lifemut,lifemut)) @@ -332,11 +332,11 @@ obj/machinery/hydroponics/proc/mutate(var/lifemut = 2, var/endmut = 5, var/produ adjustSPot(rand(-potmut,potmut)) -obj/machinery/hydroponics/proc/hardmutate() +/obj/machinery/hydroponics/proc/hardmutate() mutate(4, 10, 2, 4, 50) -obj/machinery/hydroponics/proc/mutatespecie() // Mutagent produced a new plant! +/obj/machinery/hydroponics/proc/mutatespecie() // Mutagent produced a new plant! if(!planted || dead) return @@ -363,7 +363,7 @@ obj/machinery/hydroponics/proc/mutatespecie() // Mutagent produced a new plant! visible_message("[oldPlantName] suddenly mutated into [myseed.plantname]!") -obj/machinery/hydroponics/proc/mutateweed() // If the weeds gets the mutagent instead. Mind you, this pretty much destroys the old plant +/obj/machinery/hydroponics/proc/mutateweed() // If the weeds gets the mutagent instead. Mind you, this pretty much destroys the old plant if( weedlevel > 5 ) if(myseed) qdel(myseed) @@ -385,7 +385,7 @@ obj/machinery/hydroponics/proc/mutateweed() // If the weeds gets the mutagent in usr << "The few weeds in [src] seem to react, but only for a moment..." -obj/machinery/hydroponics/proc/plantdies() // OH NOES!!!!! I put this all in one function to make things easier +/obj/machinery/hydroponics/proc/plantdies() // OH NOES!!!!! I put this all in one function to make things easier health = 0 harvest = 0 pestlevel = 0 // Pests die @@ -394,7 +394,7 @@ obj/machinery/hydroponics/proc/plantdies() // OH NOES!!!!! I put this all in one dead = 1 -obj/machinery/hydroponics/proc/mutatepest() +/obj/machinery/hydroponics/proc/mutatepest() if(pestlevel > 5) visible_message("The pests seem to behave oddly...") for(var/i=0, i<3, i++) @@ -403,7 +403,7 @@ obj/machinery/hydroponics/proc/mutatepest() else usr << "The pests seem to behave oddly, but quickly settle down..." -obj/machinery/hydroponics/proc/applyChemicals(var/datum/reagents/S) +/obj/machinery/hydroponics/proc/applyChemicals(var/datum/reagents/S) if(myseed) myseed.on_chem_reaction(S) //In case seeds have some special interactions with special chems, currently only used by vines @@ -577,7 +577,7 @@ obj/machinery/hydroponics/proc/applyChemicals(var/datum/reagents/S) if(1 to 32) mutatepest() else usr << "Nothing happens..." -obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, params) //Called when mob user "attacks" it with object O if(istype(O, /obj/item/weapon/reagent_containers) ) // Syringe stuff (and other reagent containers now too) diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index 00886646eb3..c7169acc0c3 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -52,7 +52,7 @@ anchored = 1 var/piles = list() -obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if(isrobot(user)) return @@ -112,7 +112,7 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob user.set_machine(src) interact(user) -obj/machinery/seed_extractor/interact(mob/user as mob) +/obj/machinery/seed_extractor/interact(mob/user as mob) if (stat) return 0 @@ -132,7 +132,7 @@ obj/machinery/seed_extractor/interact(mob/user as mob) popup.open() return -obj/machinery/seed_extractor/Topic(var/href, var/list/href_list) +/obj/machinery/seed_extractor/Topic(var/href, var/list/href_list) if(..()) return usr.set_machine(src) @@ -163,7 +163,7 @@ obj/machinery/seed_extractor/Topic(var/href, var/list/href_list) src.updateUsrDialog() return -obj/machinery/seed_extractor/proc/add(var/obj/item/seeds/O as obj) +/obj/machinery/seed_extractor/proc/add(var/obj/item/seeds/O as obj) if(contents.len >= 999) usr << "\The [src] is full." return 0 diff --git a/code/modules/mob/living/carbon/human/blood.dm b/code/modules/mob/living/carbon/human/blood.dm index 644bed501f1..e8b46b5ca51 100644 --- a/code/modules/mob/living/carbon/human/blood.dm +++ b/code/modules/mob/living/carbon/human/blood.dm @@ -238,7 +238,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 return D return res -proc/blood_incompatible(donor,receiver,donor_species,receiver_species) +/proc/blood_incompatible(donor,receiver,donor_species,receiver_species) if(!donor || !receiver) return 0 if(donor_species && receiver_species) @@ -261,7 +261,7 @@ proc/blood_incompatible(donor,receiver,donor_species,receiver_species) //AB is a universal receiver. return 0 -proc/blood_splatter(var/target,var/datum/reagent/blood/source,var/large) +/proc/blood_splatter(var/target,var/datum/reagent/blood/source,var/large) var/obj/effect/decal/cleanable/blood/B var/decal_type = /obj/effect/decal/cleanable/blood/splatter diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 844f2399a19..7c0773877c1 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -44,7 +44,7 @@ else heal_overall_damage(0, -amount) -mob/living/carbon/human/proc/hat_fall_prob() +/mob/living/carbon/human/proc/hat_fall_prob() var/multiplier = 1 var/obj/item/clothing/head/H = head var/loose = 40 diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 6aa9bda4d25..100251062c5 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -25,7 +25,7 @@ apply_damage(P.damage, P.damage_type, def_zone, armor) return P.on_hit(src, armor, def_zone) -proc/vol_by_throwforce_and_or_w_class(var/obj/item/I) +/proc/vol_by_throwforce_and_or_w_class(var/obj/item/I) if(!I) return 0 if(I.throwforce && I.w_class) diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index 04b3e7d804c..c8a84bd520e 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -61,7 +61,7 @@ if(time >= EGG_INCUBATION_TIME) Pop() -obj/item/body_egg/changeling_egg/proc/Pop() +/obj/item/body_egg/changeling_egg/proc/Pop() if(!used) var/mob/living/carbon/monkey/M = new(affected_mob.loc) if(owner) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index dd575cd6adf..08b04e3afff 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -105,27 +105,27 @@ return 1 return 0 -proc/isobserver(A) +/proc/isobserver(A) if(istype(A, /mob/dead/observer)) return 1 return 0 -proc/isnewplayer(A) +/proc/isnewplayer(A) if(istype(A, /mob/new_player)) return 1 return 0 -proc/isovermind(A) +/proc/isovermind(A) if(istype(A, /mob/camera/blob)) return 1 return 0 -proc/isdrone(A) +/proc/isdrone(A) if(istype(A, /mob/living/simple_animal/drone)) return 1 return 0 -proc/isorgan(A) +/proc/isorgan(A) if(istype(A, /obj/item/organ/limb)) return 1 return 0 @@ -203,7 +203,7 @@ proc/isorgan(A) p++ return sanitize(t) -proc/slur(n) +/proc/slur(n) var/phrase = html_decode(n) var/leng = lentext(phrase) var/counter=lentext(phrase) @@ -268,7 +268,7 @@ proc/slur(n) return message -proc/Gibberish(t, p)//t is the inputted message, and any value higher than 70 for p will cause letters to be replaced instead of added +/proc/Gibberish(t, p)//t is the inputted message, and any value higher than 70 for p will cause letters to be replaced instead of added /* Turn text into complete gibberish! */ var/returntext = "" for(var/i = 1, i <= length(t), i++) @@ -393,13 +393,13 @@ It's fairly easy to fix if dealing with single letters but not so much with comp else hud_used.action_intent.icon_state = "help" -proc/is_blind(A) +/proc/is_blind(A) if(ismob(A)) var/mob/B = A return B.eye_blind return 0 -proc/is_special_character(mob/M) // returns 1 for special characters and 2 for heroes of gamemode //moved out of admins.dm because things other than admin procs were calling this. +/proc/is_special_character(mob/M) // returns 1 for special characters and 2 for heroes of gamemode //moved out of admins.dm because things other than admin procs were calling this. if(!ticker || !ticker.mode) return 0 if(!istype(M)) diff --git a/code/modules/ninja/ninja_event.dm b/code/modules/ninja/ninja_event.dm index 82f81d8df7d..4ade64d3605 100644 --- a/code/modules/ninja/ninja_event.dm +++ b/code/modules/ninja/ninja_event.dm @@ -175,7 +175,7 @@ Contents: return new_ninja -proc/create_ninja_mind(key) +/proc/create_ninja_mind(key) var/datum/mind/Mind = new /datum/mind(key) Mind.assigned_role = "Space Ninja" Mind.special_role = "Space Ninja" diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 202f6d1efad..378ec945f85 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -332,7 +332,7 @@ else injectaialbum(icon, img, desc, pixel_x, pixel_y, blueprintsinject) -obj/item/device/camera/siliconcam/proc/selectpicture(var/obj/item/device/camera/siliconcam/targetloc) +/obj/item/device/camera/siliconcam/proc/selectpicture(var/obj/item/device/camera/siliconcam/targetloc) var/list/nametemp = list() var/find if(targetloc.aipictures.len == 0) @@ -345,7 +345,7 @@ obj/item/device/camera/siliconcam/proc/selectpicture(var/obj/item/device/camera/ if(q.fields["name"] == find) return q -obj/item/device/camera/siliconcam/proc/viewpichelper(var/obj/item/device/camera/siliconcam/targetloc) +/obj/item/device/camera/siliconcam/proc/viewpichelper(var/obj/item/device/camera/siliconcam/targetloc) var/obj/item/weapon/photo/P = new/obj/item/weapon/photo() var/datum/picture/selection = selectpicture(targetloc) if(selection) @@ -357,7 +357,7 @@ obj/item/device/camera/siliconcam/proc/viewpichelper(var/obj/item/device/camera/ usr << P.desc qdel(P) //so 10 thousand picture items are not left in memory should an AI take them and then view them all -obj/item/device/camera/siliconcam/proc/viewpictures(user) +/obj/item/device/camera/siliconcam/proc/viewpictures(user) if(isrobot(user)) // Cyborg var/mob/living/silicon/robot/C = src.loc var/obj/item/device/camera/siliconcam/Cinfo @@ -399,7 +399,7 @@ obj/item/device/camera/siliconcam/proc/viewpictures(user) src.in_camera_mode = 1 usr << "Camera Mode activated" -obj/item/device/camera/siliconcam/robot_camera/proc/borgprint() +/obj/item/device/camera/siliconcam/robot_camera/proc/borgprint() var/list/nametemp = list() var/find var/datum/picture/selection diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 3d4e85ace35..7858a77f460 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -1,5 +1,5 @@ //like orange but only checks north/south/east/west for one step -proc/cardinalrange(var/center) +/proc/cardinalrange(var/center) var/list/things = list() for(var/direction in cardinal) var/turf/T = get_step(center, direction) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 9dbe3dd6345..de17516ede9 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1136,7 +1136,7 @@ // val 0=off, 1=off(auto) 2=on 3=on(auto) // on 0=off, 1=on, 2=autooff -obj/machinery/power/apc/proc/autoset(var/val, var/on) +/obj/machinery/power/apc/proc/autoset(var/val, var/on) if(on==0) if(val==2) // if on, return off return 0 diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 1413ba421b7..96c8a2ba049 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -218,21 +218,21 @@ By design, d1 is the smallest direction and d2 is the highest // Power related /////////////////////////////////////////// -obj/structure/cable/proc/add_avail(var/amount) +/obj/structure/cable/proc/add_avail(var/amount) if(powernet) powernet.newavail += amount -obj/structure/cable/proc/add_load(var/amount) +/obj/structure/cable/proc/add_load(var/amount) if(powernet) powernet.load += amount -obj/structure/cable/proc/surplus() +/obj/structure/cable/proc/surplus() if(powernet) return powernet.avail-powernet.load else return 0 -obj/structure/cable/proc/avail() +/obj/structure/cable/proc/avail() if(powernet) return powernet.avail else diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index f1e7f779d14..97b8b3b418b 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -16,7 +16,7 @@ clumsy_check = 0 needs_permit = 0 -obj/item/weapon/gun/energy/laser/retro +/obj/item/weapon/gun/energy/laser/retro name ="retro laser" icon_state = "retro" desc = "An older model of the basic lasergun, no longer used by Nanotrasen's private security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws." diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index dff570dca52..aa1d4931ea4 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -126,5 +126,5 @@ can_flashlight = 0 trigger_guard = 0 -obj/item/weapon/gun/energy/gun/turret/update_icon() +/obj/item/weapon/gun/energy/gun/turret/update_icon() icon_state = initial(icon_state) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 4618586611b..e87808254e6 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -62,7 +62,7 @@ /obj/item/projectile/beam/emitter/singularity_pull() return //don't want the emitters to miss -obj/item/projectile/beam/emitter/Destroy() +/obj/item/projectile/beam/emitter/Destroy() return QDEL_HINT_PUTINPOOL /obj/item/projectile/lasertag diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index a6972b2a825..cfd97edfe3a 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -123,7 +123,7 @@ . = ..() wabbajack(change) -proc/wabbajack(mob/living/M) +/proc/wabbajack(mob/living/M) if(istype(M)) if(istype(M, /mob/living) && M.stat != DEAD) if(M.notransform) return diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 5714b2f7b12..80e24ad2fba 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -208,7 +208,7 @@ obj/item/projectile/kinetic/New() damage = 5 range = 1 -obj/item/projectile/plasma/New() +/obj/item/projectile/plasma/New() var/turf/proj_turf = get_turf(src) if(!istype(proj_turf, /turf)) return diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 9ed9035156b..49461bfc6fc 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -589,7 +589,7 @@ var/const/INGEST = 2 // Convenience proc to create a reagents holder for an atom // Max vol is maximum volume of holder -atom/proc/create_reagents(var/max_vol) +/atom/proc/create_reagents(var/max_vol) if(reagents) qdel(reagents) reagents = new/datum/reagents(max_vol) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index e2eed1af72d..92235739bdb 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -654,7 +654,7 @@ var/wait = null var/obj/item/weapon/reagent_containers/glass/beaker = null -obj/machinery/computer/pandemic/New() +/obj/machinery/computer/pandemic/New() ..() update_icon() @@ -689,7 +689,7 @@ obj/machinery/computer/pandemic/New() return D.GetDiseaseID() return null -obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime) +/obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime) wait = 1 update_icon() spawn(waittime) diff --git a/code/modules/reagents/Chemistry-Recipes/Others.dm b/code/modules/reagents/Chemistry-Recipes/Others.dm index 8b3a009d860..99866fd47eb 100644 --- a/code/modules/reagents/Chemistry-Recipes/Others.dm +++ b/code/modules/reagents/Chemistry-Recipes/Others.dm @@ -228,14 +228,14 @@ required_reagents = list("toxin" = 1, "water" = 4) result_amount = 5 -datum/chemical_reaction/weedkiller +/datum/chemical_reaction/weedkiller name = "Weed Killer" id = "weedkiller" result = "weedkiller" required_reagents = list("toxin" = 1, "ammonia" = 4) result_amount = 5 -datum/chemical_reaction/pestkiller +/datum/chemical_reaction/pestkiller name = "Pest Killer" id = "pestkiller" result = "pestkiller" diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 7ee1436f18c..b4b25eb9e42 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -324,7 +324,7 @@ var/obj/machinery/blackbox_recorder/blackbox query_insert.Execute() -proc/feedback_set(var/variable,var/value) +/proc/feedback_set(var/variable,var/value) if (!blackbox) return var/datum/feedback_variable/FV = blackbox.find_feedback_datum(variable) @@ -333,7 +333,7 @@ proc/feedback_set(var/variable,var/value) FV.set_value(value) -proc/feedback_inc(var/variable,var/value) +/proc/feedback_inc(var/variable,var/value) if (!blackbox) return var/datum/feedback_variable/FV = blackbox.find_feedback_datum(variable) @@ -342,7 +342,7 @@ proc/feedback_inc(var/variable,var/value) FV.inc(value) -proc/feedback_dec(var/variable,var/value) +/proc/feedback_dec(var/variable,var/value) if (!blackbox) return var/datum/feedback_variable/FV = blackbox.find_feedback_datum(variable) @@ -351,7 +351,7 @@ proc/feedback_dec(var/variable,var/value) FV.dec(value) -proc/feedback_set_details(var/variable,var/details) +/proc/feedback_set_details(var/variable,var/details) if (!blackbox) return var/datum/feedback_variable/FV = blackbox.find_feedback_datum(variable) @@ -360,11 +360,11 @@ proc/feedback_set_details(var/variable,var/details) FV.set_details(details) -proc/feedback_add_details(var/variable,var/details) +/proc/feedback_add_details(var/variable,var/details) if (!blackbox) return var/datum/feedback_variable/FV = blackbox.find_feedback_datum(variable) if (!FV) return - FV.add_details(details) + FV.add_details(details) diff --git a/code/modules/scripting/IDE.dm b/code/modules/scripting/IDE.dm index a7a9f25b1da..b82fd0dfde2 100644 --- a/code/modules/scripting/IDE.dm +++ b/code/modules/scripting/IDE.dm @@ -1,4 +1,4 @@ -client/verb/tcssave() +/client/verb/tcssave() set hidden = 1 if(mob.machine || issilicon(mob)) if(telecomms_check(mob)) @@ -22,7 +22,7 @@ client/verb/tcssave() src << output("Failed to save: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror") -client/verb/tcscompile() +/client/verb/tcscompile() set hidden = 1 if(mob.machine || issilicon(mob)) if(telecomms_check(mob)) @@ -78,7 +78,7 @@ client/verb/tcscompile() src << output(null, "tcserror") src << output("Failed to compile: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror") -client/verb/tcsrun() +/client/verb/tcsrun() set hidden = 1 if(mob.machine || issilicon(mob)) if(telecomms_check(mob)) @@ -114,7 +114,7 @@ client/verb/tcsrun() src << output("Failed to run: Unable to locate machine. (Back up your code before exiting the window!)", "tcserror") -client/verb/exittcs() +/client/verb/exittcs() set hidden = 1 if(mob.machine || issilicon(mob)) if(telecomms_check(mob)) @@ -126,7 +126,7 @@ client/verb/exittcs() if(mob in Machine.viewingcode) Machine.viewingcode.Remove(mob) -client/verb/tcsrevert() +/client/verb/tcsrevert() set hidden = 1 if(mob.machine || issilicon(mob)) if(telecomms_check(mob)) @@ -155,7 +155,7 @@ client/verb/tcsrevert() src << output("Failed to revert: Unable to locate machine.", "tcserror") -client/verb/tcsclearmem() +/client/verb/tcsclearmem() set hidden = 1 if(mob.machine || issilicon(mob)) if(telecomms_check(mob)) diff --git a/code/modules/scripting/Interpreter/Scope.dm b/code/modules/scripting/Interpreter/Scope.dm index 50da8047079..9389bdc84be 100644 --- a/code/modules/scripting/Interpreter/Scope.dm +++ b/code/modules/scripting/Interpreter/Scope.dm @@ -2,7 +2,7 @@ Class: scope A runtime instance of a block. Used internally by the interpreter. */ -scope +/scope var scope/parent = null node/BlockDefinition/block diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm index a25e97df091..63327f69d70 100644 --- a/code/modules/surgery/helpers.dm +++ b/code/modules/surgery/helpers.dm @@ -58,7 +58,7 @@ -proc/get_location_modifier(mob/M) +/proc/get_location_modifier(mob/M) var/turf/T = get_turf(M) if(locate(/obj/structure/optable, T)) return 1 diff --git a/code/modules/surgery/organs/helpers.dm b/code/modules/surgery/organs/helpers.dm index 36f5d2ef599..dd0529d4344 100644 --- a/code/modules/surgery/organs/helpers.dm +++ b/code/modules/surgery/organs/helpers.dm @@ -1,12 +1,12 @@ -mob/proc/getorgan() +/mob/proc/getorgan() return -mob/living/carbon/getorgan(typepath) +/mob/living/carbon/getorgan(typepath) return (locate(typepath) in internal_organs) -mob/proc/getlimb() +/mob/proc/getlimb() return -mob/living/carbon/human/getlimb(typepath) +/mob/living/carbon/human/getlimb(typepath) return (locate(typepath) in organs) diff --git a/code/orphaned procs/AStar.dm b/code/orphaned procs/AStar.dm index bc0c4ed27bf..eb491ee48ff 100644 --- a/code/orphaned procs/AStar.dm +++ b/code/orphaned procs/AStar.dm @@ -162,7 +162,7 @@ length to avoid portals or something i guess?? Not that they're counted right no return path //the actual algorithm -proc/AStar(start, end, atom, dist, maxnodes, maxnodedepth = 30, mintargetdist, minnodedist, id=null, var/turf/exclude=null) +/proc/AStar(start, end, atom, dist, maxnodes, maxnodedepth = 30, mintargetdist, minnodedist, id=null, var/turf/exclude=null) var/PriorityQueue/open = new /PriorityQueue(/proc/PathWeightCompare) //the open list, ordered using the PathWeightCompare proc, from lower f to higher var/list/closed = new() //the closed list var/list/path = null //the returned path, if any diff --git a/code/orphaned procs/statistics.dm b/code/orphaned procs/statistics.dm index c23b1e66e32..3f979dbc302 100644 --- a/code/orphaned procs/statistics.dm +++ b/code/orphaned procs/statistics.dm @@ -1,4 +1,4 @@ -proc/sql_poll_players() +/proc/sql_poll_players() if(!config.sql_enabled) return var/playercount = 0 @@ -16,7 +16,7 @@ proc/sql_poll_players() log_game("SQL ERROR during player polling. Error : \[[err]\]\n") -proc/sql_poll_admins() +/proc/sql_poll_admins() if(!config.sql_enabled) return var/admincount = admins.len @@ -30,17 +30,17 @@ proc/sql_poll_admins() var/err = query.ErrorMsg() log_game("SQL ERROR during admin polling. Error : \[[err]\]\n") -proc/sql_report_round_start() +/proc/sql_report_round_start() // TODO if(!config.sql_enabled) return -proc/sql_report_round_end() +/proc/sql_report_round_end() // TODO if(!config.sql_enabled) return -proc/sql_report_death(var/mob/living/carbon/human/H) +/proc/sql_report_death(var/mob/living/carbon/human/H) if(!config.sql_enabled) return if(!H) @@ -75,7 +75,7 @@ proc/sql_report_death(var/mob/living/carbon/human/H) log_game("SQL ERROR during death reporting. Error : \[[err]\]\n") -proc/sql_report_cyborg_death(var/mob/living/silicon/robot/H) +/proc/sql_report_cyborg_death(var/mob/living/silicon/robot/H) if(!config.sql_enabled) return if(!H) @@ -113,7 +113,7 @@ proc/sql_report_cyborg_death(var/mob/living/silicon/robot/H) //This proc is used for feedback. It is executed at round end. -proc/sql_commit_feedback() +/proc/sql_commit_feedback() if(!blackbox) log_game("Round ended without a blackbox recorder. No feedback was sent to the database.") return diff --git a/code/world.dm b/code/world.dm index 1e782468ce5..1668266c1c4 100644 --- a/code/world.dm +++ b/code/world.dm @@ -245,7 +245,7 @@ #define FAILED_DB_CONNECTION_CUTOFF 5 var/failed_db_connections = 0 -proc/setup_database_connection() +/proc/setup_database_connection() if(failed_db_connections >= FAILED_DB_CONNECTION_CUTOFF) //If it failed to establish a connection more than 5 times in a row, don't bother attempting to connect anymore. return 0 @@ -271,7 +271,7 @@ proc/setup_database_connection() return . //This proc ensures that the connection to the feedback database (global variable dbcon) is established -proc/establish_db_connection() +/proc/establish_db_connection() if(failed_db_connections > FAILED_DB_CONNECTION_CUTOFF) return 0 diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index 411af48189e..b499705f10d 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -1,4 +1,4 @@ -client/script = {"