mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-18 14:12:20 +00:00
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
This commit is contained in:
@@ -21,6 +21,7 @@
|
|||||||
obj/item/weapon/mop/proc/clean(turf/simulated/A)
|
obj/item/weapon/mop/proc/clean(turf/simulated/A)
|
||||||
if(reagents.has_reagent("water", 1))
|
if(reagents.has_reagent("water", 1))
|
||||||
A.clean_blood()
|
A.clean_blood()
|
||||||
|
A.dirt = 0
|
||||||
for(var/obj/effect/O in A)
|
for(var/obj/effect/O in A)
|
||||||
if(istype(O,/obj/effect/rune) || istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay))
|
if(istype(O,/obj/effect/rune) || istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay))
|
||||||
del(O)
|
del(O)
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
nitrogen = MOLES_N2STANDARD
|
nitrogen = MOLES_N2STANDARD
|
||||||
var/to_be_destroyed = 0 //Used for fire, if a melting temperature was reached, it will be destroyed
|
var/to_be_destroyed = 0 //Used for fire, if a melting temperature was reached, it will be destroyed
|
||||||
var/max_fire_temperature_sustained = 0 //The max temperature of the fire which it was subjected to
|
var/max_fire_temperature_sustained = 0 //The max temperature of the fire which it was subjected to
|
||||||
|
var/dirt = 0
|
||||||
/turf/simulated/New()
|
/turf/simulated/New()
|
||||||
..()
|
..()
|
||||||
levelupdate()
|
levelupdate()
|
||||||
@@ -21,18 +21,13 @@
|
|||||||
if (istype(A,/mob/living/carbon))
|
if (istype(A,/mob/living/carbon))
|
||||||
var/mob/living/carbon/M = A
|
var/mob/living/carbon/M = A
|
||||||
if(M.lying) return
|
if(M.lying) return
|
||||||
|
dirt++
|
||||||
|
if (dirt > 40)
|
||||||
|
dirt = 0
|
||||||
|
if (!locate(/obj/effect/decal/cleanable/dirt, src))
|
||||||
|
new/obj/effect/decal/cleanable/dirt(src)
|
||||||
if(istype(M, /mob/living/carbon/human))
|
if(istype(M, /mob/living/carbon/human))
|
||||||
var/mob/living/carbon/human/H = M
|
var/mob/living/carbon/human/H = M
|
||||||
if(istype(H.shoes, /obj/item/clothing/shoes/clown_shoes))
|
|
||||||
var/obj/item/clothing/shoes/clown_shoes/O = H.shoes
|
|
||||||
if(H.m_intent == "run")
|
|
||||||
if(O.footstep >= 2)
|
|
||||||
O.footstep = 0
|
|
||||||
playsound(src, "clownstep", 50, 1) // this will get annoying very fast.
|
|
||||||
else
|
|
||||||
O.footstep++
|
|
||||||
else
|
|
||||||
playsound(src, "clownstep", 20, 1)
|
|
||||||
|
|
||||||
var/list/bloodDNA = null
|
var/list/bloodDNA = null
|
||||||
if(H.shoes)
|
if(H.shoes)
|
||||||
|
|||||||
Reference in New Issue
Block a user