Merge pull request #13965 from Xantholne/GoodNightDisky

Good Night Disky
This commit is contained in:
silicons
2021-01-09 15:39:06 -07:00
committed by GitHub
7 changed files with 91 additions and 0 deletions
@@ -18,6 +18,7 @@
/obj/item/paicard/Initialize()
SSpai.pai_card_list += src
add_overlay("pai-off")
AddElement(/datum/element/bed_tuckable, 6, -5, 90)
return ..()
/obj/item/paicard/Destroy()
+1
View File
@@ -48,6 +48,7 @@
/obj/item/toy/plush/Initialize(mapload, set_snowflake_id)
. = ..()
AddComponent(/datum/component/squeak, squeak_override)
AddElement(/datum/element/bed_tuckable, 6, -5, 90)
//have we decided if Pinocchio goes in the blue or pink aisle yet?
if(gender == NEUTER)
@@ -40,6 +40,16 @@
if(istype(W, /obj/item/wrench) && !(flags_1&NODECONSTRUCT_1))
W.play_tool_sound(src)
deconstruct(TRUE)
else if(istype(W, /obj/item/bedsheet))
if(user.transferItemToLoc(W, drop_location()))
to_chat(user, "<span class='notice'>You make \the [src] with [W].</span>")
W.pixel_x = 0
W.pixel_y = 0
else if(istype(W, /obj/item/disk/nuclear))
if(user.transferItemToLoc(W, drop_location()))
to_chat(user, "<span class='notice'>You tuck little disky into bed. Good night disky.</span>")
W.pixel_x = 6 //make sure they reach the pillow
W.pixel_y = -6
else
return ..()
@@ -22,6 +22,10 @@ LINEN BINS
dog_fashion = /datum/dog_fashion/head/ghost
var/list/dream_messages = list("white")
/obj/item/bedsheet/Initialize(mapload)
. = ..()
AddElement(/datum/element/bed_tuckable, 0, 0, 0)
/obj/item/bedsheet/attack(mob/living/M, mob/user)
if(!attempt_initiate_surgery(src, M, user))
..()