From 4fc6e9354563dea8280894f585fd5eeaf40ceb49 Mon Sep 17 00:00:00 2001 From: Alexis Date: Sun, 8 Mar 2026 19:30:38 -0400 Subject: [PATCH] Down to 50 parsing errors. --- .../lewd_items/code/lewd_structures/pillow.dm | 10 ++--- .../carwo_defense_systems/ammo/grenade.dm | 39 ++----------------- modular_skyrat/modules/mold/code/mold.dm | 29 +++----------- .../datums/quirks/negative_quirks/dirty.dm | 5 +-- .../objects/structures/beds_chairs/sofa.dm | 3 +- .../antagonists/bloodsucker/powers/gohome.dm | 7 +--- .../bloodsucker/powers/targeted/trespass.dm | 9 +---- .../antagonists/bloodsucker/powers/veil.dm | 5 +-- .../code/modules/mkultra/reaction.dm | 15 ++++--- .../modules/mob/living/basic/bots/firebot.dm | 4 +- 10 files changed, 27 insertions(+), 99 deletions(-) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm index 97be26eb876..0e1229e9423 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm @@ -13,7 +13,7 @@ icon_state = "pillow_pink_round" base_icon_state = "pillow" inhand_icon_state = "pillow_pink_round" - var/datum/effect_system/feathers/pillow_feathers + var/datum/effect_system/basic/feathers/pillow_feathers var/current_color = "pink" var/current_form = "round" var/color_changed = FALSE @@ -75,8 +75,7 @@ if(!length(pillow_forms)) populate_pillow_forms() //part of code for feathers spawn on hit - pillow_feathers = new - pillow_feathers.set_up(2, 0, src) + pillow_feathers = new(src, 2, FALSE) pillow_feathers.attach(src) /obj/item/fancy_pillow/update_icon_state() @@ -86,8 +85,7 @@ /obj/item/fancy_pillow/Destroy() if(pillow_feathers) - qdel(pillow_feathers) - pillow_feathers = null + QDEL_NULL(pillow_feathers) return ..() //feathers effect on hit @@ -98,7 +96,7 @@ icon = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_decals/lewd_decals.dmi' duration = 14 -/datum/effect_system/feathers +/datum/effect_system/basic/feathers effect_type = /obj/effect/temp_visual/feathers /obj/item/fancy_pillow/attack(mob/living/carbon/human/affected_mob, mob/living/carbon/human/user) diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/grenade.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/grenade.dm index 4098390d86f..0d704e07c85 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/grenade.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/grenade.dm @@ -31,7 +31,6 @@ harmful = FALSE //Erm, technically - /obj/item/ammo_casing/c980grenade/fire_casing(atom/target, mob/living/user, params, distro, quiet, zone_override, spread, atom/fired_from) var/obj/item/gun/ballistic/automatic/sol_grenade_launcher/firing_launcher = fired_from if(istype(firing_launcher)) @@ -39,7 +38,6 @@ . = ..() - /obj/projectile/bullet/c980grenade name = ".980 Tydhouer practice grenade" damage = 20 @@ -51,24 +49,20 @@ sharpness = NONE - /obj/projectile/bullet/c980grenade/on_hit(atom/target, blocked = 0, pierce_hit) ..() fuse_activation(target) return BULLET_ACT_HIT - /obj/projectile/bullet/c980grenade/on_range() fuse_activation(get_turf(src)) return ..() - /// Generic proc that is called when the projectile should 'detonate', being either on impact or when the range runs out /obj/projectile/bullet/c980grenade/proc/fuse_activation(atom/target) playsound(src, 'modular_zubbers/sound/weapons/grenade_burst.ogg', 50, TRUE, -3) do_sparks(3, FALSE, src) - /obj/item/ammo_box/c980grenade name = "ammo box (.980 Tydhouer practice)" desc = "A box of four .980 Tydhouer practice grenades. Instructions on the box indicate these are dummy practice rounds that will disintegrate into sparks on detonation. Neat!" @@ -84,7 +78,6 @@ ammo_type = /obj/item/ammo_casing/c980grenade max_ammo = 4 - // .980 smoke grenade /obj/item/ammo_casing/c980grenade/smoke @@ -95,18 +88,13 @@ projectile_type = /obj/projectile/bullet/c980grenade/smoke - /obj/projectile/bullet/c980grenade/smoke name = ".980 Tydhouer smoke grenade" - /obj/projectile/bullet/c980grenade/smoke/fuse_activation(atom/target) playsound(src, 'modular_zubbers/sound/weapons/grenade_burst.ogg', 50, TRUE, -3) playsound(src, 'sound/effects/smoke.ogg', 50, TRUE, -3) - var/datum/effect_system/fluid_spread/smoke/bad/smoke = new - smoke.set_up(GRENADE_SMOKE_RANGE, holder = src, location = src) - smoke.start() - + do_smoke(GRENADE_SMOKE_RANGE, src, src, smoke_type = /datum/effect_system/fluid_spread/smoke/bad) /obj/item/ammo_box/c980grenade/smoke name = "ammo box (.980 Tydhouer smoke)" @@ -116,7 +104,6 @@ ammo_type = /obj/item/ammo_casing/c980grenade/smoke - // .980 shrapnel grenade /obj/item/ammo_casing/c980grenade/shrapnel @@ -132,14 +119,12 @@ harmful = TRUE - /obj/projectile/bullet/c980grenade/shrapnel name = ".980 Tydhouer shrapnel grenade" /// What type of casing should we put inside the bullet to act as shrapnel later var/casing_to_spawn = /obj/item/grenade/c980payload - /obj/projectile/bullet/c980grenade/shrapnel/fuse_activation(atom/target) var/obj/item/grenade/shrapnel_maker = new casing_to_spawn(get_turf(src)) @@ -148,7 +133,6 @@ playsound(src, 'modular_zubbers/sound/weapons/grenade_burst.ogg', 50, TRUE, -3) - /obj/item/ammo_box/c980grenade/shrapnel name = "ammo box (.980 Tydhouer shrapnel)" desc = "A box of four .980 Tydhouer shrapnel grenades. Instructions on the box indicate these are shrapnel rounds. Its also covered in hazard signs, odd." @@ -157,7 +141,6 @@ ammo_type = /obj/item/ammo_casing/c980grenade/shrapnel - /obj/item/grenade/c980payload shrapnel_type = /obj/projectile/bullet/shrapnel/short_range shrapnel_radius = 2 @@ -166,11 +149,9 @@ ex_light = 0 ex_flame = 0 - /obj/projectile/bullet/shrapnel/short_range range = 2 - // .980 phosphor grenade /obj/item/ammo_casing/c980grenade/shrapnel/phosphor @@ -183,21 +164,16 @@ custom_materials = AMMO_MATS_GRENADE_INCENDIARY - /obj/projectile/bullet/c980grenade/shrapnel/phosphor name = ".980 Tydhouer phosphor grenade" casing_to_spawn = /obj/item/grenade/c980payload/phosphor - /obj/projectile/bullet/c980grenade/shrapnel/phosphor/fuse_activation(atom/target) . = ..() playsound(src, 'sound/effects/smoke.ogg', 50, TRUE, -3) - var/datum/effect_system/fluid_spread/smoke/quick/smoke = new - smoke.set_up(GRENADE_SMOKE_RANGE, holder = src, location = src) - smoke.start() - + do_smoke(GRENADE_SMOKE_RANGE, src, src, smoke_type = /datum/effect_system/fluid_spread/smoke/quick) /obj/item/ammo_box/c980grenade/shrapnel/phosphor name = "ammo box (.980 Tydhouer phosphor)" @@ -207,21 +183,17 @@ ammo_type = /obj/item/ammo_casing/c980grenade/shrapnel/phosphor - /obj/item/ammo_casing/shrapnel_exploder/phosphor pellets = 8 projectile_type = /obj/projectile/bullet/incendiary/fire/backblast/short_range - /obj/item/grenade/c980payload/phosphor shrapnel_type = /obj/projectile/bullet/incendiary/fire/backblast/short_range - /obj/projectile/bullet/incendiary/fire/backblast/short_range range = 2 - // .980 tear gas grenade /obj/item/ammo_casing/c980grenade/riot @@ -232,18 +204,13 @@ projectile_type = /obj/projectile/bullet/c980grenade/riot - /obj/projectile/bullet/c980grenade/riot name = ".980 Tydhouer tear gas grenade" /obj/projectile/bullet/c980grenade/riot/fuse_activation(atom/target) playsound(src, 'modular_zubbers/sound/weapons/grenade_burst.ogg', 50, TRUE, -3) playsound(src, 'sound/effects/smoke.ogg', 50, TRUE, -3) - var/datum/effect_system/fluid_spread/smoke/chem/smoke = new() - smoke.chemholder.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 10) - smoke.set_up(GRENADE_SMOKE_RANGE, holder = src, location = src) - smoke.start() - + do_chem_smoke(GRENADE_SMOKE_RANGE, src, src, /datum/reagent/consumable/condensedcapsaicin, 10, smoke_type = /datum/effect_system/fluid_spread/smoke/chem) /obj/item/ammo_box/c980grenade/riot name = "ammo box (.980 Tydhouer tear gas)" diff --git a/modular_skyrat/modules/mold/code/mold.dm b/modular_skyrat/modules/mold/code/mold.dm index 071334afcbd..6ecd7dba6ce 100644 --- a/modular_skyrat/modules/mold/code/mold.dm +++ b/modular_skyrat/modules/mold/code/mold.dm @@ -32,7 +32,6 @@ #define RAD_IRRADIATE_THRESHOLD_BULB 15 #define RAD_IRRADIATE_THRESHOLD_CORE 10 - /datum/mold_type var/name = "debug" /// The tier of the mold, used to decide whether it can spawn on lowpop @@ -54,7 +53,6 @@ /// The mold type's preferred atmospheric conditions var/preferred_atmos_conditions - /** * What happens when the core is attacked. * @@ -67,7 +65,6 @@ /datum/mold_type/proc/core_defense(obj/structure/mold/structure/core/core) return - /** * What happens when a bulb discharges. * @@ -83,7 +80,6 @@ bulb.visible_message(span_warning("[bulb] ruptures!")) return - /** * The optional bonus effect alongside conditioner's puff of atmos. * @@ -95,7 +91,6 @@ /datum/mold_type/proc/bonus_conditioner_effects(obj/structure/mold/structure/conditioner/conditioner) return - /** * A release of foam from a mold structure. * @@ -114,11 +109,7 @@ var/datum/reagents/spewed_reagents = new /datum/reagents(reagent_capacity) spewed_reagents.my_atom = source spewed_reagents.add_reagent(reagent_to_add, amount_of_reagent) - var/datum/effect_system/fluid_spread/foam/foam = new - var/turf/source_turf = get_turf(source) - foam.set_up(range, location = source_turf, carry = spewed_reagents) - foam.start() - + do_foam(range, source, get_turf(source), carry = spewed_reagents) /** * Fire mold @@ -149,7 +140,6 @@ var/turf/source_turf = get_turf(source) source_turf.atmos_spawn_air("plasma=10;TEMP=300") - /** * Disease mold * @@ -179,17 +169,14 @@ var/datum/reagents/reagents = new/datum/reagents(TEMP_REAGENT_HOLDER_CAPACITY_LARGE) reagents.my_atom = source reagents.add_reagent(/datum/reagent/toxin/histamine, PUFF_REAGENT_AMOUNT) - var/datum/effect_system/fluid_spread/smoke/chem/smoke_machine/puff = new - var/turf/source_turf = get_turf(source) - puff.set_up( + do_chem_smoke( range, - location = source_turf, + holder = source, + location = get_turf(source), carry = reagents, - efficiency = PUFF_REAGENT_EFFICIENCY, + carry_limit = PUFF_REAGENT_EFFICIENCY, + smoke_type = /datum/effect_system/fluid_spread/smoke/chem/smoke_machine ) - puff.attach(source) - puff.start() - /** * EMP mold @@ -215,7 +202,6 @@ guarantee_emp = TRUE, ) - /datum/mold_type/emp/bulb_discharge(obj/structure/mold/structure/bulb/bulb) . = ..() electrical_discharge( @@ -257,7 +243,6 @@ source = source, ) - /** * Toxic mold * @@ -291,7 +276,6 @@ reagent_to_add = /datum/reagent/toxin, ) - /** * Radioactive mold * @@ -343,7 +327,6 @@ if(fire_nuclear_particle) source.fire_nuclear_particle() - #undef MAX_MOLD_FOAM_RANGE_BULB #undef MAX_MOLD_FOAM_RANGE_CORE #undef TEMP_REAGENT_HOLDER_CAPACITY_LARGE diff --git a/modular_zubbers/code/datums/quirks/negative_quirks/dirty.dm b/modular_zubbers/code/datums/quirks/negative_quirks/dirty.dm index c5a3d497e90..2b9ca98f1c5 100644 --- a/modular_zubbers/code/datums/quirks/negative_quirks/dirty.dm +++ b/modular_zubbers/code/datums/quirks/negative_quirks/dirty.dm @@ -164,10 +164,7 @@ span_notice("The impact knocks a cloud of grime and dust off you!") ) - var/datum/effect_system/fluid_spread/smoke/dirty/smoke = new /datum/effect_system/fluid_spread/smoke/dirty() - smoke.color = dirt_color - smoke.set_up(0, holder = quirk_holder, location = get_turf(quirk_holder)) - smoke.start() + do_smoke(0, quirk_holder, get_turf(quirk_holder), smoke_type = /datum/effect_system/fluid_spread/smoke/dirty) cloud_charged = FALSE diff --git a/modular_zubbers/code/game/objects/structures/beds_chairs/sofa.dm b/modular_zubbers/code/game/objects/structures/beds_chairs/sofa.dm index 00ca4cd7b8a..703fd2d10e3 100644 --- a/modular_zubbers/code/game/objects/structures/beds_chairs/sofa.dm +++ b/modular_zubbers/code/game/objects/structures/beds_chairs/sofa.dm @@ -11,8 +11,7 @@ if(prob(10)) balloon_alert(user, "found something") if(prob(1)) - var/datum/effect_system/basic/spark_spread/quantum/sparks = new - sparks.set_up(5, 1, loc) + do_sparks(5, TRUE, loc, spark_type = /datum/effect_system/basic/spark_spread/quantum) new /obj/item/disk/nuclear/fake(loc) else // New epic way of making money. Totally diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/gohome.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/gohome.dm index 3fb56d0c6d7..7d3d37706f6 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/gohome.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/gohome.dm @@ -116,9 +116,7 @@ playsound(current_turf, 'sound/effects/magic/summon_karp.ogg', 60, 1) - var/datum/effect_system/steam_spread/bloodsucker/puff = new /datum/effect_system/steam_spread/bloodsucker() - puff.set_up(3, 0, current_turf) - puff.start() + do_smoke(3, FALSE, current_turf, smoke_type = /obj/effect/particle_effect/fluid/smoke/vampsmoke) /// STEP FIVE: Create animal at prev location var/mob/living/simple_animal/new_mob = pick_weight(spawning_mobs) @@ -131,9 +129,6 @@ DeactivatePower() pay_cost() -/datum/effect_system/steam_spread/bloodsucker - effect_type = /obj/effect/particle_effect/fluid/smoke/vampsmoke - #undef GOHOME_START #undef GOHOME_FLICKER_ONE #undef GOHOME_FLICKER_TWO diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/trespass.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/trespass.dm index 22f423b1cb5..5eacc0a8273 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/trespass.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/trespass.dm @@ -72,9 +72,7 @@ // Effect Origin var/sound_strength = max(60, 70 - level_current * 10) playsound(get_turf(owner), 'sound/effects/magic/summon_karp.ogg', sound_strength, 1) - var/datum/effect_system/steam_spread/bloodsucker/puff = new /datum/effect_system/steam_spread() - puff.set_up(3, 0, my_turf) - puff.start() + do_smoke(3, FALSE, my_turf, smoke_type = /obj/effect/particle_effect/fluid/smoke/vampsmoke) var/mist_delay = GetTeleportDelay() // Level up and do this faster. @@ -100,10 +98,7 @@ user.invisibility = invis_was // Effect Destination playsound(get_turf(owner), 'sound/effects/magic/summon_karp.ogg', 60, 1) - puff = new /datum/effect_system/steam_spread/() - puff.effect_type = /obj/effect/particle_effect/fluid/smoke/vampsmoke - puff.set_up(3, 0, target_turf) - puff.start() + do_smoke(3, FALSE, target_turf, smoke_type = /obj/effect/particle_effect/fluid/smoke/vampsmoke) /datum/action/cooldown/bloodsucker/targeted/trespass/proc/GetTeleportDelay() return max(5, 20 - level_current * 2.5) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm index 9d5d69b0262..3dbf5ce7618 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm @@ -148,10 +148,7 @@ /datum/action/cooldown/bloodsucker/veil/proc/cast_effect() // Effect playsound(get_turf(owner), 'sound/effects/magic/smoke.ogg', 20, 1) - var/datum/effect_system/steam_spread/bloodsucker/puff = new /datum/effect_system/steam_spread/() - puff.set_up(3, 0, get_turf(owner)) - puff.attach(owner) //OPTIONAL - puff.start() + do_smoke(3, FALSE, get_turf(owner), smoke_type = /obj/effect/particle_effect/fluid/smoke/vampsmoke) owner.spin(8, 1) //Spin around like a loon. /obj/effect/particle_effect/fluid/smoke/vampsmoke diff --git a/modular_zubbers/code/modules/mkultra/reaction.dm b/modular_zubbers/code/modules/mkultra/reaction.dm index 7e9efa2212d..13a762ce022 100644 --- a/modular_zubbers/code/modules/mkultra/reaction.dm +++ b/modular_zubbers/code/modules/mkultra/reaction.dm @@ -53,11 +53,11 @@ var/power = 5 + round(explode_vol/12, 1) //MKU strengthdiv is 12, same as meth. if(power <= 0) return - var/turf/T = get_turf(holder.my_atom) + var/turf/explosion_turf = get_turf(holder.my_atom) var/inside_msg if(ismob(holder.my_atom)) - var/mob/M = holder.my_atom - inside_msg = " inside [ADMIN_LOOKUPFLW(M)]" + var/mob/failed_chemist = holder.my_atom + inside_msg = " inside [ADMIN_LOOKUPFLW(failed_chemist)]" return var/lastkey = holder.my_atom.fingerprintslast var/touch_msg = "N/A" @@ -65,9 +65,8 @@ var/mob/toucher = get_mob_by_key(lastkey) touch_msg = "[ADMIN_LOOKUPFLW(toucher)]" if(!istype(holder.my_atom, /obj/machinery/plumbing)) //excludes standard plumbing equipment from spamming admins with this shit - message_admins("Reagent explosion reaction occurred at [ADMIN_VERBOSEJMP(T)][inside_msg]. Last Fingerprint: [touch_msg].") - log_game("Reagent explosion reaction occurred at [AREACOORD(T)]. Last Fingerprint: [lastkey ? lastkey : "N/A"]." ) - var/datum/effect_system/reagents_explosion/e = new() - e.set_up(power, T, 0, 0) - e.start(holder.my_atom) + message_admins("Reagent explosion reaction occurred at [ADMIN_VERBOSEJMP(explosion_turf)][inside_msg]. Last Fingerprint: [touch_msg].") + log_game("Reagent explosion reaction occurred at [AREACOORD(explosion_turf)]. Last Fingerprint: [lastkey ? lastkey : "N/A"]." ) + var/datum/effect_system/reagents_explosion/explosion = new(explosion_turf, power, FALSE, FALSE) + explosion.start(holder.my_atom) holder.clear_reagents() diff --git a/modular_zubbers/code/modules/mob/living/basic/bots/firebot.dm b/modular_zubbers/code/modules/mob/living/basic/bots/firebot.dm index 5c60f8d47b6..96afac8bac7 100644 --- a/modular_zubbers/code/modules/mob/living/basic/bots/firebot.dm +++ b/modular_zubbers/code/modules/mob/living/basic/bots/firebot.dm @@ -11,9 +11,7 @@ /mob/living/basic/bot/firebot/hotice_upgrade/atmos_expose(datum/gas_mixture/air, exposed_temperature) if(!COOLDOWN_FINISHED(src, foam_cooldown)) return - var/datum/effect_system/fluid_spread/foam/firefighting_freon/foam = new - foam.set_up(5, holder = src, location = loc) - foam.start() + do_foam(5, src, loc, foam_type = /datum/effect_system/fluid_spread/foam/firefighting_freon) COOLDOWN_START(src, foam_cooldown, 8 SECONDS)