mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-27 07:08:55 +01:00
Fookin fidget spinners
And kitsune tail
This commit is contained in:
@@ -1,12 +1,3 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//Wings
|
||||
|
||||
/datum/sprite_accessory/wing/bat_purpley_yw
|
||||
@@ -29,3 +20,10 @@
|
||||
do_colouration = 1
|
||||
|
||||
//Tails
|
||||
/datum/sprite_accessory/tail/tripplekitsune_colorable_yw
|
||||
icon = 'icons/mob/vore/tails_yw.dmi'
|
||||
name = "Kitsune 3 tails - colorable"
|
||||
desc = ""
|
||||
icon_state = "triplekitsune"
|
||||
do_colouration = 1
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
|
||||
@@ -251,4 +251,16 @@
|
||||
desc = "A kit containing Vasharr's equipment."
|
||||
has_items = list(
|
||||
/obj/item/clothing/accessory/fluff/vasharr_armlets,
|
||||
/obj/item/clothing/accessory/fluff/vasharr_pendant)
|
||||
/obj/item/clothing/accessory/fluff/vasharr_pendant)
|
||||
|
||||
//FrenziedVorcha
|
||||
|
||||
/obj/item/weapon/storage/box/fluff/philipsmirnov
|
||||
name = "Psychiatric box"
|
||||
desc = "A kit containing various psychiatry tools"
|
||||
has_items = list(
|
||||
/obj/item/weapon/fluff/fidgetspinner,
|
||||
/obj/item/weapon/fluff/fidgetspinner/red,
|
||||
/obj/item/weapon/fluff/fidgetspinner/yellow,
|
||||
/obj/item/weapon/fluff/squeezetoy,
|
||||
/obj/item/weapon/fluff/dimensioncube)
|
||||
@@ -275,3 +275,81 @@
|
||||
random_emote = list("supresses a moan", "gasps sharply", "bites her lower lip")
|
||||
verb_name = "Milk"
|
||||
verb_desc = "Grab Ysaline's breasts and milk her, storing her fresh, warm milk in a container. This will undoubtedly turn her on."
|
||||
|
||||
// **************
|
||||
// Trash
|
||||
// **************
|
||||
/obj/item/weapon/fluff/fidgetspinner
|
||||
name = "Fidget spinner"
|
||||
desc = "A spinning stress relief toy, upsetting family, friends, and employers for 500 years."
|
||||
w_class = 1.0
|
||||
icon = 'icons/vore/custom_items_yw.dmi'
|
||||
icon_state = "fidgetspinner"
|
||||
var/basestate = "fidgetspinner"
|
||||
|
||||
/obj/item/weapon/fluff/fidgetspinner/red
|
||||
name = "Red fidget spinner"
|
||||
desc = "A spinning stress relief toy, upsetting family, friends, and employers for 500 years. This one is red"
|
||||
w_class = 1.0
|
||||
icon = 'icons/vore/custom_items_yw.dmi'
|
||||
icon_state = "fidgetspinnerr"
|
||||
basestate = "fidgetspinnerr"
|
||||
|
||||
/obj/item/weapon/fluff/fidgetspinner/yellow
|
||||
name = "Yellow fidget spinner"
|
||||
desc = "A spinning stress relief toy, upsetting family, friends, and employers for 500 years. This one is yellow"
|
||||
w_class = 1.0
|
||||
icon = 'icons/vore/custom_items_yw.dmi'
|
||||
icon_state = "fidgetspinnery"
|
||||
basestate = "fidgetspinnery"
|
||||
|
||||
/obj/item/weapon/fluff/fidgetspinner/attack_self(mob/living/user)
|
||||
if(user.r_hand == src || user.l_hand == src)
|
||||
if(icon_state != "[basestate]-s")
|
||||
icon_state = "[basestate]-s"
|
||||
user.visible_message("<span class='rose'>[user] spins the [src]!</span>")
|
||||
spawn(100)
|
||||
icon_state = "[basestate]"
|
||||
else
|
||||
return ..()
|
||||
return
|
||||
|
||||
/obj/item/weapon/fluff/squeezetoy
|
||||
name = "Stress relief squeeze toy"
|
||||
desc = "A toy squeezed to relieve stress, it’s squeaker appears to be broken from over use."
|
||||
w_class = 1.0
|
||||
icon = 'icons/vore/custom_items_yw.dmi'
|
||||
icon_state = "squeezetoy"
|
||||
|
||||
/obj/item/weapon/fluff/squeezetoy/attack_self(mob/living/user)
|
||||
if(user.r_hand == src || user.l_hand == src)
|
||||
if(icon_state != "squeezetoy-s")
|
||||
icon_state = "squeezetoy-s"
|
||||
user.visible_message("<span class='rose'>[user] squeezes the [src] a few times!</span>")
|
||||
spawn(50)
|
||||
icon_state = "squeezetoy"
|
||||
else
|
||||
return ..()
|
||||
return
|
||||
|
||||
/obj/item/weapon/fluff/dimensioncube
|
||||
var/folded = 1
|
||||
name = "Infinity cube"
|
||||
desc = "All the fun of a puzzle cube without any of the challenge, a good way to relieve stress and delude yourself into a sense of accomplishment."
|
||||
w_class = 1.0
|
||||
icon = 'icons/vore/custom_items_yw.dmi'
|
||||
icon_state = "infinitycube0"
|
||||
|
||||
/obj/item/weapon/fluff/dimensioncube/attack_self(mob/living/user)
|
||||
if(user.r_hand == src || user.l_hand == src)
|
||||
if(folded == 0)
|
||||
icon_state = "infinitycube0"
|
||||
user.visible_message("<span class='rose'>[user] folds the [src]!</span>")
|
||||
folded = 1
|
||||
else if(folded == 1)
|
||||
icon_state = "infinitycube1"
|
||||
user.visible_message("<span class='rose'>[user] unfolds the [src]!</span>")
|
||||
folded = 0
|
||||
else
|
||||
return ..()
|
||||
return
|
||||
@@ -135,6 +135,11 @@ item_path: /obj/item/weapon/storage/box/fluff/art
|
||||
}
|
||||
# ######## E CKEYS
|
||||
# ######## F CKEYS
|
||||
{
|
||||
ckey: frenziedvorcha
|
||||
character_name: Philip Smirnov
|
||||
item_path: /obj/item/weapon/storage/box/fluff/philipsmirnov
|
||||
}
|
||||
# ######## G CKEYS
|
||||
{
|
||||
ckey: generalpantsu
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 182 B After Width: | Height: | Size: 600 B |
Binary file not shown.
|
Before Width: | Height: | Size: 7.7 KiB After Width: | Height: | Size: 10 KiB |
Reference in New Issue
Block a user