From 1f9b7860ded7b3688d08cd87948e85869e2c02ce Mon Sep 17 00:00:00 2001 From: Joker66613 Date: Thu, 29 Feb 2024 23:19:46 +0100 Subject: [PATCH 1/2] Dakimury --- aquila/aquila.dm | 1 + aquila/code/game/objects/items/dakimakuras.dm | 82 ++++++++++++++++++ aquila/icons/mob/inhands/items_lefthand.dmi | Bin 0 -> 412 bytes aquila/icons/mob/inhands/items_righthand.dmi | Bin 0 -> 412 bytes aquila/icons/obj/dakis.dmi | Bin 0 -> 15135 bytes code/modules/vending/toys.dm | 3 +- 6 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 aquila/code/game/objects/items/dakimakuras.dm create mode 100644 aquila/icons/mob/inhands/items_lefthand.dmi create mode 100644 aquila/icons/mob/inhands/items_righthand.dmi create mode 100644 aquila/icons/obj/dakis.dmi 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 0000000000000000000000000000000000000000..2f745ff5daa2fc833f7d2a473162c3d393308203 GIT binary patch literal 412 zcmV;N0b~A&P)|t8oWW*uG>X94I6LZ#yO?HAcMaeW1@+FLDSdi@cV}j!|yb~y@~)v1YrX_ zw4jfHzCurPM&O?UjlfAAKih(c-~v5@0FEPc_OOEWHk95+zj>z}fjd_9-%Gxp$g}&o9(7ILmIlqw%Cj;J zSe~XF3(fPEis4wCDEWkuoygSdi55_ct$?{UZ^D1^Te<;7^*GAb5^}5n00008vuX6VwKrre+t5_^~CG#xlX80u4!CT*R(0s;xd8xrYLz{lI~EPwkrbzy zkJQLmnqd*R2-J*9#21E|CqT0>fI|Sm%xYRKtXXdJeOasTS)$uv>6;i~(k|>ACREsO zU|xifzg!R_Cn{dB=>KrB6y4-y`mP1gC`jqDU$|R`FX;~3&p4wofFSh%0000vd; literal 0 HcmV?d00001 diff --git a/aquila/icons/obj/dakis.dmi b/aquila/icons/obj/dakis.dmi new file mode 100644 index 0000000000000000000000000000000000000000..65cc424784f17fef260af9011726890f2c88875a GIT binary patch literal 15135 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 Date: Mon, 4 Mar 2024 01:19:45 +0100 Subject: [PATCH 2/2] Update code/modules/vending/toys.dm Co-authored-by: MACIEKBAKI <41126266+MACIEKBAKI@users.noreply.github.com> --- code/modules/vending/toys.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm index 47733621926..f305cd90044 100644 --- a/code/modules/vending/toys.dm +++ b/code/modules/vending/toys.dm @@ -22,7 +22,7 @@ /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)