mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 19:17:50 +01:00
FloFluoroandGitHub
6a876e1994
* Standardizes cleaning item functionality into "cleaning_act" proc * Culling commented-out code * Damp rag now checks for humans before cleaning * Change proc scoping, moved mop reagent check out of cleaning.dm * Adds can_clean and post_clean procs to handle mopping, removes ismop parameter * Adds can_clean() to cleaning objects/mobs * cleaning_act() now carries message strings as params * Refactored cleaning_act() for earlier returns and less redundancy * cleaning_act now runs on the target atom, instead of the cleaning object * Changed turf checks to overrides, rescoped clean_turf, lots of tidying * Removed cleaner param from post_clean, since it'll always be src * Code review tidying * Tidying.......... * Removed clean_turf and put its functionality in turf/simulated/cleaning_act(), added new param to keep track of original targeted object * Moved cleaning.dm from datums to code/game/objects * Added early return, defined cleanspeed in seconds
43 lines
1.5 KiB
Plaintext
43 lines
1.5 KiB
Plaintext
|
|
/mob
|
|
var/bloody_hands = 0
|
|
var/list/feet_blood_DNA
|
|
var/feet_blood_color
|
|
var/blood_state = BLOOD_STATE_NOT_BLOODY
|
|
var/list/bloody_feet = list(BLOOD_STATE_HUMAN = 0, BLOOD_STATE_XENO = 0, BLOOD_STATE_NOT_BLOODY = 0, BLOOD_BASE_ALPHA = BLOODY_FOOTPRINT_BASE_ALPHA)
|
|
|
|
/obj/item/clothing/gloves
|
|
var/transfer_blood = 0
|
|
|
|
/obj/item/reagent_containers/glass/rag
|
|
name = "damp rag"
|
|
desc = "For cleaning up messes, you suppose."
|
|
w_class = WEIGHT_CLASS_TINY
|
|
icon = 'icons/obj/toy.dmi'
|
|
icon_state = "rag"
|
|
amount_per_transfer_from_this = 5
|
|
possible_transfer_amounts = null
|
|
volume = 5
|
|
flags = NOBLUDGEON
|
|
container_type = OPENCONTAINER
|
|
has_lid = FALSE
|
|
blocks_emissive = EMISSIVE_BLOCK_GENERIC
|
|
var/wipespeed = 30
|
|
|
|
/obj/item/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag)
|
|
if(ismob(target) && target.reagents && reagents.total_volume)
|
|
user.visible_message("<span class='danger'>[user] has smothered [target] with [src]!</span>", "<span class='danger'>You smother [target] with [src]!</span>", "You hear some struggling and muffled cries of surprise")
|
|
src.reagents.reaction(target, REAGENT_TOUCH)
|
|
src.reagents.clear_reagents()
|
|
return
|
|
else
|
|
..()
|
|
|
|
/obj/item/reagent_containers/glass/rag/afterattack(atom/target, mob/user, proximity)
|
|
if(!proximity || ishuman(target)) //Human check so we don't clean the person we're trying to ether
|
|
return
|
|
target.cleaning_act(user, src, wipespeed)
|
|
|
|
/obj/item/reagent_containers/glass/rag/can_clean()
|
|
return TRUE
|