diff --git a/code/game/objects/effects/decals/Cleanable/aliens.dm b/code/game/objects/effects/decals/Cleanable/aliens.dm index 8bc9b6c42d5..c788e934b45 100644 --- a/code/game/objects/effects/decals/Cleanable/aliens.dm +++ b/code/game/objects/effects/decals/Cleanable/aliens.dm @@ -21,10 +21,10 @@ color = "#FFFFFF" /obj/effect/decal/cleanable/blood/gibs/xeno/up - random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6","xgibup1","xgibup1","xgibup1") + random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6", "xgibup1", "xgibup1", "xgibup1") /obj/effect/decal/cleanable/blood/gibs/xeno/down - random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6","xgibdown1","xgibdown1","xgibdown1") + random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6", "xgibdown1", "xgibdown1", "xgibdown1") /obj/effect/decal/cleanable/blood/gibs/xeno/body random_icon_states = list("xgibhead", "xgibtorso") @@ -36,4 +36,4 @@ random_icon_states = list("xgibmid1", "xgibmid2", "xgibmid3") /obj/effect/decal/cleanable/blood/xtracks - basecolor = "#05EE05" \ No newline at end of file + basecolor = "#05EE05" diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm index 3d6a47a00b9..c4c903474ef 100644 --- a/code/game/objects/effects/decals/Cleanable/fuel.dm +++ b/code/game/objects/effects/decals/Cleanable/fuel.dm @@ -2,11 +2,11 @@ //Liquid fuel is used for things that used to rely on volatile fuels or plasma being contained to a couple tiles. icon = 'icons/effects/effects.dmi' icon_state = "fuel" - layer = TURF_LAYER+0.2 - anchored = 1 + layer = LATTICE_LAYER + anchored = TRUE var/amount = 1 //Basically moles. -/obj/effect/decal/cleanable/liquid_fuel/New(newLoc,amt=1) +/obj/effect/decal/cleanable/liquid_fuel/Initialize(newLoc, amt = 1) amount = amt //Be absorbed by any other liquid fuel in the tile. @@ -21,38 +21,42 @@ /obj/effect/decal/cleanable/liquid_fuel/proc/Spread() //Allows liquid fuels to sometimes flow into other tiles. - if(amount < 0.5) return + if(amount < 0.5) + return var/turf/simulated/S = loc - if(!istype(S)) return + if(!istype(S)) + return for(var/d in cardinal) if(rand(25)) var/turf/simulated/target = get_step(src, d) var/turf/simulated/origin = get_turf(src) if(origin.CanPass(null, target, 0, 0) && target.CanPass(null, origin, 0, 0)) if(!locate(/obj/effect/decal/cleanable/liquid_fuel) in target) - new/obj/effect/decal/cleanable/liquid_fuel(target, amount*0.25) + new/obj/effect/decal/cleanable/liquid_fuel(target, amount * 0.25) amount *= 0.75 /obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel icon_state = "mustard" - anchored = 0 + anchored = FALSE -/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/New(newLoc, amt = 1, d = 0) +/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/Initialize(newLoc, amt = 1, d = 0) dir = d //Setting this direction means you won't get torched by your own flamethrower. . = ..() /obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/Spread() //The spread for flamethrower fuel is much more precise, to create a wide fire pattern. - if(amount < 0.1) return + if(amount < 0.1) + return var/turf/simulated/S = loc - if(!istype(S)) return + if(!istype(S)) + return - for(var/d in list(turn(dir,90),turn(dir,-90), dir)) - var/turf/simulated/O = get_step(S,d) + for(var/d in list(turn(dir, 90), turn(dir, -90), dir)) + var/turf/simulated/O = get_step(S, d) if(locate(/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel) in O) continue if(O.CanPass(null, S, 0, 0) && S.CanPass(null, O, 0, 0)) - new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(O,amount*0.25,d) + new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(O, amount * 0.25, d) O.hotspot_expose((T20C*2) + 380,500) //Light flamethrower fuel on fire immediately. amount *= 0.25 diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index f832b446cd5..53072d7e82c 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -1,6 +1,6 @@ -#define DRYING_TIME 5 * 60*10 //for 1 unit of depth in puddle (amount var) +#define DRYING_TIME 5 * 60 * 10 //for 1 unit of depth in puddle (amount var) -var/global/list/image/splatter_cache=list() +var/global/list/image/splatter_cache = list() /obj/effect/decal/cleanable/blood name = "blood" @@ -8,24 +8,24 @@ var/global/list/image/splatter_cache=list() desc = "It's thick and gooey. Perhaps it's the chef's cooking?" var/drydesc = "It's dry and crusty. Someone is not doing their job." gender = PLURAL - density = 0 - anchored = 1 - layer = 2 + density = FALSE + anchored = TRUE + layer = TURF_LAYER icon = 'icons/effects/blood.dmi' icon_state = "mfloor1" random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7") - var/base_icon = 'icons/effects/blood.dmi' + appearance_flags = NO_CLIENT_COLOR blood_DNA = list() + var/base_icon = 'icons/effects/blood.dmi' var/blood_state = BLOOD_STATE_HUMAN var/bloodiness = MAX_SHOE_BLOODINESS var/basecolor = "#A10808" // Color when wet. var/amount = 5 - appearance_flags = NO_CLIENT_COLOR var/dry_timer = 0 var/off_floor = FALSE -/obj/effect/decal/cleanable/blood/New() - ..() +/obj/effect/decal/cleanable/blood/Initialize() + . = ..() update_icon() if(GAMEMODE_IS_CULT) var/datum/game_mode/cult/mode_ticker = ticker.mode @@ -58,7 +58,8 @@ var/global/list/image/splatter_cache=list() return ..() /obj/effect/decal/cleanable/blood/update_icon() - if(basecolor == "rainbow") basecolor = "#[pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF"))]" + if(basecolor == "rainbow") + basecolor = "#[pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF"))]" color = basecolor /obj/effect/decal/cleanable/blood/proc/dry() @@ -93,9 +94,9 @@ var/global/list/image/splatter_cache=list() var/mob/living/carbon/human/H = O var/obj/item/organ/external/l_foot = H.get_organ("l_foot") var/obj/item/organ/external/r_foot = H.get_organ("r_foot") - var/hasfeet = 1 + var/hasfeet = TRUE if(!l_foot && !r_foot) - hasfeet = 0 + hasfeet = FALSE if(H.shoes && blood_state && bloodiness) var/obj/item/clothing/shoes/S = H.shoes var/add_blood = 0 @@ -137,10 +138,10 @@ var/global/list/image/splatter_cache=list() gender = PLURAL icon = 'icons/effects/drip.dmi' icon_state = "1" - random_icon_states = list("1","2","3","4","5") + random_icon_states = list("1", "2", "3", "4", "5") amount = 0 - var/drips = 1 bloodiness = 0 + var/drips = 1 /obj/effect/decal/cleanable/blood/drip/can_bloodcrawl_in() return TRUE @@ -150,12 +151,12 @@ var/global/list/image/splatter_cache=list() icon_state = "ltrails_1" desc = "Your instincts say you shouldn't be following these." gender = PLURAL - density = 0 - layer = 2 + density = FALSE + layer = TURF_LAYER random_icon_states = null - var/list/existing_dirs = list() blood_DNA = list() appearance_flags = NO_CLIENT_COLOR + var/list/existing_dirs = list() /obj/effect/decal/cleanable/trail_holder/can_bloodcrawl_in() return TRUE @@ -164,12 +165,12 @@ var/global/list/image/splatter_cache=list() icon_state = "tracks" desc = "It looks like a writing in blood." gender = NEUTER - random_icon_states = list("writing1","writing2","writing3","writing4","writing5") + random_icon_states = list("writing1", "writing2", "writing3", "writing4", "writing5") amount = 0 var/message -/obj/effect/decal/cleanable/blood/writing/New() - ..() +/obj/effect/decal/cleanable/blood/writing/Initialize() + . = ..() if(random_icon_states.len) for(var/obj/effect/decal/cleanable/blood/writing/W in loc) random_icon_states.Remove(W.icon_state) @@ -179,20 +180,20 @@ var/global/list/image/splatter_cache=list() /obj/effect/decal/cleanable/blood/writing/examine(mob/user) ..(user) - to_chat(user, "It reads: \"[message]\"") + to_chat(user, "It reads: \"[message]\"") /obj/effect/decal/cleanable/blood/gibs name = "gibs" desc = "They look bloody and gruesome." gender = PLURAL - density = 0 - anchored = 1 - layer = 2 + density = FALSE + anchored = TRUE + layer = TURF_LAYER icon = 'icons/effects/blood.dmi' icon_state = "gibbl5" random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6") + noclear = TRUE var/fleshcolor = "#FFFFFF" - noclear = 1 /obj/effect/decal/cleanable/blood/gibs/update_icon() var/image/giblets = new(base_icon, "[icon_state]_flesh", dir) @@ -207,10 +208,10 @@ var/global/list/image/splatter_cache=list() . = ..() /obj/effect/decal/cleanable/blood/gibs/up - random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6","gibup1","gibup1","gibup1") + random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gibup1", "gibup1", "gibup1") /obj/effect/decal/cleanable/blood/gibs/down - random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6","gibdown1","gibdown1","gibdown1") + random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gibdown1", "gibdown1", "gibdown1") /obj/effect/decal/cleanable/blood/gibs/body random_icon_states = list("gibhead", "gibtorso") @@ -221,15 +222,15 @@ var/global/list/image/splatter_cache=list() /obj/effect/decal/cleanable/blood/gibs/core random_icon_states = list("gibmid1", "gibmid2", "gibmid3") -/obj/effect/decal/cleanable/blood/gibs/New() - ..() +/obj/effect/decal/cleanable/blood/gibs/Initialize() + . = ..() reagents.add_reagent("liquidgibs", 5) /obj/effect/decal/cleanable/blood/gibs/cleangibs //most ironic name ever... -/obj/effect/decal/cleanable/blood/gibs/cleangibs/New() //no reagent! - ..() +/obj/effect/decal/cleanable/blood/gibs/cleangibs/Initialize() //no reagent! + . = ..() reagents.remove_reagent("liquidgibs",5) @@ -246,18 +247,20 @@ var/global/list/image/splatter_cache=list() break -/obj/effect/decal/cleanable/blood/old/New() - ..() +/obj/effect/decal/cleanable/blood/old/Initialize() + . = ..() bloodiness = 0 dry() /obj/effect/decal/cleanable/blood/old/can_bloodcrawl_in() return FALSE -/obj/effect/decal/cleanable/blood/gibs/old/New() - ..() +/obj/effect/decal/cleanable/blood/gibs/old/Initialize() + . = ..() bloodiness = 0 dry() /obj/effect/decal/cleanable/blood/gibs/old/can_bloodcrawl_in() return FALSE + +#undef DRYING_TIME diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index 1b9880bb79a..5b9ba645bf1 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -2,9 +2,9 @@ name = "clutter" desc = "Someone should clean that up." gender = PLURAL - density = 0 - anchored = 1 - layer = 2 + density = FALSE + anchored = TRUE + layer = TURF_LAYER icon = 'icons/obj/objects.dmi' icon_state = "shards" @@ -14,39 +14,39 @@ gender = PLURAL icon = 'icons/obj/objects.dmi' icon_state = "ash" - anchored = 1 + anchored = TRUE -/obj/effect/decal/cleanable/ash/New() - ..() +/obj/effect/decal/cleanable/ash/Initialize() + . = ..() reagents.add_reagent("ash", 10) /obj/effect/decal/cleanable/dirt name = "dirt" desc = "Someone should clean that up." gender = PLURAL - density = 0 - anchored = 1 - layer = 2 + density = FALSE + anchored = TRUE + layer = TURF_LAYER icon = 'icons/effects/effects.dmi' icon_state = "dirt" - mouse_opacity = 0 + mouse_opacity = FALSE /obj/effect/decal/cleanable/dirt/blackpowder name = "black powder" - mouse_opacity = 1 - noscoop = 1 + mouse_opacity = TRUE + noscoop = TRUE -/obj/effect/decal/cleanable/dirt/blackpowder/New() - ..() - reagents.add_reagent("blackpowder", 40) //size 2 explosion when activated +/obj/effect/decal/cleanable/dirt/blackpowder/Initialize() + . = ..() + reagents.add_reagent("blackpowder", 40) // size 2 explosion when activated /obj/effect/decal/cleanable/flour name = "flour" desc = "It's still good. Four second rule!" gender = PLURAL - density = 0 - anchored = 1 - layer = 2 + density = FALSE + anchored = TRUE + layer = TURF_LAYER icon = 'icons/effects/effects.dmi' icon_state = "flour" @@ -55,33 +55,31 @@ desc = "It's foam." color = "#EBEBEB" - New() - ..() - spawn(150)// 15 seconds - qdel(src) +/obj/effect/decal/cleanable/flour/foam/Initialize() + . = ..() + QDEL_IN(src, 15 SECONDS) /obj/effect/decal/cleanable/greenglow name = "glowing goo" desc = "Jeez. I hope that's not for lunch." gender = PLURAL - density = 0 - anchored = 1 - layer = 2 + density = FALSE + anchored = TRUE + layer = TURF_LAYER light_range = 1 icon = 'icons/effects/effects.dmi' icon_state = "greenglow" - New() - ..() - spawn(1200)// 2 minutes - qdel(src) +/obj/effect/decal/cleanable/greenglow/Initialize(mapload) + . = ..() + QDEL_IN(src, 2 MINUTES) /obj/effect/decal/cleanable/cobweb name = "cobweb" desc = "Somebody should remove that." - density = 0 - anchored = 1 - layer = 3 + density = FALSE + anchored = TRUE + layer = OBJ_LAYER icon = 'icons/effects/effects.dmi' icon_state = "cobweb1" burntime = 1 @@ -92,9 +90,9 @@ /obj/effect/decal/cleanable/molten_object name = "gooey grey mass" desc = "It looks like a melted... something." - density = 0 - anchored = 1 - layer = 3 + density = FALSE + anchored = TRUE + layer = OBJ_LAYER gender = NEUTER icon = 'icons/effects/effects.dmi' icon_state = "molten" @@ -106,55 +104,53 @@ /obj/effect/decal/cleanable/cobweb2 name = "cobweb" desc = "Somebody should remove that." - density = 0 - anchored = 1 - layer = 3 + density = FALSE + anchored = TRUE + layer = OBJ_LAYER icon = 'icons/effects/effects.dmi' icon_state = "cobweb2" -//Vomit (sorry) /obj/effect/decal/cleanable/vomit name = "vomit" desc = "Gosh, how unpleasant." gender = PLURAL - density = 0 - anchored = 1 - layer = 2 + density = FALSE + anchored = TRUE + layer = TURF_LAYER icon = 'icons/effects/blood.dmi' icon_state = "vomit_1" random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4") - noclear = 1 + noclear = TRUE -/obj/effect/decal/cleanable/vomit/New() - ..() +/obj/effect/decal/cleanable/vomit/Initialize() + . = ..() reagents.add_reagent("vomit", 5) - /obj/effect/decal/cleanable/vomit/green name = "green vomit" desc = "It's all gummy. Ew." icon_state = "gvomit_1" random_icon_states = list("gvomit_1", "gvomit_2", "gvomit_3", "gvomit_4") -/obj/effect/decal/cleanable/vomit/green/New() - ..() +/obj/effect/decal/cleanable/vomit/green/Initialize() + . = ..() reagents.remove_reagent("vomit", 5) reagents.add_reagent("green_vomit", 5) /obj/effect/decal/cleanable/tomato_smudge name = "tomato smudge" desc = "It's red." - density = 0 - anchored = 1 - layer = 2 + density = FALSE + anchored = TRUE + layer = TURF_LAYER icon = 'icons/effects/tomatodecal.dmi' random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3") /obj/effect/decal/cleanable/plant_smudge name = "plant smudge" - density = 0 - anchored = 1 - layer = 2 + density = FALSE + anchored = TRUE + layer = TURF_LAYER gender = NEUTER icon = 'icons/effects/tomatodecal.dmi' random_icon_states = list("smashed_plant") @@ -162,33 +158,33 @@ /obj/effect/decal/cleanable/egg_smudge name = "smashed egg" desc = "Seems like this one won't hatch." - density = 0 - anchored = 1 - layer = 2 + density = FALSE + anchored = TRUE + layer = TURF_LAYER icon = 'icons/effects/tomatodecal.dmi' random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3") /obj/effect/decal/cleanable/pie_smudge //honk name = "smashed pie" desc = "It's pie cream from a cream pie." - density = 0 - anchored = 1 - layer = 2 + density = FALSE + anchored = TRUE + layer = TURF_LAYER icon = 'icons/effects/tomatodecal.dmi' random_icon_states = list("smashed_pie") /obj/effect/decal/cleanable/fungus name = "space fungus" desc = "A fungal growth. Looks pretty nasty." - density = 0 - anchored = 1 - layer = 2 + density = FALSE + anchored = TRUE + layer = TURF_LAYER icon = 'icons/effects/effects.dmi' icon_state = "flour" color = "#D5820B" -/obj/effect/decal/cleanable/fungus/New() - ..() +/obj/effect/decal/cleanable/fungus/Initialize() + . = ..() reagents.add_reagent("fungus", 10) /obj/effect/decal/cleanable/confetti //PARTY TIME! @@ -198,6 +194,4 @@ icon = 'icons/obj/objects.dmi' icon_state = "confetti1" random_icon_states = list("confetti1", "confetti2", "confetti3") - anchored = 1 - - + anchored = TRUE diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm index 5bce827604c..16a9bf5a711 100644 --- a/code/game/objects/effects/decals/Cleanable/robots.dm +++ b/code/game/objects/effects/decals/Cleanable/robots.dm @@ -3,7 +3,7 @@ desc = "It's a useless heap of junk... or is it?" icon = 'icons/mob/robots.dmi' icon_state = "gib1" - basecolor="#030303" + basecolor = "#030303" random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7") bloodiness = MAX_SHOE_BLOODINESS @@ -20,7 +20,7 @@ return FALSE /obj/effect/decal/cleanable/blood/gibs/robot/streak(var/list/directions) - spawn (0) + spawn(0) var/direction = pick(directions) for(var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++) sleep(3) @@ -39,15 +39,15 @@ random_icon_states = list("gibarm", "gibleg") /obj/effect/decal/cleanable/blood/gibs/robot/up - random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibup1","gibup1") //2:7 is close enough to 1:4 + random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7", "gibup1", "gibup1") //2:7 is close enough to 1:4 /obj/effect/decal/cleanable/blood/gibs/robot/down - random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibdown1","gibdown1") //2:7 is close enough to 1:4 + random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7", "gibdown1", "gibdown1") //2:7 is close enough to 1:4 /obj/effect/decal/cleanable/blood/oil name = "motor oil" desc = "It's black and greasy. Looks like Beepsky made another mess." - basecolor="#030303" + basecolor = "#030303" bloodiness = MAX_SHOE_BLOODINESS /obj/effect/decal/cleanable/blood/oil/can_bloodcrawl_in() diff --git a/code/game/objects/effects/decals/Cleanable/tracks.dm b/code/game/objects/effects/decals/Cleanable/tracks.dm index 0568f2db75c..8598381aaf1 100644 --- a/code/game/objects/effects/decals/Cleanable/tracks.dm +++ b/code/game/objects/effects/decals/Cleanable/tracks.dm @@ -2,7 +2,7 @@ #define TRACKS_CRUSTIFY_TIME 50 // color-dir-dry -var/global/list/image/fluidtrack_cache=list() +var/global/list/image/fluidtrack_cache = list() // Footprints, tire trails... /obj/effect/decal/cleanable/blood/tracks @@ -23,7 +23,7 @@ var/global/list/image/fluidtrack_cache=list() desc = "You REALLY shouldn't follow these.." gender = PLURAL random_icon_states = null - basecolor="#A10808" + basecolor = "#A10808" var/entered_dirs = 0 var/exited_dirs = 0 blood_state = BLOOD_STATE_HUMAN //the icon state to load images from @@ -35,9 +35,9 @@ var/global/list/image/fluidtrack_cache=list() var/obj/item/clothing/shoes/S = H.shoes var/obj/item/organ/external/l_foot = H.get_organ("l_foot") var/obj/item/organ/external/r_foot = H.get_organ("r_foot") - var/hasfeet = 1 + var/hasfeet = TRUE if(!l_foot && !r_foot) - hasfeet = 0 + hasfeet = FALSE if(S && S.bloody_shoes[blood_state] && S.blood_color == basecolor) S.bloody_shoes[blood_state] = max(S.bloody_shoes[blood_state] - BLOOD_LOSS_PER_STEP, 0) entered_dirs |= H.dir @@ -58,9 +58,9 @@ var/global/list/image/fluidtrack_cache=list() var/obj/item/clothing/shoes/S = H.shoes var/obj/item/organ/external/l_foot = H.get_organ("l_foot") var/obj/item/organ/external/r_foot = H.get_organ("r_foot") - var/hasfeet = 1 + var/hasfeet = TRUE if(!l_foot && !r_foot) - hasfeet = 0 + hasfeet = FALSE if(S && S.bloody_shoes[blood_state] && S.blood_color == basecolor) S.bloody_shoes[blood_state] = max(S.bloody_shoes[blood_state] - BLOOD_LOSS_PER_STEP, 0) exited_dirs |= H.dir diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 09baf2b7518..09b13845879 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -1,8 +1,8 @@ /obj/effect/decal/cleanable - anchored = 1 + anchored = TRUE var/list/random_icon_states = list() - var/noscoop = 0 //if it has this, don't let it be scooped up - var/noclear = 0 //if it has this, don't delete it when its' scooped up + var/noscoop = FALSE //if it has this, don't let it be scooped up + var/noclear = FALSE //if it has this, don't delete it when its' scooped up /obj/effect/decal/cleanable/proc/can_bloodcrawl_in() return FALSE @@ -28,7 +28,8 @@ qdel(src) return if(is_hot(W)) //todo: make heating a reagent holder proc - if(istype(W, /obj/item/clothing/mask/cigarette)) return + if(istype(W, /obj/item/clothing/mask/cigarette)) + return else src.reagents.chem_temp += 15 src.reagents.handle_reactions() diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index c953993197c..ac0007e42ae 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -3,8 +3,8 @@ desc = "A rune drawn in crayon." icon = 'icons/effects/crayondecal.dmi' icon_state = "rune1" - layer = 2.1 - anchored = 1 + layer = MID_TURF_LAYER + anchored = TRUE /obj/effect/decal/cleanable/crayon/New(location, main = "#FFFFFF", var/type = "rune1", var/e_name = "rune") @@ -15,4 +15,4 @@ desc = "A [name] drawn in crayon." icon_state = type - color = main \ No newline at end of file + color = main diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm index 301fd71a98d..e2f1399a922 100644 --- a/code/game/objects/effects/decals/misc.dm +++ b/code/game/objects/effects/decals/misc.dm @@ -1,7 +1,7 @@ // Used for spray that you spray at walls, tables, hydrovats etc /obj/effect/decal/spraystill - density = 0 - anchored = 1 + density = FALSE + anchored = TRUE layer = 50 plane = HUD_PLANE @@ -11,38 +11,38 @@ pass_flags = PASSTABLE | PASSGRILLE /obj/effect/decal/snow - name="snow" - density=0 - anchored=1 - layer=2 - icon='icons/turf/snow.dmi' + name = "snow" + density = FALSE + anchored = TRUE + layer = TURF_DECAL_LAYER + icon = 'icons/turf/snow.dmi' /obj/effect/decal/snow/clean/edge - icon_state="snow_corner" + icon_state = "snow_corner" /obj/effect/decal/snow/sand/edge - icon_state="gravsnow_corner" + icon_state = "gravsnow_corner" /obj/effect/decal/snow/clean/surround - icon_state="snow_surround" + icon_state = "snow_surround" /obj/effect/decal/snow/sand/surround - icon_state="gravsnow_surround" + icon_state = "gravsnow_surround" /obj/effect/decal/leaves - name="fall leaves" - density = 0 - anchored = 1 - layer = 2 - icon='icons/obj/flora/plants.dmi' + name = "fall leaves" + density = FALSE + anchored = TRUE + layer = HIGH_TURF_LAYER + icon = 'icons/obj/flora/plants.dmi' icon_state = "fallleaves" /obj/effect/decal/straw - name="scattered straw" - density = 0 - anchored = 1 - layer = 2 - icon='icons/obj/flora/plants.dmi' + name = "scattered straw" + density = FALSE + anchored = TRUE + layer = HIGH_TURF_LAYER + icon = 'icons/obj/flora/plants.dmi' icon_state = "strawscattered" /obj/effect/decal/straw/medium @@ -52,4 +52,4 @@ icon_state = "strawscattered2" /obj/effect/decal/straw/edge - icon_state = "strawscatterededge" \ No newline at end of file + icon_state = "strawscatterededge" diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index d57a364255b..b97b149991b 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -6,21 +6,21 @@ desc = "They look like human remains. They have a strange aura about them." icon = 'icons/effects/blood.dmi' icon_state = "remains" - anchored = 1 + 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 = 1 + 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 = 1 + anchored = TRUE /obj/effect/decal/remains/robot/New() ..() @@ -33,7 +33,7 @@ desc = "Noooooooooooooooooooooo" icon = 'icons/effects/blood.dmi' icon_state = "remains" - anchored = 1 + anchored = TRUE /obj/effect/decal/remains/slime/New() ..() diff --git a/code/game/objects/effects/decals/warning_stripes.dm b/code/game/objects/effects/decals/warning_stripes.dm index dbec481e944..29af46f1192 100644 --- a/code/game/objects/effects/decals/warning_stripes.dm +++ b/code/game/objects/effects/decals/warning_stripes.dm @@ -1,6 +1,6 @@ /obj/effect/decal/warning_stripes icon = 'icons/effects/warning_stripes.dmi' - layer = 2 + layer = TURF_LAYER /obj/effect/decal/warning_stripes/north icon_state = "N" @@ -50,7 +50,7 @@ /obj/effect/decal/warning_stripes/northwestsouth icon_state = "U-E" -/obj/effect/decal/warning_stripes/New() +/obj/effect/decal/warning_stripes/Initialize() . = ..() loc.overlays += src qdel(src) @@ -107,4 +107,4 @@ icon_state = "16" /obj/effect/decal/warning_stripes/blue/hollow - icon_state = "18" \ No newline at end of file + icon_state = "18"