From bfb3d087c3221ab8a217646d08445241fa8392e6 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 26 Dec 2020 20:50:28 -0800 Subject: [PATCH] ok --- .../configuration/entries/game_options.dm | 2 +- code/game/objects/effects/decals/cleanable.dm | 2 +- .../objects/effects/decals/cleanable/misc.dm | 2 +- code/game/turfs/simulated/floor/plating.dm | 24 +++++++++---------- code/modules/mob/living/living_movement.dm | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index dcede1e3e0..ffa73d2c32 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -570,7 +570,7 @@ /// Amount of dirtyness tiles need to spawn dirt. /datum/config_entry/number/turf_dirt_threshold config_entry_value = 100 - min_value = 1 + min_val = 1 integer = TRUE /// Alpha dirt starts at diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index b447b46754..5a6d5e54e9 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -6,7 +6,7 @@ /// Can we stack multiple in one tile? var/persistence_allow_stacking = FALSE /// Are we deleted by turf changes? - var/wiped_by_turf_change = FALSE + var/wiped_by_floor_change = FALSE var/list/random_icon_states = null var/blood_state = "" //I'm sorry but cleanable/blood code is ass, and so is blood_DNA diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index e2cd40a1af..2bd79edfb4 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -64,7 +64,7 @@ beauty = -75 mergeable_decal = TRUE persistent = TRUE - wiped_by_turf_change = TRUE + wiped_by_floor_change = TRUE /obj/effect/decal/cleanable/dirt/Initialize(mapload) . = ..() diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 539fcb63e0..1b875a5e69 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -61,9 +61,9 @@ to_chat(user, "You begin reinforcing the floor...") if(do_after(user, 30, target = src)) if (R.get_amount() >= 2 && !istype(src, /turf/open/floor/engine)) - for(var/obj/effect/decal/cleanable/C in src) - if(C.wiped_by_floor_change) - qdel(C) + for(var/obj/effect/decal/cleanable/decal in src) + if(decal.wiped_by_floor_change) + qdel(decal) PlaceOnTop(/turf/open/floor/engine, flags = CHANGETURF_INHERIT_AIR) playsound(src, 'sound/items/deconstruct.ogg', 80, 1) R.use(2) @@ -81,9 +81,9 @@ to_chat(user, "You begin adding glass to the floor...") if(do_after(user, 5, target = src)) if (G.get_amount() >= 2 && !istype(src, /turf/open/transparent/glass)) - for(var/obj/effect/decal/cleanable/C in src) - if(C.wiped_by_floor_change) - qdel(C) + for(var/obj/effect/decal/cleanable/decal in src) + if(decal.wiped_by_floor_change) + qdel(decal) PlaceOnTop(/turf/open/transparent/glass, flags = CHANGETURF_INHERIT_AIR) playsound(src, 'sound/items/deconstruct.ogg', 80, 1) G.use(2) @@ -101,9 +101,9 @@ to_chat(user, "You begin adding reinforced glass to the floor...") if(do_after(user, 10, target = src)) if (RG.get_amount() >= 2 && !istype(src, /turf/open/transparent/glass/reinforced)) - for(var/obj/effect/decal/cleanable/C in src) - if(C.wiped_by_floor_change) - qdel(C) + for(var/obj/effect/decal/cleanable/decal in src) + if(decal.wiped_by_floor_change) + qdel(decal) PlaceOnTop(/turf/open/transparent/glass/reinforced, flags = CHANGETURF_INHERIT_AIR) playsound(src, 'sound/items/deconstruct.ogg', 80, 1) RG.use(2) @@ -119,9 +119,9 @@ var/obj/item/stack/tile/W = C if(!W.use(1)) return - for(var/obj/effect/decal/cleanable/C in src) - if(C.wiped_by_floor_change) - qdel(C) + for(var/obj/effect/decal/cleanable/decal in src) + if(decal.wiped_by_floor_change) + qdel(decal) if(istype(W, /obj/item/stack/tile/material)) var/turf/newturf = PlaceOnTop(/turf/open/floor/material, flags = CHANGETURF_INHERIT_AIR) newturf.set_custom_materials(W.custom_materials) diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm index d4694a76ea..1196bc0252 100644 --- a/code/modules/mob/living/living_movement.dm +++ b/code/modules/mob/living/living_movement.dm @@ -107,7 +107,7 @@ /** * Attempts to make the floor dirty. */ -/mob/living/proc/dirt_buildup(strength =) +/mob/living/proc/dirt_buildup(strength = 1) var/turf/open/T = loc if(!istype(T) || !T.dirt_buildup_allowed) return