[MIRROR] Fixes decals and makes the janitor relevant again (#2397)

* Fixes decals and makes the janitor relevant again (#55805)

* guys come on why

* there you go

* and again because autodoc is apparently a thing

* Fixes decals and makes the janitor relevant again

Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-12-31 03:06:08 +00:00
committed by GitHub
co-authored by Seris02
parent 3fede56c0b
commit 58ba42600a
6 changed files with 20 additions and 5 deletions
@@ -6,6 +6,8 @@
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?
var/beauty = 0
///The type of cleaning required to clean the decal, CLEAN_TYPE_LIGHT_DECAL can be cleaned with mops and soap, CLEAN_TYPE_HARD_DECAL can be cleaned by soap, see __DEFINES/cleaning.dm for the others
var/clean_type = CLEAN_TYPE_LIGHT_DECAL
/obj/effect/decal/cleanable/Initialize(mapload, list/datum/disease/diseases)
. = ..()
@@ -88,9 +90,11 @@
update_icon()
/obj/effect/decal/cleanable/wash(clean_types)
..()
qdel(src)
return TRUE
. = ..()
if (. || (clean_types & clean_type))
qdel(src)
return TRUE
return .
/obj/effect/decal/cleanable/proc/can_bloodcrawl_in()
if((blood_state != BLOOD_STATE_OIL) && (blood_state != BLOOD_STATE_NOT_BLOODY))
@@ -9,6 +9,7 @@
bloodiness = BLOOD_AMOUNT_PER_DECAL
blood_state = BLOOD_STATE_XENO
beauty = -250
clean_type = CLEAN_TYPE_BLOOD
/obj/effect/decal/cleanable/xenoblood/Initialize()
. = ..()
@@ -7,6 +7,7 @@
blood_state = BLOOD_STATE_HUMAN
bloodiness = BLOOD_AMOUNT_PER_DECAL
beauty = -100
clean_type = CLEAN_TYPE_BLOOD
/obj/effect/decal/cleanable/blood/replace_decal(obj/effect/decal/cleanable/blood/C)
C.add_blood_DNA(return_blood_DNA())
@@ -108,6 +108,7 @@
icon_state = "cobweb1"
resistance_flags = FLAMMABLE
beauty = -100
clean_type = CLEAN_TYPE_HARD_DECAL
/obj/effect/decal/cleanable/cobweb/cobweb2
icon_state = "cobweb2"
@@ -120,6 +121,7 @@
icon_state = "molten"
mergeable_decal = FALSE
beauty = -150
clean_type = CLEAN_TYPE_HARD_DECAL
/obj/effect/decal/cleanable/molten_object/large
name = "big gooey grey mass"
@@ -250,6 +252,7 @@
icon_state = "garbage"
layer = OBJ_LAYER //To display the decal over wires.
beauty = -150
clean_type = CLEAN_TYPE_HARD_DECAL
/obj/effect/decal/cleanable/garbage/Initialize()
. = ..()
@@ -11,6 +11,7 @@
bloodiness = BLOOD_AMOUNT_PER_DECAL
mergeable_decal = FALSE
beauty = -50
clean_type = CLEAN_TYPE_BLOOD
/obj/effect/decal/cleanable/robot_debris/Initialize()
. = ..()
@@ -67,6 +68,7 @@
blood_state = BLOOD_STATE_OIL
bloodiness = BLOOD_AMOUNT_PER_DECAL
beauty = -100
clean_type = CLEAN_TYPE_BLOOD
/obj/effect/decal/cleanable/oil/Initialize()
. = ..()