mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-03-31 09:31:47 +01:00
* fixes * fuck my stupid chungus life * Minion limit, heal fix, dead sac fix * cooldown, no sacrificing star gazer or ascended alive heretics * blade debuff * oopsy * Update tgui.bundle.js * map diff bot what ya doing * fuck that chat spam * lets heretic armour hold a haunted longsword * why not it makes sense * do_after * god I hate this bullshit * other lewc stuff * push * heretic id card fix * she tg on my ui till I css * yes * spent * fix / ipc buff (real)™️ * moderate again * revert * no reserve * bringing up to master * update map files to master * didnt replace centcomm * beginning some rebalancing * aggressive spread tweaks * lots of tweaks and fixes * trying to un-key the maps * maybe this time * this time???? * oops * sql fix * basicmob conversion * paintings! and a critical influence fix * rust + tweaks * monster tweak * small change * removing this * more tweaks. no more dusting * added some examine_more * flower seeds * various tweaks. more to come * no more conduit spacing * fixed some dumb stuff * silly stuff * its always prettier * bugfixes and linters * linters, wow * oops * bah * linter * fuck you * temp check * hidden influence drain * influence visible message * tweak fix * void cloak bugfix * small fixes * fixes * do_after_once broken * fixes and tweaks * heretic blade potential fix + sacrifice changes * batch of fixes * tiny tweak * rebuilt TGUI * no greentext + rerolls * logging + bugfix * unused var * small fix * various fixes * comment * projectile change * tgui rebuild * tgui bundle redo * rune issue solved * influence visible now * fix ui reloading * new moon ascension + fixes + icons * tweaks, species sprites * tgui rebuild * small tweak + linter * harvester icon tweak * spans * fixes and tweaks * caretaker nerf + tweaks * potential fix for knowledge * roller fix * mad mask * Update tgui.bundle.js * void phase tweak * Update tgui.bundle.js * misc tweaks * fix heretic not retargeting correctly with cryo * simplify logic * this is better * lots of fixes and tweaks * Update tgui.bundle.js * linter * linter * fireshark and greyscale insanity * fish * Update tgui.bundle.js * linter * linter * tgui * no window shopping * fish fix * tgui rebundle * moon smile runtime fix * various fixes * sacrifice fixes * insanity is easier now, madness mask changes. * bugfixing + teleport change * linters + tweaks * Update code/modules/antagonists/heretic/status_effects/mark_effects.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/modules/antagonists/heretic/status_effects/mark_effects.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> --------- Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> Co-authored-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Paul <pmerkamp@gmail.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
105 lines
4.2 KiB
Plaintext
105 lines
4.2 KiB
Plaintext
#define CMAG_CLEANTIME 50 //The cleaning time for cmagged objects is locked to this, for balance reasons
|
|
|
|
|
|
//For handling standard click-to-clean items like soap and mops.
|
|
|
|
//text_verb and text_description carry strings that, when pieced together by this proc, make the cleaning messages.
|
|
//text_verb is the verb that'll be used for cleaning, i.e. "User begins to [mop] the floor."
|
|
|
|
//text_description by default appends the name of the cleaning object to the cleaning message, i.e. "User begins to clean the floor[ with soap.]"
|
|
//If text_description is ".", the sentence will end early (so you don't say "Lusty Xenomorph Maid begins to clean the floor with the Lusty Xenomorph Maid")
|
|
|
|
//text_targetname is the name of the object being interacted with, i.e. "User begins to scrub out the [rune] with the damp rag."
|
|
//Can normally be left alone, but needs to be defined if the thing being cleaned isn't necessarily the thing being clicked on,
|
|
//such as /obj/effect/rune/cleaning_act() bouncing to turf/simulated/cleaning_act().
|
|
|
|
// skip_do_after - When TRUE, do after and visible messages are disabled
|
|
|
|
/atom/proc/cleaning_act(mob/user, atom/cleaner, cleanspeed = 5 SECONDS, text_verb = "clean", text_description = " with [cleaner].", text_targetname = name, skip_do_after = FALSE)
|
|
var/is_cmagged = FALSE
|
|
|
|
if(user.client && (src in user.client.screen)) //You can't clean items you're wearing for technical reasons
|
|
to_chat(user, SPAN_NOTICE("You need to take that [text_targetname] off before cleaning it."))
|
|
return FALSE
|
|
|
|
var/is_dirty = FALSE
|
|
if(HAS_TRAIT(src, TRAIT_CMAGGED)) //So we don't need a cleaning_act for every cmaggable object
|
|
is_cmagged = TRUE
|
|
text_verb = "clean the ooze off"
|
|
cleanspeed = CMAG_CLEANTIME
|
|
is_dirty = TRUE
|
|
else if(ismob(src))
|
|
// Mobs always get cleaned directly, because humans have clothing that needs cleaning, and because it'd just feel weird to automatically clean under them.
|
|
is_dirty = TRUE
|
|
else if(blood_DNA)
|
|
is_dirty = TRUE
|
|
else
|
|
for(var/obj/effect/decal/cleanable/C in src)
|
|
is_dirty = TRUE
|
|
break
|
|
for(var/obj/effect/heretic_rune/H in src)
|
|
is_dirty = TRUE
|
|
break
|
|
|
|
if(!is_dirty && !isturf(src))
|
|
// We don't need cleaning, so let's spare the janitor a pixel hunt and let the floor under us get cleaned instead.
|
|
var/turf/T = get_turf(src)
|
|
return T.cleaning_act(user, cleaner, cleanspeed, text_verb, " under [src][text_description].", skip_do_after=skip_do_after)
|
|
|
|
if(!skip_do_after)
|
|
user.visible_message(SPAN_WARNING("[user] begins to [text_verb] \the [text_targetname][text_description]"), SPAN_WARNING("You begin to [text_verb] \the [text_targetname][text_description]"))
|
|
if(!do_after(user, cleanspeed, target = src))
|
|
return FALSE
|
|
|
|
if(!cleaner.can_clean())
|
|
cleaner.post_clean(src, user)
|
|
return FALSE
|
|
|
|
cleaner.post_clean(src, user)
|
|
|
|
if(!skip_do_after)
|
|
to_chat(user, SPAN_NOTICE("You [text_verb] \the [text_targetname][text_description]"))
|
|
|
|
if(is_cmagged) //If we've cleaned a cmagged object
|
|
REMOVE_TRAIT(src, TRAIT_CMAGGED, CLOWN_EMAG)
|
|
uncmag()
|
|
return TRUE
|
|
else
|
|
//Generic cleaning functionality
|
|
for(var/obj/effect/decal/cleanable/C in src)
|
|
qdel(C)
|
|
for(var/obj/effect/heretic_rune/H in src)
|
|
qdel(H)
|
|
clean_blood()
|
|
SEND_SIGNAL(src, COMSIG_COMPONENT_CLEAN_ACT)
|
|
return TRUE
|
|
|
|
/atom/proc/can_clean() //For determining if a cleaning object can actually remove decals
|
|
return FALSE
|
|
|
|
/atom/proc/post_clean(atom/target, mob/user) //For specific cleaning object behaviors after cleaning, such as mops making floors slippery.
|
|
return
|
|
|
|
/*
|
|
* # machine_wash()
|
|
*
|
|
* Called by machinery/washing_machine during its wash cycle
|
|
* allows custom behaviour to be implemented on items that are put through the washing machine
|
|
* by default it un cmag's objects and cleans all contaminents off of the item
|
|
*
|
|
* source - the washing_machine that is responsible for the washing, used by overrides to detect color to dye with
|
|
*/
|
|
/atom/movable/proc/machine_wash(obj/machinery/washing_machine/source)
|
|
if(HAS_TRAIT(src, TRAIT_CMAGGED)) //If we've cleaned a cmagged object
|
|
uncmag()
|
|
REMOVE_TRAIT(src, TRAIT_CMAGGED, CLOWN_EMAG)
|
|
|
|
//Generic cleaning functionality
|
|
var/obj/effect/decal/cleanable/C = locate() in src
|
|
if(!QDELETED(C))
|
|
qdel(C)
|
|
clean_blood()
|
|
|
|
|
|
#undef CMAG_CLEANTIME
|