mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-30 03:52:52 +00:00
63eafb3643
In this PR: Destroy() fixes backported from PR #1783. JaniPDA fixes & improvements. Chickens no longer consume their own eggs. Language adding in setup is now 100% more sane. Chemical dispensers now actually check that the user is still alive before renaming. Ghosts are now marked as non-simulated atoms. Non-simulated atoms no longer trigger proximity listeners. Vendors no longer accept synthetic tools as stocking options. Fixes #812. Fixes #1877, Fixes #1929. Fixes #1930. Fixes #1152, Fixes #1917. Fixes #1902. Fixes #1165.
44 lines
1.2 KiB
Plaintext
44 lines
1.2 KiB
Plaintext
/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 = 10.0
|
|
throw_speed = 5
|
|
throw_range = 10
|
|
w_class = 3.0
|
|
attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
|
|
var/mopping = 0
|
|
var/mopcount = 0
|
|
|
|
/obj/item/weapon/mop/New()
|
|
..()
|
|
create_reagents(30)
|
|
janitorial_supplies |= src
|
|
|
|
/obj/item/weapon/mop/Destroy()
|
|
janitorial_supplies -= src
|
|
return ..()
|
|
|
|
/obj/item/weapon/mop/afterattack(atom/A, mob/user, proximity)
|
|
if(!proximity) return
|
|
if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune))
|
|
if(reagents.total_volume < 1)
|
|
user << "<span class='notice'>Your mop is dry!</span>"
|
|
return
|
|
|
|
user.visible_message("<span class='warning'>[user] begins to clean \the [get_turf(A)].</span>")
|
|
|
|
if(do_after(user, 40))
|
|
var/turf/T = get_turf(A)
|
|
if(T)
|
|
T.clean(src, user)
|
|
user << "<span class='notice'>You have finished mopping!</span>"
|
|
|
|
|
|
/obj/effect/attackby(obj/item/I, mob/user)
|
|
if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/soap))
|
|
return
|
|
..()
|