mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-29 15:08:34 +01:00
Deconf 2: Electric Boogaloo
This commit is contained in:
@@ -81,6 +81,13 @@
|
||||
health = 0
|
||||
healthcheck()
|
||||
return
|
||||
if(locate(/obj/item/organ/internal/xenos/resinspinner/replicant) in M.internal_organs)
|
||||
if(!do_after(M, 3 SECONDS))
|
||||
return
|
||||
visible_message ("<span class='warning'>[usr] strokes the [name] and it melts away!</span>", 1)
|
||||
health = 0
|
||||
healthcheck()
|
||||
return
|
||||
visible_message("<span class='warning'>[usr] claws at the [name]!</span>")
|
||||
health -= rand(5,10)
|
||||
healthcheck()
|
||||
|
||||
@@ -29,6 +29,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
|
||||
equippable_item_whitelist = typecacheof(list(
|
||||
/obj/item/storage/bag/trash,
|
||||
/obj/item/mop,
|
||||
/obj/item/mop/advanced,
|
||||
/obj/item/reagent_containers/spray,
|
||||
/obj/item/lightreplacer,
|
||||
/obj/item/clothing/suit/caution,
|
||||
@@ -49,7 +50,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
|
||||
mybag = I
|
||||
setTguiIcon("mybag", mybag)
|
||||
|
||||
else if(istype(I, /obj/item/mop))
|
||||
else if(istype(I, /obj/item/mop) || istype(I, /obj/item/mop/advanced))
|
||||
if(mymop)
|
||||
to_chat(user, "<span class='warning'>[src] already has \an [I].</span>")
|
||||
return FALSE
|
||||
|
||||
Reference in New Issue
Block a user