From 8516b07eeedb3ee402d8137925f771ffd0517fe0 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Wed, 13 Mar 2024 14:43:40 -0300 Subject: [PATCH] please do not end your paths with / --- code/datums/beam.dm | 2 +- code/datums/callback.dm | 26 +++++++------------ code/datums/components/fullauto.dm | 4 +-- code/datums/elements/strippable.dm | 2 +- code/game/gamemodes/objective.dm | 6 ++--- .../items/stacks/sheets/sheet_types.dm | 4 +-- code/game/objects/items/storage/backpack.dm | 2 +- code/game/objects/items/storage/belt.dm | 2 +- code/game/objects/items/weaponry.dm | 2 +- .../blood_contract/blood_contract.dm | 2 +- .../clockcult/clock_helpers/clock_rites.dm | 2 +- .../traitor/equipment/Malf_Modules.dm | 2 +- .../traitor/equipment/contractor.dm | 2 +- code/modules/cargo/packs/medical.dm | 4 +-- code/modules/cargo/packs/misc.dm | 6 ++--- code/modules/events/spacevine.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 2 +- .../hostile/mining_mobs/gutlunch.dm | 2 +- code/modules/power/apc.dm | 2 +- .../projectiles/projectile/special/rocket.dm | 2 +- 20 files changed, 35 insertions(+), 43 deletions(-) diff --git a/code/datums/beam.dm b/code/datums/beam.dm index c70c3c4848..80d1aebd24 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -167,5 +167,5 @@ /atom/proc/Beam(atom/BeamTarget,icon_state="b_beam",icon='icons/effects/beam.dmi',time=50, maxdistance=10,beam_type=/obj/effect/ebeam,beam_sleep_time = 3) var/datum/beam/newbeam = new(src,BeamTarget,icon,icon_state,time,maxdistance,beam_type,beam_sleep_time) - INVOKE_ASYNC(newbeam, TYPE_PROC_REF(/datum/beam/, Start)) + INVOKE_ASYNC(newbeam, TYPE_PROC_REF(/datum/beam, Start)) return newbeam diff --git a/code/datums/callback.dm b/code/datums/callback.dm index bc27092040..0ef11a8c6e 100644 --- a/code/datums/callback.dm +++ b/code/datums/callback.dm @@ -5,10 +5,10 @@ * ## USAGE * * ``` - * var/datum/callback/C = new(object|null, /proc/type/path|"procstring", arg1, arg2, ... argn) + * var/datum/callback/C = new(object|null, PROC_REF(procname), arg1, arg2, ... argn) * var/timerid = addtimer(C, time, timertype) * you can also use the compiler define shorthand - * var/timerid = addtimer(CALLBACK(object|null, PROC_REF(type/path|procstring), arg1, arg2, ... argn), time, timertype) + * var/timerid = addtimer(CALLBACK(object|null, PROC_REF(procname), arg1, arg2, ... argn), time, timertype) * ``` * * Note: proc strings can only be given for datum proc calls, global procs must be proc paths @@ -26,27 +26,19 @@ * ## PROC TYPEPATH SHORTCUTS * (these operate on paths, not types, so to these shortcuts, datum is NOT a parent of atom, etc...) * - * ### global proc while in another global proc: - * .procname - * - * `CALLBACK(GLOBAL_PROC, .some_proc_here)` - * - * ### proc defined on current(src) object (when in a /proc/ and not an override) OR overridden at src or any of it's parents: - * .procname - * - * `CALLBACK(src, .some_proc_here)` - * - * ### when the above doesn't apply: - *PROC_REF(procname) + * ### proc defined on current(src) object OR overridden at src or any of it's parents: + * PROC_REF(procname) * * `CALLBACK(src, PROC_REF(some_proc_here))` * + * ### global proc + * GLOBAL_PROC_REF(procname) * - * proc defined on a parent of a some type + * `CALLBACK(src, GLOBAL_PROC_REF(some_proc_here))` * - * `TYPE_PROC_REF(/some/type/, some_proc_here)` * - * Otherwise you must always provide the full typepath of the proc (/type/of/thing/proc/procname) + * ### proc defined on some type + * TYPE_PROC_REF(/some/type/, some_proc_here) */ /datum/callback diff --git a/code/datums/components/fullauto.dm b/code/datums/components/fullauto.dm index 136c71eeaa..fbf51c7f41 100644 --- a/code/datums/components/fullauto.dm +++ b/code/datums/components/fullauto.dm @@ -73,8 +73,8 @@ RegisterSignal(shooter, COMSIG_MOB_CLIENT_LOGOUT, PROC_REF(autofire_off)) if(!QDELETED(shooter)) UnregisterSignal(shooter, COMSIG_MOB_CLIENT_LOGIN) - parent.RegisterSignal(src, COMSIG_AUTOFIRE_ONMOUSEDOWN, TYPE_PROC_REF(/obj/item/gun/, autofire_bypass_check)) - parent.RegisterSignal(parent, COMSIG_AUTOFIRE_SHOT, TYPE_PROC_REF(/obj/item/gun/, do_autofire)) + parent.RegisterSignal(src, COMSIG_AUTOFIRE_ONMOUSEDOWN, TYPE_PROC_REF(/obj/item/gun, autofire_bypass_check)) + parent.RegisterSignal(parent, COMSIG_AUTOFIRE_SHOT, TYPE_PROC_REF(/obj/item/gun, do_autofire)) /datum/component/automatic_fire/proc/autofire_off(datum/source) diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index c3b734d1f7..4238bc7a87 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -57,7 +57,7 @@ strip_menu = new(source, src) LAZYSET(strip_menus, source, strip_menu) - INVOKE_ASYNC(strip_menu, TYPE_PROC_REF(/datum/, ui_interact), user) + INVOKE_ASYNC(strip_menu, TYPE_PROC_REF(/datum, ui_interact), user) /// A representation of an item that can be stripped down /datum/strippable_item diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index f0dadc8350..ab087dceb0 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1291,9 +1291,9 @@ GLOBAL_LIST_EMPTY(possible_sabotages) var/payout_bonus = 0 var/area/dropoff = null var/static/list/blacklisted_areas = typecacheof(list(/area/ai_monitored/turret_protected, - /area/solars/, - /area/ruin/, //thank you station space ruins - /area/science/test_area/, + /area/solars, + /area/ruin, //thank you station space ruins + /area/science/test_area, /area/shuttle/)) /datum/objective/contract/proc/generate_dropoff() // Generate a random valid area on the station that the dropoff will happen. diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 745fa6a321..90c65293f7 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -66,7 +66,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 40, one_per_turf = TRUE, on_floor = TRUE, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75), \ null, \ new/datum/stack_recipe("computer frame", /obj/structure/frame/computer, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \ - new/datum/stack_recipe("modular console", /obj/machinery/modular_computer/console/buildable/, 10, time = 25, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("modular console", /obj/machinery/modular_computer/console/buildable, 10, time = 25, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("machine frame", /obj/structure/frame/machine, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \ null, \ new /datum/stack_recipe_list("airlock assemblies", list( \ @@ -257,7 +257,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \ new/datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),\ null, \ - new/datum/stack_recipe("wooden chair", /obj/structure/chair/wood/, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("wooden chair", /obj/structure/chair/wood, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("winged wooden chair", /obj/structure/chair/wood/wings, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("plywood chair", /obj/structure/chair/comfy/plywood, 4, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ null, \ diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index dcacd00fe2..7b5e1b61df 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -387,7 +387,7 @@ /obj/item/hypospray/mkii, /obj/item/sensor_device, /obj/item/radio, - /obj/item/clothing/gloves/, + /obj/item/clothing/gloves, /obj/item/lazarus_injector, /obj/item/bikehorn/rubberducky, /obj/item/clothing/mask/surgical, diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index f4fa638f7f..b2ba7dbcbe 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -153,7 +153,7 @@ /obj/item/hypospray/mkii, /obj/item/sensor_device, /obj/item/radio, - /obj/item/clothing/gloves/, + /obj/item/clothing/gloves, /obj/item/lazarus_injector, /obj/item/bikehorn/rubberducky, /obj/item/clothing/mask/surgical, diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index b5a83169a5..2c669e23a9 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -1094,7 +1094,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/melee/flyswatter/Initialize(mapload) . = ..() strong_against = typecacheof(list( - /mob/living/simple_animal/hostile/poison/bees/, + /mob/living/simple_animal/hostile/poison/bees, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/cockroach, /obj/item/queen_bee, diff --git a/code/modules/antagonists/blood_contract/blood_contract.dm b/code/modules/antagonists/blood_contract/blood_contract.dm index 84dfcd8f2f..4de55f49e1 100644 --- a/code/modules/antagonists/blood_contract/blood_contract.dm +++ b/code/modules/antagonists/blood_contract/blood_contract.dm @@ -24,7 +24,7 @@ return H.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY) var/obj/effect/mine/pickup/bloodbath/B = new(H) - INVOKE_ASYNC(B, TYPE_PROC_REF(/obj/effect/mine/pickup/bloodbath/, mineEffect), H) //could use moving out from the mine + INVOKE_ASYNC(B, TYPE_PROC_REF(/obj/effect/mine/pickup/bloodbath, mineEffect), H) //could use moving out from the mine for(var/mob/living/carbon/human/P in GLOB.player_list) if(P == H || HAS_TRAIT(P, TRAIT_NO_MIDROUND_ANTAG)) diff --git a/code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm b/code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm index 2b2720dea3..aa9312974c 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm @@ -201,7 +201,7 @@ name = "Rite of the Vessel" //The name of the rite desc = "This rite is used to summon a soul vessel, a special posibrain that makes whoever has their brain put into it loyal to the Justiciar.,\ When put into a cyborg shell, the created cyborg will automatically be a servant of Ratvar." - required_ingredients = list(/obj/item/stack/cable_coil, /obj/item/stock_parts/cell/, /obj/item/organ/cyberimp) + required_ingredients = list(/obj/item/stack/cable_coil, /obj/item/stock_parts/cell, /obj/item/organ/cyberimp) power_cost = 2500 //These things are pretty strong, I won't lie requires_full_power = TRUE cast_time = 50 diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index 552001335e..44e70ebb34 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -796,7 +796,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( for(var/obj/machinery/light/L in GLOB.machines) if(is_station_level(L.z)) L.no_emergency = TRUE - INVOKE_ASYNC(L, TYPE_PROC_REF(/obj/machinery/light/, update), FALSE) + INVOKE_ASYNC(L, TYPE_PROC_REF(/obj/machinery/light, update), FALSE) CHECK_TICK to_chat(owner, "Emergency light connections severed.") owner.playsound_local(owner, 'sound/effects/light_flicker.ogg', 50, FALSE) diff --git a/code/modules/antagonists/traitor/equipment/contractor.dm b/code/modules/antagonists/traitor/equipment/contractor.dm index a14e18a179..9877794097 100644 --- a/code/modules/antagonists/traitor/equipment/contractor.dm +++ b/code/modules/antagonists/traitor/equipment/contractor.dm @@ -24,7 +24,7 @@ var/contract_rep = 0 var/list/hub_items = list() var/list/purchased_items = list() - var/static/list/contractor_items = typecacheof(/datum/contractor_item/, TRUE) + var/static/list/contractor_items = typecacheof(/datum/contractor_item, TRUE) var/datum/syndicate_contract/current_contract var/list/datum/syndicate_contract/assigned_contracts = list() diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm index 58cae36015..333421a8fd 100644 --- a/code/modules/cargo/packs/medical.dm +++ b/code/modules/cargo/packs/medical.dm @@ -235,8 +235,8 @@ name = "Medipen Variety-Pak" desc = "Contains eight different medipens in three different varieties, to assist in quickly treating seriously injured patients." cost = 2000 - contains = list(/obj/item/reagent_containers/hypospray/medipen/, - /obj/item/reagent_containers/hypospray/medipen/, + contains = list(/obj/item/reagent_containers/hypospray/medipen, + /obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/hypospray/medipen/ekit, /obj/item/reagent_containers/hypospray/medipen/ekit, /obj/item/reagent_containers/hypospray/medipen/ekit, diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index 990e32df67..ba3f6b87d7 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -46,9 +46,9 @@ // cost = CARGO_CRATE_VALUE * 3 cost = 1500 contains = list(/obj/item/book/codex_gigas, - /obj/item/book/manual/random/, - /obj/item/book/manual/random/, - /obj/item/book/manual/random/, + /obj/item/book/manual/random, + /obj/item/book/manual/random, + /obj/item/book/manual/random, /obj/item/book/random, /obj/item/book/random, /obj/item/book/random) diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 44703a3b24..0861ea7caa 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -379,7 +379,7 @@ event.announce_to_ghosts(SV) START_PROCESSING(SSobj, src) vine_mutations_list = list() - init_subtypes(/datum/spacevine_mutation/, vine_mutations_list) + init_subtypes(/datum/spacevine_mutation, vine_mutations_list) if(potency != null) mutativeness = potency / 10 if(production != null) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 6815fbe859..1539c744d4 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -47,7 +47,7 @@ AddElement(/datum/element/flavor_text/carbon, _name = "Flavor Text", _save_key = "flavor_text") AddElement(/datum/element/flavor_text/carbon/temporary, "", "Set Pose (Temporary Flavor Text)", "This should be used only for things pertaining to the current round!", _save_key = null) AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/vore/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _always_show = TRUE, _save_key = "ooc_notes", _examine_no_preview = TRUE) - AddElement(/datum/element/strippable, GLOB.strippable_human_items, TYPE_PROC_REF(/mob/living/carbon/human/, should_strip)) + AddElement(/datum/element/strippable, GLOB.strippable_human_items, TYPE_PROC_REF(/mob/living/carbon/human, should_strip)) /mob/living/carbon/human/Destroy() QDEL_NULL(physiology) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm index 87a5010dce..5ed68e6f40 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm @@ -42,7 +42,7 @@ animal_species = /mob/living/simple_animal/hostile/asteroid/gutlunch childtype = list(/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck = 45, /mob/living/simple_animal/hostile/asteroid/gutlunch/guthen = 55) - wanted_objects = list(/obj/effect/decal/cleanable/blood/gibs/xeno, /obj/effect/decal/cleanable/blood/gibs/, /obj/item/bodypart, /obj/item/organ/appendix, /obj/item/organ/ears, /obj/item/organ/eyes, /obj/item/organ/heart, /obj/item/organ/liver, \ + wanted_objects = list(/obj/effect/decal/cleanable/blood/gibs/xeno, /obj/effect/decal/cleanable/blood/gibs, /obj/item/bodypart, /obj/item/organ/appendix, /obj/item/organ/ears, /obj/item/organ/eyes, /obj/item/organ/heart, /obj/item/organ/liver, \ /obj/item/organ/lungs, /obj/item/organ/stomach, /obj/item/organ/tongue) // So we dont eat implants or brains. Still can eat robotic stuff thats subtyped of base line but thats a issue for another day. var/obj/item/udder/gutlunch/udder = null diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 2147232a1d..ae95ad8d4a 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1163,7 +1163,7 @@ for(var/obj/machinery/light/L in area) if(!initial(L.no_emergency)) //If there was an override set on creation, keep that override L.no_emergency = emergency_lights - INVOKE_ASYNC(L, TYPE_PROC_REF(/obj/machinery/light/, update), FALSE) + INVOKE_ASYNC(L, TYPE_PROC_REF(/obj/machinery/light, update), FALSE) CHECK_TICK return TRUE diff --git a/code/modules/projectiles/projectile/special/rocket.dm b/code/modules/projectiles/projectile/special/rocket.dm index 87fa7557da..184f42e03f 100644 --- a/code/modules/projectiles/projectile/special/rocket.dm +++ b/code/modules/projectiles/projectile/special/rocket.dm @@ -54,7 +54,7 @@ var/sturdy = list( /turf/closed, /obj/vehicle/sealed/mecha, - /obj/machinery/door/, + /obj/machinery/door, /obj/machinery/door/poddoor/shutters )