diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 501ecbe44fb..e92a003a190 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -186,6 +186,20 @@ throw_range = 5 w_class = 2.0 attack_verb = list("warned", "cautioned", "smashed") +/obj/item/weapon/caution/attack_self(mob/user as mob) + if(src.icon_state == "caution") + src.icon_state = "caution_blinking" + user << "You turn the sign on." + else + src.icon_state = "caution" + user << "You turn the sign off." +/obj/item/weapon/caution/AltClick() + if(src.icon_state == "caution") + src.icon_state = "caution_blinking" + usr << "You turn the sign on." + else + src.icon_state = "caution" + usr << "You turn the sign off." /obj/item/weapon/caution/cone desc = "This cone is trying to warn you of something!" diff --git a/html/changelogs/Fire and Glory-FaG Branch 3.yml b/html/changelogs/Fire and Glory-FaG Branch 3.yml new file mode 100644 index 00000000000..70c2c9687b5 --- /dev/null +++ b/html/changelogs/Fire and Glory-FaG Branch 3.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Fire and Glory + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Gave the Janitor's wet floor signs lights that can be used by activating them in-hand or alt-clicking them on the ground." diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index b01304d257c..f9939545217 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index 4f59f247590..f8c6273faab 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index 1b08d9a9a20..b1ffa87dea4 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ