Merge branch 'master' into cigs

This commit is contained in:
David Winters
2021-04-10 22:38:54 -04:00
172 changed files with 25188 additions and 25273 deletions
@@ -2287,4 +2287,47 @@ Departamental Swimsuits, for general use
body_parts_covered = UPPER_TORSO|LOWER_TORSO|FEET|ARMS|HANDS
//PastelPrinceDan: Kiyoshi Maki
/obj/item/clothing/accessory/poncho/fluff/cloakglowing
name = "glowing cloak"
desc = "A fancy cloak with a RGB LED color strip along the trim, cycling through the colors of the rainbow."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "rgb"
item_state = "rgb"
overlay_state = "rgb"
icon_override = 'icons/vore/custom_onmob_vr.dmi'
var/is_dark = FALSE
/obj/item/clothing/accessory/poncho/fluff/cloakglowing/equipped()
..()
var/mob/living/carbon/human/H = loc
if(istype(H) && H.wear_suit == src)
icon_override = 'icons/vore/custom_onmob_vr.dmi'
update_clothing_icon()
/obj/item/clothing/accessory/poncho/fluff/cloakglowing/dropped()
icon_override = 'icons/vore/custom_onmob_vr.dmi'
/obj/item/clothing/accessory/poncho/fluff/cloakglowing/proc/colorswap(mob/user)
if(user.canmove && !user.stat)
src.is_dark = !src.is_dark
if (src.is_dark)
icon_state = "rgbd"
item_state = "rgbd"
overlay_state = "rgbd"
to_chat(user, "The polychromic plates in your cloak activate, turning it black.")
else
icon_state = "rgb"
item_state = "rgb"
overlay_state = "rgb"
to_chat(user, "The polychromic plates in your cloak activate, turning it white.")
has_suit.update_clothing_icon()
/obj/item/clothing/accessory/poncho/fluff/cloakglowing/verb/color_verb()
set name = "Swap color"
set category = "Object"
set src in usr
if(!istype(usr, /mob/living)) return
if(usr.stat) return
colorswap(usr)
@@ -337,7 +337,7 @@
name = "Mouse Plushie"
desc = "A plushie of a delightful mouse! What was once considered a vile rodent is now your very best friend."
slot_flags = SLOT_HEAD
icon_state = "mouse_brown" //TFF 12/11/19 - Change sprite to not look dead. Heck you for that choice! >:C
icon_state = "mouse_brown"
item_state = "mouse_brown_head"
icon = 'icons/vore/custom_items_vr.dmi'
icon_override = 'icons/vore/custom_items_vr.dmi'