mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-01-30 02:44:26 +00:00
Merge pull request #8728 from VOREStation/upstream-merge-7466
[MIRROR] Adds wearing cones and caution signs
This commit is contained in:
@@ -7,6 +7,7 @@
|
||||
* Kitty ears
|
||||
* Holiday hats
|
||||
Crown of Wrath
|
||||
Warning cone
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -288,3 +289,19 @@
|
||||
/obj/item/clothing/head/psy_crown/gluttony/activate_ability(var/mob/living/wearer)
|
||||
..()
|
||||
wearer.add_modifier(/datum/modifier/gluttonyregeneration, 45 SECONDS)
|
||||
|
||||
/obj/item/clothing/head/cone
|
||||
name = "warning cone"
|
||||
desc = "This cone is trying to warn you of something!"
|
||||
description_info = "It looks like you can wear it in your head slot."
|
||||
icon_state = "cone"
|
||||
item_state = "cone"
|
||||
drop_sound = 'sound/items/drop/shoes.ogg'
|
||||
force = 1
|
||||
throwforce = 3
|
||||
throw_speed = 2
|
||||
throw_range = 5
|
||||
w_class = 2
|
||||
body_parts_covered = HEAD
|
||||
attack_verb = list("warned", "cautioned", "smashed")
|
||||
armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
|
||||
@@ -892,3 +892,38 @@ obj/item/clothing/suit/kamishimo
|
||||
/obj/item/clothing/suit/storage/snowsuit/science
|
||||
name = "science snowsuit"
|
||||
icon_state = "snowsuit_science"
|
||||
|
||||
/obj/item/clothing/suit/caution
|
||||
name = "wet floor sign"
|
||||
desc = "Caution! Wet Floor!"
|
||||
description_fluff = "Used by the janitor to passive-aggressively point at when you eventually slip on one of their mopped floors."
|
||||
description_info = "Alt-click, or click in-hand to toggle the caution lights. It looks like you can wear it in your suit slot."
|
||||
icon_state = "caution"
|
||||
drop_sound = 'sound/items/drop/shoes.ogg'
|
||||
force = 1
|
||||
throwforce = 3
|
||||
throw_speed = 2
|
||||
throw_range = 5
|
||||
w_class = 2
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
||||
attack_verb = list("warned", "cautioned", "smashed")
|
||||
armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
|
||||
|
||||
/obj/item/clothing/suit/caution/attack_self()
|
||||
toggle()
|
||||
|
||||
/obj/item/clothing/suit/caution/AltClick()
|
||||
toggle()
|
||||
|
||||
/obj/item/clothing/suit/caution/proc/toggle()
|
||||
if(!usr || usr.stat || usr.lying || usr.restrained() || !Adjacent(usr)) return
|
||||
else if(src.icon_state == "caution")
|
||||
src.icon_state = "caution_blinking"
|
||||
src.item_state = "caution_blinking"
|
||||
usr.show_message("You turn the wet floor sign on.")
|
||||
playsound(src.loc, 'sound/machines/button.ogg', 30, 1)
|
||||
else
|
||||
src.icon_state = "caution"
|
||||
src.item_state = "caution"
|
||||
usr.show_message("You turn the wet floor sign off.")
|
||||
update_clothing_icon()
|
||||
@@ -42,8 +42,8 @@
|
||||
/obj/item/weapon/bikehorn,
|
||||
/obj/item/weapon/surgical/bonesetter,
|
||||
/obj/item/weapon/material/knife/butch,
|
||||
/obj/item/weapon/caution,
|
||||
/obj/item/weapon/caution/cone,
|
||||
/obj/item/clothing/suit/caution,
|
||||
/obj/item/clothing/head/cone,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/clipboard,
|
||||
/obj/item/weapon/cell,
|
||||
|
||||
Reference in New Issue
Block a user