mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-26 09:03:37 +00:00
0caa59b21a
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()". If there are other things in this commit, the PR's description will explain them.
84 lines
2.2 KiB
Plaintext
84 lines
2.2 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
|
|
throwforce = 5
|
|
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)
|
|
|
|
|
|
obj/item/weapon/mop/proc/clean(turf/A)
|
|
if(reagents.has_reagent("water", 1) || reagents.has_reagent("holywater", 1) || reagents.has_reagent("vodka", 1))
|
|
A.clean_blood()
|
|
for(var/obj/effect/O in A)
|
|
if(is_cleanable(O))
|
|
qdel(O)
|
|
if(istype(A, /turf/closed))
|
|
var/turf/closed/C = A
|
|
C.thermite = 0
|
|
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)
|
|
user << "<span class='warning'>Your mop is dry!</span>"
|
|
return
|
|
|
|
var/turf/turf = A
|
|
if(is_cleanable(A))
|
|
turf = A.loc
|
|
|
|
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))
|
|
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
|
|
else
|
|
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/cyborg
|
|
|
|
/obj/item/weapon/mop/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J)
|
|
return
|
|
|
|
/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 = 10
|
|
icon_state = "advmop"
|
|
item_state = "mop"
|
|
force = 6
|
|
throwforce = 8
|
|
throw_range = 4
|
|
mopspeed = 20
|