Merge branch 'master' into izac

This commit is contained in:
Izac Joof Forsgren
2020-09-14 14:11:02 +02:00
committed by GitHub
11 changed files with 90 additions and 1 deletions
+84 -1
View File
@@ -2,8 +2,14 @@
name = "Strix Hades"
desc = "This is Strix Hades the plushie Avali. Very soft, with a pompom on the tail. The toy is made well, as if alive. Looks like he is sleeping. Shhh!"
icon_state = "strixplush"
item_state = "strixplush"
slot_flags = SLOT_BACK
pokephrase = "Weh!"
icon = 'icons/obj/toy_yw.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_toys_yw.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_toys_yw.dmi',
slot_back_str = 'icons/mob/toy_worn_yw.dmi')
rename_plushie()
set name = "Name Plushie"
@@ -15,4 +21,81 @@
if(src && !M.stat && in_range(M,src))
to_chat(M, "You cannot rename Strix Hades! You hug him anyway.")
return 1
return 1
/obj/item/toy/plushie/teshari/eili
name = "Eili"
desc = "This is a plushie that resembles an Avali named Eili. The ammount of detail makes it almost look lifelike! Looks like she is sleeping. Shhh!"
icon_state = "jeans_eiliplush"
item_state = "jeans_eiliplush"
slot_flags = SLOT_BACK
pokephrase = "Weh!"
icon = 'icons/vore/custom_items_yw.dmi'
item_icons = list(
slot_l_hand_str = 'icons/vore/custom_items_left_hand_yw.dmi',
slot_r_hand_str = 'icons/vore/custom_items_right_hand_yw.dmi',
slot_back_str = 'icons/vore/custom_onmob_yw.dmi')
rename_plushie()
set name = "Name Plushie"
set category = "Object"
set desc = "Give your plushie a cute name!"
var/mob/M = usr
if(!M.mind)
return 0
if(src && !M.stat && in_range(M,src))
to_chat(M, "You cannot rename Eili! You hug her anyway.")
return 1
/obj/item/toy/plushie/teshari_yw
name = "lifelike teshari plush"
desc = "This is a plush teshari. Very soft. The ammount of detail makes it almost look lifelike! Looks like it is sleeping. Shhh!"
icon_state = "teshariplushie_brown"
item_state = "teshariplushie_brown"
pokephrase = "Rya!"
slot_flags = SLOT_BACK
icon = 'icons/obj/toy_yw.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_toys_yw.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_toys_yw.dmi',
slot_back_str = 'icons/mob/toy_worn_yw.dmi')
/obj/item/toy/plushie/teshariw_yw
name = "lifelike teshari plush"
desc = "This is a plush teshari. Very soft. The ammount of detail makes it almost look lifelike! Looks like it is sleeping. Shhh!"
icon_state = "teshariplushie_white"
item_state = "teshariplushie_white"
pokephrase = "Rya!"
slot_flags = SLOT_BACK
icon = 'icons/obj/toy_yw.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_toys_yw.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_toys_yw.dmi',
slot_back_str = 'icons/mob/toy_worn_yw.dmi')
/obj/item/toy/plushie/tesharib_yw
name = "lifelike teshari plush"
desc = "This is a plush teshari. Very soft. The ammount of detail makes it almost look lifelike! Looks like it is sleeping. Shhh!"
icon_state = "teshariplushie_black"
item_state = "teshariplushie_black"
pokephrase = "Rya!"
slot_flags = SLOT_BACK
icon = 'icons/obj/toy_yw.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_toys_yw.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_toys_yw.dmi',
slot_back_str = 'icons/mob/toy_worn_yw.dmi')
/obj/item/toy/plushie/teshariy_yw
name = "lifelike teshari plush"
desc = "This is a plush teshari. Very soft. The ammount of detail makes it almost look lifelike! Looks like it is sleeping. Shhh!"
icon_state = "teshariplushie_yellow"
item_state = "teshariplushie_yellow"
pokephrase = "Rya!"
slot_flags = SLOT_BACK
icon = 'icons/obj/toy_yw.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_toys_yw.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_toys_yw.dmi',
slot_back_str = 'icons/mob/toy_worn_yw.dmi')