Wearable wet floor sign (#7575)

You can now wear the wet floor sign.
Also tidies up some code here and there.
Adds some descriptions too.

It provides extremely minor armor.
This commit is contained in:
Wowzewow (Wezzy)
2019-12-20 03:33:28 +08:00
committed by Erki
parent b707b004e2
commit 8dddda141b
22 changed files with 142 additions and 83 deletions
+2 -2
View File
@@ -533,9 +533,9 @@ STOCK_ITEM_COMMON(cane, 2)
STOCK_ITEM_COMMON(warning, 2.2)
if (prob(50))
new /obj/item/caution(L)
new /obj/item/clothing/suit/caution(L)
else
new /obj/item/caution/cone(L)
new /obj/item/clothing/head/cone(L)
STOCK_ITEM_COMMON(gasmask, 2)
var/list/masks = list(
+26 -1
View File
@@ -5,7 +5,8 @@
* Ushanka
* Pumpkin head
* Kitty ears
*
* Chicken mask
* Warning cone
*/
/*
@@ -259,9 +260,33 @@
else if (icon_override)
icon_override = null
/*
* Chicken mask
*/
/obj/item/clothing/head/richard
name = "chicken mask"
desc = "You can hear the distant sounds of rhythmic electronica."
icon_state = "richard"
body_parts_covered = HEAD|FACE
flags_inv = BLOCKHAIR
/*
* Warning cone
*/
/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)
@@ -375,7 +375,7 @@
interface_name = "wet floor sign launcher"
interface_desc = "An integrated microfactory that produces wet floor signs from thin air and electricity."
fabrication_type = /obj/item/caution
fabrication_type = /obj/item/clothing/suit/caution
category = MODULE_GENERAL
@@ -646,3 +646,39 @@
item_state = "cultrobes"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
/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 = 'icons/obj/janitor.dmi'
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/items/flashlight.ogg', 75, 1)
else
src.icon_state = "caution"
src.item_state = "caution"
usr.show_message("You turn the wet floor sign off.")
update_clothing_icon()
+1 -1
View File
@@ -284,7 +284,7 @@ var/list/worths = list(
/obj/item/cane = 40,
/obj/item/disk/nuclear = 10000,
/obj/item/disk = 90,
/obj/item/caution = 15,
/obj/item/clothing/suit/caution = 15,
/obj/item/module = 100,
//STOCK PARTS,
/obj/item/stock_parts/capacitor/adv = 160,
@@ -45,8 +45,8 @@
/obj/item/bikehorn,\
/obj/item/bonesetter,\
/obj/item/material/hatchet/butch,\
/obj/item/caution,\
/obj/item/caution/cone,\
/obj/item/clothing/suit/caution,\
/obj/item/clothing/head/cone,\
/obj/item/crowbar,\
/obj/item/clipboard,\
/obj/item/cell,\