mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-13 11:12:14 +00:00
Merge pull request #11351 from Core0verload/nodirt
Removes dirt from walking on tiles
This commit is contained in:
@@ -25,9 +25,6 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A)
|
|||||||
if(reagents.has_reagent("water", 1) || reagents.has_reagent("holywater", 1))
|
if(reagents.has_reagent("water", 1) || reagents.has_reagent("holywater", 1))
|
||||||
A.clean_blood()
|
A.clean_blood()
|
||||||
A.thermite = 0
|
A.thermite = 0
|
||||||
var/turf/simulated/floor/F = A
|
|
||||||
if(istype(F))
|
|
||||||
F.dirt = 0
|
|
||||||
for(var/obj/effect/O in A)
|
for(var/obj/effect/O in A)
|
||||||
if(is_cleanable(O))
|
if(is_cleanable(O))
|
||||||
qdel(O)
|
qdel(O)
|
||||||
|
|||||||
@@ -181,9 +181,6 @@
|
|||||||
var/turf/tile = loc
|
var/turf/tile = loc
|
||||||
if(isturf(tile))
|
if(isturf(tile))
|
||||||
tile.clean_blood()
|
tile.clean_blood()
|
||||||
if (istype(tile, /turf/simulated/floor))
|
|
||||||
var/turf/simulated/floor/F = tile
|
|
||||||
F.dirt = 0
|
|
||||||
for(var/A in tile)
|
for(var/A in tile)
|
||||||
if(istype(A, /obj/effect))
|
if(istype(A, /obj/effect))
|
||||||
if(is_cleanable(A))
|
if(is_cleanable(A))
|
||||||
|
|||||||
@@ -32,8 +32,6 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
|
|||||||
var/obj/item/stack/tile/builtin_tile = null //needed for performance reasons when the singularity rips off floor tiles
|
var/obj/item/stack/tile/builtin_tile = null //needed for performance reasons when the singularity rips off floor tiles
|
||||||
var/list/broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5")
|
var/list/broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5")
|
||||||
var/list/burnt_states = list()
|
var/list/burnt_states = list()
|
||||||
var/dirt = 0
|
|
||||||
var/ignoredirt = 0
|
|
||||||
|
|
||||||
/turf/simulated/floor/New()
|
/turf/simulated/floor/New()
|
||||||
..()
|
..()
|
||||||
@@ -167,22 +165,5 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
|
|||||||
if(prob(20))
|
if(prob(20))
|
||||||
ChangeTurf(/turf/simulated/floor/plasteel/cult)
|
ChangeTurf(/turf/simulated/floor/plasteel/cult)
|
||||||
|
|
||||||
/turf/simulated/floor/Entered(atom/A, atom/OL)
|
|
||||||
..()
|
|
||||||
if(!ignoredirt)
|
|
||||||
if(has_gravity(src))
|
|
||||||
if(istype(A,/mob/living/carbon))
|
|
||||||
var/mob/living/carbon/M = A
|
|
||||||
if(M.lying) return
|
|
||||||
if(prob(80))
|
|
||||||
dirt++
|
|
||||||
var/obj/effect/decal/cleanable/dirt/dirtoverlay = locate(/obj/effect/decal/cleanable/dirt, src)
|
|
||||||
if(dirt >= 100)
|
|
||||||
if(!dirtoverlay)
|
|
||||||
dirtoverlay = new/obj/effect/decal/cleanable/dirt(src)
|
|
||||||
dirtoverlay.alpha = 10
|
|
||||||
else if(dirt > 100)
|
|
||||||
dirtoverlay.alpha = min(dirtoverlay.alpha+10, 200)
|
|
||||||
|
|
||||||
/turf/simulated/floor/can_have_cabling()
|
/turf/simulated/floor/can_have_cabling()
|
||||||
return !burnt & !broken & !lava
|
return !burnt & !broken & !lava
|
||||||
|
|||||||
@@ -26,7 +26,6 @@
|
|||||||
icon_state = "grass"
|
icon_state = "grass"
|
||||||
floor_tile = /obj/item/stack/tile/grass
|
floor_tile = /obj/item/stack/tile/grass
|
||||||
broken_states = list("sand")
|
broken_states = list("sand")
|
||||||
ignoredirt = 1
|
|
||||||
|
|
||||||
/turf/simulated/floor/grass/New()
|
/turf/simulated/floor/grass/New()
|
||||||
..()
|
..()
|
||||||
|
|||||||
@@ -21,7 +21,6 @@
|
|||||||
/turf/simulated/floor/plating/beach
|
/turf/simulated/floor/plating/beach
|
||||||
name = "Beach"
|
name = "Beach"
|
||||||
icon = 'icons/misc/beach.dmi'
|
icon = 'icons/misc/beach.dmi'
|
||||||
ignoredirt = 1
|
|
||||||
|
|
||||||
/turf/simulated/floor/plating/beach/ex_act(severity, target)
|
/turf/simulated/floor/plating/beach/ex_act(severity, target)
|
||||||
contents_explosion(severity, target)
|
contents_explosion(severity, target)
|
||||||
@@ -43,13 +42,11 @@
|
|||||||
..()
|
..()
|
||||||
name = "Iron Sand"
|
name = "Iron Sand"
|
||||||
icon_state = "ironsand[rand(1,15)]"
|
icon_state = "ironsand[rand(1,15)]"
|
||||||
ignoredirt = 1
|
|
||||||
|
|
||||||
/turf/simulated/floor/plating/snow
|
/turf/simulated/floor/plating/snow
|
||||||
name = "snow"
|
name = "snow"
|
||||||
icon = 'icons/turf/snow.dmi'
|
icon = 'icons/turf/snow.dmi'
|
||||||
icon_state = "snow"
|
icon_state = "snow"
|
||||||
ignoredirt = 1
|
|
||||||
|
|
||||||
/turf/simulated/floor/plating/snow/ex_act(severity, target)
|
/turf/simulated/floor/plating/snow/ex_act(severity, target)
|
||||||
contents_explosion(severity, target)
|
contents_explosion(severity, target)
|
||||||
|
|||||||
@@ -66,7 +66,6 @@
|
|||||||
color = "#aa77aa"
|
color = "#aa77aa"
|
||||||
icon_state = "vinefloor"
|
icon_state = "vinefloor"
|
||||||
broken_states = list()
|
broken_states = list()
|
||||||
ignoredirt = 1
|
|
||||||
|
|
||||||
|
|
||||||
//All of this shit is useless for vines
|
//All of this shit is useless for vines
|
||||||
|
|||||||
@@ -509,7 +509,6 @@ var/global/list/rockTurfEdgeCache
|
|||||||
icon_state = "asteroid"
|
icon_state = "asteroid"
|
||||||
icon_plating = "asteroid"
|
icon_plating = "asteroid"
|
||||||
var/dug = 0 //0 = has not yet been dug, 1 = has already been dug
|
var/dug = 0 //0 = has not yet been dug, 1 = has already been dug
|
||||||
ignoredirt = 1
|
|
||||||
|
|
||||||
/turf/simulated/floor/plating/asteroid/airless
|
/turf/simulated/floor/plating/asteroid/airless
|
||||||
oxygen = 0.01
|
oxygen = 0.01
|
||||||
|
|||||||
@@ -862,9 +862,6 @@
|
|||||||
var/turf/tile = loc
|
var/turf/tile = loc
|
||||||
if(isturf(tile))
|
if(isturf(tile))
|
||||||
tile.clean_blood()
|
tile.clean_blood()
|
||||||
if (istype(tile, /turf/simulated/floor))
|
|
||||||
var/turf/simulated/floor/F = tile
|
|
||||||
F.dirt = 0
|
|
||||||
for(var/A in tile)
|
for(var/A in tile)
|
||||||
if(istype(A, /obj/effect))
|
if(istype(A, /obj/effect))
|
||||||
if(is_cleanable(A))
|
if(is_cleanable(A))
|
||||||
|
|||||||
@@ -646,10 +646,6 @@
|
|||||||
|
|
||||||
for(var/mob/living/simple_animal/slime/M in T)
|
for(var/mob/living/simple_animal/slime/M in T)
|
||||||
M.adjustToxLoss(rand(5,10))
|
M.adjustToxLoss(rand(5,10))
|
||||||
if(istype(T, /turf/simulated/floor))
|
|
||||||
var/turf/simulated/floor/F = T
|
|
||||||
if(reac_volume >= 1)
|
|
||||||
F.dirt = 0
|
|
||||||
|
|
||||||
/datum/reagent/space_cleaner/reaction_mob(mob/M, method=TOUCH, reac_volume)
|
/datum/reagent/space_cleaner/reaction_mob(mob/M, method=TOUCH, reac_volume)
|
||||||
if(method == TOUCH || VAPOR)
|
if(method == TOUCH || VAPOR)
|
||||||
|
|||||||
Reference in New Issue
Block a user