mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2025-12-27 02:32:20 +00:00
9634181318
* Janitorial Quality of Life - Trash Bags fit in satchels/bags/duffelbags - Advanced Mops clean faster, can clean more - Holosign Projectors can create more signs - New Closet added, with janitorial stuff that was previously on the ground - Ghosts can no longer create dirt - Dirt creation slowed down - Janitorial Closet tidied up * Removes redundant check * Trash Bags become heavier with use * Fixes Map Merge not being done * Re-adds Box Refilling because I am an idiot Missing parenthesis, not even ONCE * Unblocks MULEbot docking area * Adds broken bulb recycling * Addresses Fox's/DZD's concerns * Adds sanity checks for NODROP
94 lines
2.9 KiB
Plaintext
94 lines
2.9 KiB
Plaintext
#define is_cleanable(A) (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/rune))
|
|
|
|
/obj/item/weapon/mop
|
|
desc = "The world of janitalia wouldn't be complete without a mop."
|
|
name = "mop"
|
|
icon = 'icons/obj/janitor.dmi'
|
|
icon_state = "mop"
|
|
force = 3.0
|
|
throwforce = 5.0
|
|
throw_speed = 3
|
|
throw_range = 7
|
|
w_class = 3
|
|
attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
|
|
burn_state = FLAMMABLE
|
|
var/mopping = 0
|
|
var/mopcount = 0
|
|
var/mopcap = 5
|
|
var/mopspeed = 30
|
|
|
|
/obj/item/weapon/mop/New()
|
|
create_reagents(mopcap)
|
|
janitorial_equipment += src
|
|
|
|
/obj/item/weapon/mop/Destroy()
|
|
janitorial_equipment -= src
|
|
return ..()
|
|
|
|
/obj/item/weapon/mop/proc/clean(turf/simulated/A)
|
|
if(reagents.has_reagent("water", 1) || reagents.has_reagent("cleaner", 1) || reagents.has_reagent("holywater", 1))
|
|
A.clean_blood()
|
|
for(var/obj/effect/O in A)
|
|
if(is_cleanable(O))
|
|
qdel(O)
|
|
reagents.reaction(A, TOUCH, 10) //10 is the multiplier for the reaction effect. probably needed to wet the floor properly.
|
|
reagents.remove_any(1) //reaction() doesn't use up the reagents
|
|
|
|
/obj/item/weapon/mop/afterattack(atom/A, mob/user, proximity)
|
|
if(!proximity) return
|
|
|
|
if(reagents.total_volume < 1)
|
|
to_chat(user, "<span class='warning'>Your mop is dry!</span>")
|
|
return
|
|
|
|
var/turf/simulated/turf = A
|
|
if(is_cleanable(A))
|
|
turf = A.loc
|
|
A = null
|
|
|
|
if(istype(turf))
|
|
user.visible_message("[user] begins to clean \the [turf] with [src].", "<span class='notice'>You begin to clean \the [turf] with [src]...</span>")
|
|
|
|
if(do_after(user, src.mopspeed, target = turf))
|
|
to_chat(user, "<span class='notice'>You finish mopping.</span>")
|
|
clean(turf)
|
|
|
|
|
|
/obj/effect/attackby(obj/item/I, mob/user, params)
|
|
if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/soap))
|
|
return
|
|
..()
|
|
|
|
/obj/item/weapon/mop/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J)
|
|
J.put_in_cart(src, user)
|
|
J.mymop=src
|
|
J.update_icon()
|
|
|
|
/obj/item/weapon/mop/wash(mob/user, atom/source)
|
|
reagents.add_reagent("water", 5)
|
|
to_chat(user, "<span class='notice'>You wet [src] in [source].</span>")
|
|
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
|
|
return 1
|
|
|
|
/obj/item/weapon/mop/advanced
|
|
desc = "The most advanced tool in a custodian's arsenal. Just think of all the viscera you will clean up with this!"
|
|
name = "advanced mop"
|
|
mopcap = 15
|
|
icon_state = "advmop"
|
|
item_state = "mop" //meh will do for now until TG makes one
|
|
force = 6
|
|
throwforce = 8
|
|
throw_range = 4
|
|
mopspeed = 10
|
|
|
|
/obj/item/weapon/mop/advanced/cyborg
|
|
mopcap = 40
|
|
|
|
/obj/item/weapon/mop/advanced/cyborg/New()
|
|
..()
|
|
reagents.add_reagent("water", mopcap)
|
|
|
|
/obj/item/weapon/mop/advanced/cyborg/examine(mob/user)
|
|
..(user)
|
|
to_chat(user, "<span class='notice'>The mop's water tank has [round(reagents.get_reagent_amount("water"))] units of water left.</span>")
|