mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-08-27 07:08:22 +01:00
Repaths obj/effect/effect, datum/effect/effect [MDB_IGNORE] (#8312)
* Repaths obj/effect/effect, datum/effect/effect * linter fixes * No new Co-authored-by: Atermonera <forslandm@gmail.com>
This commit is contained in:
Atermonera
@@ -137,7 +137,7 @@
|
||||
if(prob(50))
|
||||
new /obj/item/robot_parts/l_arm(Tsec)
|
||||
|
||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
|
||||
s.set_up(3, 1, src)
|
||||
s.start()
|
||||
qdel(src)
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
else
|
||||
new /obj/item/clothing/suit/storage/vest(Tsec)
|
||||
|
||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
|
||||
s.set_up(3, 1, src)
|
||||
s.start()
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
else
|
||||
new /obj/item/device/assembly/prox_sensor(Tsec)
|
||||
|
||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
|
||||
s.set_up(3, 1, src)
|
||||
s.start()
|
||||
qdel(src)
|
||||
|
||||
@@ -279,7 +279,7 @@
|
||||
if(prob(50))
|
||||
new /obj/item/robot_parts/l_arm(Tsec)
|
||||
|
||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
|
||||
s.set_up(3, 1, src)
|
||||
s.start()
|
||||
qdel(src)
|
||||
|
||||
@@ -304,7 +304,7 @@
|
||||
new /obj/item/robot_parts/l_arm(Tsec)
|
||||
var/obj/item/stack/tile/floor/T = new /obj/item/stack/tile/floor(Tsec)
|
||||
T.amount = amount
|
||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
|
||||
s.set_up(3, 1, src)
|
||||
s.start()
|
||||
qdel(src)
|
||||
|
||||
@@ -344,7 +344,7 @@
|
||||
if(emagged && prob(25))
|
||||
playsound(src, 'sound/voice/medbot/minsult.ogg', 50, 0)
|
||||
|
||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
|
||||
s.set_up(3, 1, src)
|
||||
s.start()
|
||||
qdel(src)
|
||||
|
||||
@@ -258,7 +258,7 @@
|
||||
new /obj/item/stack/rods(Tsec)
|
||||
new /obj/item/stack/cable_coil/cut(Tsec)
|
||||
|
||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
|
||||
s.set_up(3, 1, src)
|
||||
s.start()
|
||||
|
||||
|
||||
@@ -360,7 +360,7 @@
|
||||
if(prob(50))
|
||||
new /obj/item/robot_parts/l_arm(Tsec)
|
||||
|
||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
|
||||
s.set_up(3, 1, src)
|
||||
s.start()
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
if(wear_mask && (wear_mask.item_flags & BLOCK_GAS_SMOKE_EFFECT))
|
||||
return
|
||||
|
||||
for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
|
||||
for(var/obj/effect/vfx/smoke/chem/smoke in view(1, src))
|
||||
if(smoke.reagents.total_volume)
|
||||
smoke.reagents.trans_to_mob(src, 10, CHEM_INGEST, copy = 1)
|
||||
//maybe check air pressure here or something to see if breathing in smoke is even possible.
|
||||
|
||||
@@ -189,7 +189,7 @@
|
||||
if(31 to INFINITY)
|
||||
Weaken(10) //This should work for now, more is really silly and makes you lay there forever
|
||||
|
||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
|
||||
s.set_up(5, 1, loc)
|
||||
s.start()
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
stance_damage += 2
|
||||
if(prob(10))
|
||||
visible_message("\The [src]'s [E.name] [pick("twitches", "shudders")] and sparks!")
|
||||
var/datum/effect/effect/system/spark_spread/spark_system = new ()
|
||||
var/datum/effect_system/spark_spread/spark_system = new ()
|
||||
spark_system.set_up(5, 0, src)
|
||||
spark_system.attach(src)
|
||||
spark_system.start()
|
||||
@@ -177,7 +177,7 @@
|
||||
|
||||
custom_emote(VISIBLE_MESSAGE, "drops what they were holding, their [E.name] malfunctioning!")
|
||||
|
||||
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
|
||||
var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
|
||||
spark_system.set_up(5, 0, src)
|
||||
spark_system.attach(src)
|
||||
spark_system.start()
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/mob/living/silicon/gib()
|
||||
..("gibbed-r")
|
||||
gibs(loc, null, /obj/effect/gibspawner/robot)
|
||||
gibs(loc, null, /obj/effect/spawner/gibs/robot)
|
||||
|
||||
/mob/living/silicon/dust()
|
||||
..("dust-r", /obj/effect/decal/remains/robot)
|
||||
|
||||
@@ -76,8 +76,8 @@
|
||||
var/modtype = "Default"
|
||||
var/lower_mod = 0
|
||||
var/jetpack = 0
|
||||
var/datum/effect/effect/system/ion_trail_follow/ion_trail = null
|
||||
var/datum/effect/effect/system/spark_spread/spark_system//So they can initialize sparks whenever/N
|
||||
var/datum/effect_system/ion_trail_follow/ion_trail = null
|
||||
var/datum/effect_system/spark_spread/spark_system//So they can initialize sparks whenever/N
|
||||
var/jeton = 0
|
||||
var/killswitch = 0
|
||||
var/killswitch_time = 60
|
||||
@@ -99,7 +99,7 @@
|
||||
)
|
||||
|
||||
/mob/living/silicon/robot/Initialize(var/ml, var/unfinished = 0)
|
||||
spark_system = new /datum/effect/effect/system/spark_spread()
|
||||
spark_system = new /datum/effect_system/spark_spread()
|
||||
spark_system.set_up(5, 0, src)
|
||||
spark_system.attach(src)
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
|
||||
/mob/living/silicon/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 0.0, var/def_zone = null, var/stun = 1)
|
||||
if(shock_damage > 0)
|
||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
|
||||
s.set_up(5, 1, loc)
|
||||
s.start()
|
||||
|
||||
|
||||
@@ -187,7 +187,7 @@
|
||||
apply_damage(damage = shock_damage, damagetype = BURN, def_zone = null, blocked = null, blocked = resistance, used_weapon = null, sharp = FALSE, edge = FALSE)
|
||||
playsound(src, "sparks", 50, 1, -1)
|
||||
|
||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
|
||||
s.set_up(5, 1, loc)
|
||||
s.start()
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
"rad" = 0
|
||||
)
|
||||
|
||||
var/datum/effect/effect/system/smoke_spread/frost/smoke_special
|
||||
var/datum/effect_system/smoke_spread/frost/smoke_special
|
||||
|
||||
say_list_type = /datum/say_list/frostfly
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/threatening/frostfly
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
var/energy = 100
|
||||
var/max_energy = 100
|
||||
|
||||
var/datum/effect/effect/system/smoke_spread/mothspore/smoke_spore
|
||||
var/datum/effect_system/smoke_spread/mothspore/smoke_spore
|
||||
|
||||
say_list_type = /datum/say_list/tymisian
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/threatening/frostfly //Uses frostfly AI, since so similar mechanically
|
||||
@@ -80,12 +80,13 @@
|
||||
threaten_sound = 'sound/effects/spray3.ogg'
|
||||
stand_down_sound = 'sound/effects/squelch1.ogg'
|
||||
|
||||
/obj/effect/effect/smoke/elemental/mothspore
|
||||
|
||||
/obj/effect/vfx/smoke/elemental/mothspore
|
||||
name = "spore cloud"
|
||||
desc = "A dust cloud filled with disorienting bacterial spores."
|
||||
color = "#80AB82"
|
||||
|
||||
/obj/effect/effect/smoke/elemental/mothspore/affect(mob/living/L) //Similar to a very weak flash, but depends on breathing instead of eye protection.
|
||||
/obj/effect/vfx/smoke/elemental/mothspore/affect(mob/living/L) //Similar to a very weak flash, but depends on breathing instead of eye protection.
|
||||
if(iscarbon(L))
|
||||
var/mob/living/carbon/C = L
|
||||
if(C.stat != DEAD)
|
||||
@@ -97,8 +98,8 @@
|
||||
H.eye_blurry = max(H.eye_blurry, spore_strength)
|
||||
H.adjustHalLoss(10 * (spore_strength / 5))
|
||||
|
||||
/datum/effect/effect/system/smoke_spread/mothspore
|
||||
smoke_type = /obj/effect/effect/smoke/elemental/mothspore
|
||||
/datum/effect_system/smoke_spread/mothspore
|
||||
smoke_type = /obj/effect/vfx/smoke/elemental/mothspore
|
||||
|
||||
/mob/living/simple_mob/animal/sif/tymisian/do_special_attack(atom/A)
|
||||
. = TRUE
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/threatening
|
||||
say_list_type = /datum/say_list/malf_drone
|
||||
|
||||
var/datum/effect/effect/system/ion_trail_follow/ion_trail = null
|
||||
var/datum/effect_system/ion_trail_follow/ion_trail = null
|
||||
var/obj/item/shield_projector/shields = null
|
||||
|
||||
/mob/living/simple_mob/mechanical/combat_drone/Initialize()
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
/obj/item/weapon/ore = 5
|
||||
)
|
||||
|
||||
var/datum/effect/effect/system/ion_trail_follow/ion_trail = null
|
||||
var/datum/effect_system/ion_trail_follow/ion_trail = null
|
||||
var/obj/item/shield_projector/shields = null
|
||||
var/obj/item/weapon/storage/bag/ore/my_storage = null
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
..()
|
||||
visible_message("\The [src] disintegrates!")
|
||||
new /obj/effect/decal/cleanable/blood/gibs/robot(src.loc)
|
||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
|
||||
s.set_up(3, 1, src)
|
||||
s.start()
|
||||
qdel(src)
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
..()
|
||||
visible_message(span("warning","\The [src] blows apart!"))
|
||||
new /obj/effect/decal/cleanable/blood/gibs/robot(src.loc)
|
||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
|
||||
s.set_up(3, 1, src)
|
||||
s.start()
|
||||
qdel(src)
|
||||
|
||||
@@ -230,7 +230,7 @@
|
||||
icon_state = "mortar"
|
||||
|
||||
/obj/item/projectile/arc/explosive_rocket/on_impact(turf/T)
|
||||
new /obj/effect/explosion(T) // Weak explosions don't produce this on their own, apparently.
|
||||
new /obj/effect/vfx/explosion(T) // Weak explosions don't produce this on their own, apparently.
|
||||
explosion(T, 0, 0, 2, adminlog = FALSE)
|
||||
|
||||
/mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced/proc/launch_microsingularity(atom/target)
|
||||
|
||||
@@ -29,14 +29,13 @@
|
||||
base_attack_cooldown = 2 SECONDS
|
||||
|
||||
organ_names = /decl/mob_organ_names/hoverpod
|
||||
|
||||
var/datum/effect/effect/system/ion_trail_follow/ion_trail
|
||||
var/datum/effect_system/ion_trail_follow/ion_trail
|
||||
|
||||
/mob/living/simple_mob/mechanical/mecha/hoverpod/manned
|
||||
pilot_type = /mob/living/simple_mob/humanoid/merc/ranged
|
||||
|
||||
/mob/living/simple_mob/mechanical/mecha/hoverpod/Initialize()
|
||||
ion_trail = new /datum/effect/effect/system/ion_trail_follow()
|
||||
ion_trail = new /datum/effect_system/ion_trail_follow()
|
||||
ion_trail.set_up(src)
|
||||
ion_trail.start()
|
||||
return ..()
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/melee
|
||||
say_list_type = /datum/say_list/malf_drone
|
||||
|
||||
var/datum/effect/effect/system/spark_spread/sparks
|
||||
var/datum/effect_system/spark_spread/sparks
|
||||
var/wreckage = /obj/effect/decal/mecha_wreckage/gygax/dark
|
||||
var/pilot_type = null // Set to spawn a pilot when destroyed. Setting this also makes the mecha vulnerable to things that affect sentient minds.
|
||||
var/deflect_chance = 10 // Chance to outright stop an attack, just like a normal exosuit.
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
L.buckled.unbuckle_mob() // To prevent an exploit where being buckled prevents slimes from jumping on you.
|
||||
L.stuttering = max(L.stuttering, stun_power)
|
||||
|
||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
|
||||
s.set_up(5, 1, L)
|
||||
s.start()
|
||||
|
||||
|
||||
@@ -358,9 +358,9 @@
|
||||
to_chat(src, span("warning", "There wasn't an unoccupied spot to teleport to."))
|
||||
return FALSE
|
||||
|
||||
var/datum/effect/effect/system/spark_spread/s1 = new /datum/effect/effect/system/spark_spread
|
||||
var/datum/effect_system/spark_spread/s1 = new /datum/effect_system/spark_spread
|
||||
s1.set_up(5, 1, T)
|
||||
var/datum/effect/effect/system/spark_spread/s2 = new /datum/effect/effect/system/spark_spread
|
||||
var/datum/effect_system/spark_spread/s2 = new /datum/effect_system/spark_spread
|
||||
s2.set_up(5, 1, target_turf)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user