Code Readability - Effects (#18150)

* effects

* removed anchored = TRUE from objects that inherit that property within the effects folder and subfolders
This commit is contained in:
KalevTait
2022-07-02 16:48:46 +01:00
committed by GitHub
parent 3c00a1f061
commit 89ba9c047c
31 changed files with 35 additions and 92 deletions
+1 -2
View File
@@ -4,8 +4,7 @@
desc = "Burbling corrosive stuff."
icon_state = "acid"
density = FALSE
opacity = 0
anchored = TRUE
opacity = FALSE
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
layer = ABOVE_NORMAL_TURF_LAYER
var/turf/target
-1
View File
@@ -8,7 +8,6 @@
desc = "A mysterious anomaly, seen commonly only in the region of space that the station orbits..."
icon_state = "bhole3"
density = FALSE
anchored = TRUE
light_range = 3
var/movechance = ANOMALY_MOVECHANCE
var/obj/item/assembly/signaler/anomaly/aSignal = /obj/item/assembly/signaler/anomaly
+2 -3
View File
@@ -7,9 +7,8 @@ GLOBAL_LIST_EMPTY(bump_teleporters)
var/id = null //id of this bump_teleporter.
var/id_target = null //id of bump_teleporter which this moves you to.
invisibility = 101 //nope, can't see this
anchored = 1
density = 1
opacity = 0
density = TRUE
opacity = FALSE
/obj/effect/bump_teleporter/New()
..()
@@ -3,7 +3,6 @@
icon = 'icons/effects/effects.dmi'
icon_state = "fuel"
layer = LATTICE_LAYER
anchored = TRUE
var/amount = 1 //Basically moles.
/obj/effect/decal/cleanable/liquid_fuel/Initialize(mapload, amt = 1)
@@ -9,7 +9,6 @@ GLOBAL_LIST_EMPTY(splatter_cache)
var/drydesc = "It's dry and crusty. Someone is not doing their job."
gender = PLURAL
density = FALSE
anchored = TRUE
layer = TURF_LAYER
plane = GAME_PLANE
icon = 'icons/effects/blood.dmi'
@@ -137,7 +136,6 @@ GLOBAL_LIST_EMPTY(splatter_cache)
desc = "They look bloody and gruesome."
gender = PLURAL
density = FALSE
anchored = TRUE
layer = TURF_LAYER
icon = 'icons/effects/blood.dmi'
icon_state = "gibbl5"
@@ -3,7 +3,6 @@
desc = "Someone should clean that up."
gender = PLURAL
density = FALSE
anchored = TRUE
layer = TURF_LAYER
icon = 'icons/obj/objects.dmi'
icon_state = "shards"
@@ -14,7 +13,6 @@
gender = PLURAL
icon = 'icons/obj/objects.dmi'
icon_state = "ash"
anchored = TRUE
scoop_reagents = list("ash" = 10)
mergeable_decal = FALSE
@@ -39,7 +37,6 @@
desc = "Someone should clean that up."
gender = PLURAL
density = FALSE
anchored = TRUE
layer = TURF_LAYER
icon = 'icons/effects/dirt.dmi'
icon_state = "dirt"
@@ -72,7 +69,6 @@
desc = "It's still good. Four second rule!"
gender = PLURAL
density = FALSE
anchored = TRUE
layer = TURF_LAYER
icon = 'icons/effects/effects.dmi'
icon_state = "flour"
@@ -91,7 +87,6 @@
desc = "Jeez. I hope that's not for lunch."
gender = PLURAL
density = FALSE
anchored = TRUE
layer = TURF_LAYER
light_range = 1
icon = 'icons/effects/effects.dmi'
@@ -108,7 +103,6 @@
name = "cobweb"
desc = "Somebody should remove that."
density = FALSE
anchored = TRUE
layer = OBJ_LAYER
icon = 'icons/effects/effects.dmi'
icon_state = "cobweb1"
@@ -118,7 +112,6 @@
name = "gooey grey mass"
desc = "It looks like a melted... something."
density = FALSE
anchored = TRUE
layer = OBJ_LAYER
gender = NEUTER
icon = 'icons/effects/effects.dmi'
@@ -133,7 +126,6 @@
name = "cobweb"
desc = "Somebody should remove that."
density = FALSE
anchored = TRUE
layer = OBJ_LAYER
icon = 'icons/effects/effects.dmi'
icon_state = "cobweb2"
@@ -143,7 +135,6 @@
desc = "Gosh, how unpleasant."
gender = PLURAL
density = FALSE
anchored = TRUE
layer = TURF_LAYER
icon = 'icons/effects/blood.dmi'
icon_state = "vomit_1"
@@ -178,7 +169,6 @@
name = "tomato smudge"
desc = "It's red."
density = FALSE
anchored = TRUE
layer = TURF_LAYER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
@@ -186,7 +176,6 @@
/obj/effect/decal/cleanable/plant_smudge
name = "plant smudge"
density = FALSE
anchored = TRUE
layer = TURF_LAYER
gender = NEUTER
icon = 'icons/effects/tomatodecal.dmi'
@@ -196,7 +185,6 @@
name = "smashed egg"
desc = "Seems like this one won't hatch."
density = FALSE
anchored = TRUE
layer = TURF_LAYER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
@@ -205,7 +193,6 @@
name = "smashed pie"
desc = "It's pie cream from a cream pie."
density = FALSE
anchored = TRUE
layer = TURF_LAYER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_pie")
@@ -214,7 +201,6 @@
name = "space fungus"
desc = "A fungal growth. Looks pretty nasty."
density = FALSE
anchored = TRUE
layer = TURF_LAYER
plane = GAME_PLANE
icon = 'icons/effects/effects.dmi'
@@ -229,7 +215,6 @@
icon = 'icons/obj/objects.dmi'
icon_state = "confetti1"
random_icon_states = list("confetti1", "confetti2", "confetti3")
anchored = TRUE
/obj/effect/decal/cleanable/insectguts
name = "bug guts"
@@ -237,4 +222,3 @@
icon = 'icons/effects/blood.dmi'
icon_state = "xfloor1"
random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
anchored = TRUE
@@ -1,5 +1,4 @@
/obj/effect/decal/cleanable
anchored = TRUE
var/list/random_icon_states = list()
var/bloodiness = 0 //0-100, amount of blood in this decal, used for making footprints and affecting the alpha of bloody footprints
var/mergeable_decal = TRUE //when two of these are on a same tile or do we need to merge them into just one?
@@ -5,7 +5,6 @@
icon_state = "rune1"
layer = MID_TURF_LAYER
plane = GAME_PLANE //makes the graffiti visible over a wall.
anchored = TRUE
mergeable_decal = FALSE // Allows crayon drawings to overlap one another.
-4
View File
@@ -1,7 +1,6 @@
// Used for spray that you spray at walls, tables, hydrovats etc
/obj/effect/decal/spraystill
density = FALSE
anchored = TRUE
layer = 50
plane = HUD_PLANE
@@ -16,7 +15,6 @@
/obj/effect/decal/snow
name = "snow"
density = FALSE
anchored = TRUE
layer = TURF_DECAL_LAYER
icon = 'icons/turf/snow.dmi'
icon_state = "snow"
@@ -36,7 +34,6 @@
/obj/effect/decal/leaves
name = "fall leaves"
density = FALSE
anchored = TRUE
layer = HIGH_TURF_LAYER
icon = 'icons/obj/flora/plants.dmi'
icon_state = "fallleaves"
@@ -44,7 +41,6 @@
/obj/effect/decal/straw
name = "scattered straw"
density = FALSE
anchored = TRUE
layer = HIGH_TURF_LAYER
icon = 'icons/obj/flora/plants.dmi'
icon_state = "strawscattered"
@@ -12,21 +12,18 @@
desc = "They look like human remains. They have a strange aura about them."
icon = 'icons/effects/blood.dmi'
icon_state = "remains"
anchored = TRUE
/obj/effect/decal/remains/xeno
name = "remains"
desc = "They look like the remains of something... alien. They have a strange aura about them."
icon = 'icons/effects/blood.dmi'
icon_state = "remainsxeno"
anchored = TRUE
/obj/effect/decal/remains/robot
name = "remains"
desc = "They look like the remains of something mechanical. They have a strange aura about them."
icon = 'icons/mob/robots.dmi'
icon_state = "remainsrobot"
anchored = TRUE
/obj/effect/decal/remains/robot/decompile_act(obj/item/matter_decompiler/C, mob/user)
C.stored_comms["glass"] += 2
@@ -39,7 +36,6 @@
desc = "Noooooooooooooooooooooo"
icon = 'icons/effects/blood.dmi'
icon_state = "remains"
anchored = TRUE
/obj/effect/decal/remains/slime/New()
..()
@@ -9,7 +9,6 @@ would spawn and follow the beaker, even if it is carried or thrown.
name = "particle effect"
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
pass_flags = PASSTABLE | PASSGRILLE
anchored = TRUE
/obj/effect/particle_effect/New()
..()
@@ -1,8 +1,7 @@
/obj/effect/particle_effect/expl_particles
name = "explosive particles"
icon_state = "explosion_particle"
opacity = 1
anchored = 1
opacity = TRUE
/obj/effect/particle_effect/expl_particles/New()
..()
@@ -25,8 +24,7 @@
name = "explosive particles"
icon = 'icons/effects/96x96.dmi'
icon_state = "explosion"
opacity = 1
anchored = 1
opacity = TRUE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
pixel_x = -32
pixel_y = -32
@@ -5,9 +5,8 @@
/obj/effect/particle_effect/foam
name = "foam"
icon_state = "foam"
opacity = 0
anchored = 1
density = 0
opacity = FALSE
density = FALSE
layer = OBJ_LAYER + 0.9
animate_movement = 0
var/amount = 3
@@ -2,7 +2,6 @@
/obj/effect/particle_effect/ion_trails
name = "ion trails"
icon_state = "ion_trails"
anchored = TRUE
/obj/effect/particle_effect/ion_trails/Initialize(mapload, targetdir)
. = ..()
@@ -10,8 +10,8 @@
icon = 'icons/effects/96x96.dmi'
pixel_x = -32
pixel_y = -32
opacity = 1
anchored = 0
opacity = TRUE
anchored = FALSE
var/steps = 0
var/lifetime = 5
var/direction
@@ -142,11 +142,11 @@
/obj/effect/particle_effect/smoke/freezing
name = "nanofrost smoke"
color = "#B2FFFF"
opacity = 0
opacity = FALSE
/datum/effect_system/smoke_spread/freezing
effect_type = /obj/effect/particle_effect/smoke/freezing
var/blast = 0
var/blast = FALSE
/datum/effect_system/smoke_spread/freezing/proc/Chilled(atom/A)
if(istype(A, /turf/simulated))
@@ -163,12 +163,12 @@
G.toxins = 0
for(var/obj/machinery/atmospherics/unary/vent_pump/V in T)
if(!isnull(V.welded) && !V.welded) //must be an unwelded vent pump.
V.welded = 1
V.welded = TRUE
V.update_icon()
V.visible_message("<span class='danger'>[V] was frozen shut!</span>")
for(var/obj/machinery/atmospherics/unary/vent_scrubber/U in T)
if(!isnull(U.welded) && !U.welded) //must be an unwelded vent scrubber.
U.welded = 1
U.welded = TRUE
U.update_icon()
U.visible_message("<span class='danger'>[U] was frozen shut!</span>")
for(var/mob/living/L in T)
@@ -19,7 +19,6 @@
name = "sparks"
desc = "it's a spark what do you need to know?"
icon_state = "sparks"
anchored = TRUE
var/hotspottemp = 1000
/obj/effect/particle_effect/sparks/New()
@@ -42,7 +42,7 @@
/obj/effect/particle_effect/steam
name = "steam"
icon_state = "extinguish"
density = 0
density = FALSE
/obj/effect/particle_effect/steam/New()
..()
+1 -1
View File
@@ -6,7 +6,7 @@
icon = 'icons/effects/effects.dmi'
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
move_resist = INFINITY
anchored = 1
anchored = TRUE
can_be_hit = FALSE
/obj/effect/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
+2 -3
View File
@@ -3,9 +3,8 @@
name = "FORCEWALL"
icon = 'icons/effects/effects.dmi'
icon_state = "m_shield"
anchored = 1
opacity = 0
density = 1
opacity = FALSE
density = TRUE
var/lifetime = 30 SECONDS
/obj/effect/forcefield/New()
+1 -2
View File
@@ -3,8 +3,7 @@
/obj/structure/glowshroom
name = "glowshroom"
desc = "Mycena Bregprox, a species of mushroom that glows in the dark."
anchored = TRUE
opacity = 0
opacity = FALSE
density = FALSE
icon = 'icons/obj/lighting.dmi'
icon_state = "glowshroom" //replaced in New
-2
View File
@@ -2,7 +2,6 @@
name = "landmark"
icon = 'icons/mob/screen_gen.dmi'
icon_state = "x2"
anchored = 1.0
layer = MOB_LAYER
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
@@ -247,7 +246,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
name = "start"
icon = 'icons/effects/spawner_icons.dmi'
icon_state = "Assistant"
anchored = 1.0
/obj/effect/landmark/start/ai
name = "AI"
-1
View File
@@ -88,7 +88,6 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
icon = 'icons/obj/meteor.dmi'
icon_state = "small"
density = TRUE
anchored = TRUE
var/hits = 4
var/hitpwr = EXPLODE_HEAVY //Level of ex_act to be called on hit.
var/dest
+5 -6
View File
@@ -1,11 +1,10 @@
/obj/effect/mine
name = "dummy mine"
desc = "I Better stay away from that thing."
density = 0
anchored = 1
density = FALSE
icon = 'icons/obj/items.dmi'
icon_state = "uglyminearmed"
var/triggered = 0
var/triggered = FALSE
var/faction = "syndicate"
/obj/effect/mine/proc/mineEffect(mob/living/victim)
@@ -27,7 +26,7 @@
visible_message("<span class='danger'>[victim] sets off [bicon(src)] [src]!</span>")
do_sparks(3, 1, src)
mineEffect(victim)
triggered = 1
triggered = TRUE
qdel(src)
/obj/effect/mine/ex_act(severity)
@@ -105,7 +104,7 @@
desc = "pick me up"
icon = 'icons/effects/effects.dmi'
icon_state = "electricity2"
density = 0
density = FALSE
var/duration = 0
/obj/effect/mine/pickup/New()
@@ -115,7 +114,7 @@
/obj/effect/mine/pickup/triggermine(mob/living/victim)
if(triggered)
return
triggered = 1
triggered = TRUE
invisibility = 101
mineEffect(victim)
qdel(src)
+4 -7
View File
@@ -22,14 +22,13 @@
desc = "It's a ... present?"
icon = 'icons/obj/items.dmi'
icon_state = "strangepresent"
density = 1
anchored = 0
density = TRUE
anchored = FALSE
/obj/effect/mark
var/mark = ""
icon = 'icons/misc/mark.dmi'
icon_state = "blank"
anchored = 1
layer = 99
plane = HUD_PLANE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
@@ -50,12 +49,10 @@
name = "begin"
icon = 'icons/obj/stationobjs.dmi'
icon_state = "begin"
anchored = 1.0
/obj/effect/projection
name = "Projection"
desc = "This looks like a projection of something."
anchored = 1.0
/obj/effect/shut_controller
@@ -68,8 +65,8 @@
icon = 'icons/obj/stationobjs.dmi'
icon_state = "showcase_1"
desc = "A stand with the empty body of a cyborg bolted to it."
density = 1
anchored = 1
density = TRUE
anchored = TRUE
/obj/effect/spawner
name = "object spawner"
+3 -6
View File
@@ -22,17 +22,15 @@
name = "Palm tree"
icon = 'icons/misc/beach2.dmi'
icon_state = "palm1"
density = 1
density = TRUE
layer = 5
anchored = 1
/obj/effect/overlay/palmtree_l
name = "Palm tree"
icon = 'icons/misc/beach2.dmi'
icon_state = "palm2"
density = 1
density = TRUE
layer = 5
anchored = 1
/obj/effect/overlay/coconut
name = "Coconuts"
@@ -54,8 +52,7 @@
name = "Wallrot"
desc = "Ick..."
icon = 'icons/effects/wallrot.dmi'
anchored = 1
density = 1
density = TRUE
layer = 5
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-1
View File
@@ -3,7 +3,6 @@
desc = "Looks unstable. Best to test it with the clown."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "portal"
anchored = TRUE
var/obj/item/target = null
/// The UID and `name` of the object that created this portal. For example, a wormhole jaunter.
-2
View File
@@ -3,7 +3,6 @@
desc = "Let it snow, let it snow, let it snow!"
icon_state = "snowcloud"
layer = FLY_LAYER
anchored = TRUE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/obj/machinery/snow_machine/parent_machine
@@ -70,7 +69,6 @@
icon = 'icons/effects/effects.dmi'
icon_state = "snow"
layer = ABOVE_ICYOVERLAY_LAYER
anchored = TRUE
/obj/effect/snow/New()
START_PROCESSING(SSobj, src)
@@ -6,7 +6,6 @@
var/useGrille = TRUE
var/window_to_spawn_regular = /obj/structure/window/basic
var/window_to_spawn_full = /obj/structure/window/full/basic
anchored = TRUE // No sliding out while you prime
/obj/effect/spawner/window/Initialize(mapload)
. = ..()
+5 -6
View File
@@ -56,7 +56,7 @@
desc = "They seem to pulse slightly with an inner life"
icon_state = "eggs"
var/amount_grown = 0
var/player_spiders = 0
var/player_spiders = FALSE
///Was this egg laid by a xenobiology mob? Used for mob capping
var/xenobiology_spawned = FALSE
var/list/faction = list("spiders")
@@ -88,14 +88,14 @@
name = "spiderling"
desc = "It never stays still for long."
icon_state = "spiderling"
anchored = 0
anchored = FALSE
layer = 2.75
max_integrity = 3
var/amount_grown = 0
var/grow_as = null
var/obj/machinery/atmospherics/unary/vent_pump/entry_vent
var/travelling_in_vent = 0
var/player_spiders = 0
var/travelling_in_vent = FALSE
var/player_spiders = FALSE
var/list/faction = list("spiders")
var/selecting_player = 0
///Is this spiderling created from a xenobiology mob?
@@ -123,7 +123,7 @@
/obj/structure/spider/spiderling/process()
if(travelling_in_vent)
if(istype(loc, /turf))
travelling_in_vent = 0
travelling_in_vent = FALSE
entry_vent = null
else if(entry_vent)
if(get_dist(src, entry_vent) <= 1)
@@ -227,7 +227,6 @@
desc = "Green squishy mess."
icon = 'icons/effects/effects.dmi'
icon_state = "greenshatter"
anchored = 1
/obj/structure/spider/cocoon
name = "cocoon"
@@ -5,7 +5,6 @@
var/stopper = TRUE // stops throwers
var/mobs_only = FALSE
invisibility = INVISIBILITY_ABSTRACT // nope cant see this shit
anchored = TRUE
/obj/effect/step_trigger/proc/Trigger(atom/movable/A)
return FALSE
@@ -1,7 +1,6 @@
//temporary visual effects
/obj/effect/temp_visual
icon_state = "nothing"
anchored = TRUE
layer = ABOVE_MOB_LAYER
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/duration = 10 //in deciseconds