diff --git a/aquila/aquila.dm b/aquila/aquila.dm index 31595aaefdc..fe1e91dc111 100644 --- a/aquila/aquila.dm +++ b/aquila/aquila.dm @@ -60,6 +60,7 @@ #include "code\game\objects\items\circuitboards\circuitboard.dm" #include "code\game\objects\items\circuitboards\machine_circuitboards.dm" #include "code\game\objects\items\clown_items.dm" +#include "code\game\objects\items\dakimakuras.dm" #include "code\game\objects\items\granters.dm" #include "code\game\objects\items\devices\geiger_counter.dm" #include "code\game\objects\items\devices\glue.dm" diff --git a/aquila/code/game/objects/items/dakimakuras.dm b/aquila/code/game/objects/items/dakimakuras.dm new file mode 100644 index 00000000000..89c610ff0c1 --- /dev/null +++ b/aquila/code/game/objects/items/dakimakuras.dm @@ -0,0 +1,82 @@ +////////////////////////////////// +//dakimakuras +////////////////////////////////// + +/obj/item/dakimakura + name = "dakimakura" + var/custom_name = null + desc = "A large pillow depicting someone in a compromising position. Featuring as many dimensions as you." + icon = 'icons/obj/dakis.dmi' + icon_state = "daki_base" + lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items_righthand.dmi' + item_state = "daki" + slot_flags = null + w_class = WEIGHT_CLASS_BULKY + +/obj/item/dakimakura/attack_self(mob/living/user) + var/body_choice + if(!custom_name) + body_choice = input("Pick a body.") in list( + + "Aitler", + "Callie", + "Catgirl", + "Casca", + "Centorea", + "Chaika", + "Coder", + "Drone", + "Elisabeth", + "Fillia", + "Foxy Granpa", + "Haruko", + "Holo", + "Hotsauce", + "Ian", + "Jolyne", + "Killer Queen", + "Kurisu", + "Marie", + "Mero", + "Miia", + "Mugi", + "Nar'Sie", + "Papi", + "Patchouli", + "Pearl", + "Plutia", + "Rei", + "Reisen", + "Naga", + "Squid", + "Squiggly", + "Sue Bowchief", + "Suu", + "Tomoko", + "Toriel", + "Umaru", + "Yaranaika", + "Yoko", + "Kane", + "TEG") + + icon_state = "daki_[body_choice]" //Wew + custom_name = stripped_input(user, "What's her name?") + if(!custom_name) + return + name = custom_name + " " + name + desc = "A large pillow depicting [custom_name] in a compromising position. Featuring as many dimensions as you." + else + if(user.a_intent == "help") + user.visible_message("[user] hugs the [name].") + playsound(src.loc, "rustle", 50, 1, -5) + if(user.a_intent == "disarm") + user.visible_message("[user] kisses the [name].") + playsound(src.loc, 'sound/misc/kiss.ogg', 50, 1, -5) + if(user.a_intent == "grab") + user.visible_message("[user] gropes the [name]!") + playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1) + if(user.a_intent == "harm") + user.visible_message("[user] violently humps the [name]!") + playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1) diff --git a/aquila/icons/mob/inhands/items_lefthand.dmi b/aquila/icons/mob/inhands/items_lefthand.dmi new file mode 100644 index 00000000000..2f745ff5daa Binary files /dev/null and b/aquila/icons/mob/inhands/items_lefthand.dmi differ diff --git a/aquila/icons/mob/inhands/items_righthand.dmi b/aquila/icons/mob/inhands/items_righthand.dmi new file mode 100644 index 00000000000..61889f54e26 Binary files /dev/null and b/aquila/icons/mob/inhands/items_righthand.dmi differ diff --git a/aquila/icons/obj/dakis.dmi b/aquila/icons/obj/dakis.dmi new file mode 100644 index 00000000000..65cc424784f Binary files /dev/null and b/aquila/icons/obj/dakis.dmi differ diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm index f087807b2b8..f305cd90044 100644 --- a/code/modules/vending/toys.dm +++ b/code/modules/vending/toys.dm @@ -22,7 +22,8 @@ /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted = 10, /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted = 10, /obj/item/toy/katana = 10, - /obj/item/dualsaber/toy = 5) + /obj/item/dualsaber/toy = 5, + /obj/item/dakimakura = 5)//AQ EDIT armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50, "stamina" = 0) resistance_flags = FIRE_PROOF