From 474fd582ea00ee46b5946624536bfbdd66461b2d Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Sat, 13 May 2017 18:00:32 -0500
Subject: [PATCH] Ports dakimakuras from HippieStation.

---
 code/_globalvars/lists/maintenance_loot.dm    |   1 +
 .../objects/items/weapons/storage/dakis.dm    |  48 ++++++++++++++++++
 .../crates_lockers/closets/secure/security.dm |   1 +
 icons/obj/daki.dmi                            | Bin 0 -> 5187 bytes
 tgstation.dme                                 |   1 +
 5 files changed, 51 insertions(+)
 create mode 100644 code/game/objects/items/weapons/storage/dakis.dm
 create mode 100644 icons/obj/daki.dmi

diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index 849c5248a0..59885b3432 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -104,5 +104,6 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/weapon/storage/secure/briefcase = 3,
 	/obj/item/weapon/storage/toolbox/artistic = 2,
 	/obj/item/toy/eightball = 1,
+	/obj/item/weapon/storage/daki = 3,
 	"" = 3
 	))
diff --git a/code/game/objects/items/weapons/storage/dakis.dm b/code/game/objects/items/weapons/storage/dakis.dm
new file mode 100644
index 0000000000..a238304cac
--- /dev/null
+++ b/code/game/objects/items/weapons/storage/dakis.dm
@@ -0,0 +1,48 @@
+//////////////////////////////////
+//dakimakuras
+//////////////////////////////////
+
+/obj/item/weapon/storage/daki
+	name = "dakimakura" 
+	desc = "A large pillow depicting a girl in a compromising position. Featuring as many dimensions as you."
+	icon = 'icons/obj/daki.dmi'
+	icon_state = "daki_base"
+	slot_flags = SLOT_BACK
+	storage_slots = 3
+	w_class = 4
+	max_w_class = 3
+	max_combined_w_class = 21
+	var/cooldowntime = 20
+	var/static/list/dakimakura_options = list("Callie","Casca","Chaika","Elisabeth","Foxy Grandpa","Haruko","Holo","Ian","Jolyne","Kurisu","Marie","Mugi","Nar'Sie","Patchouli","Plutia","Rei","Reisen","Naga","Squid","Squigly","Tomoko","Toriel","Umaru","Yaranaika","Yoko") //Kurisu is the ideal girl." - Me, Logos.
+
+/obj/item/weapon/storage/daki/attack_self(mob/living/user)
+	var/body_choice
+	var/custom_name
+	
+	if(icon_state == "daki_base")
+		body_choice = input("Pick a body.") in dakimakura_options
+		icon_state = "daki_[body_choice]"
+		custom_name = stripped_input(user, "What's her name?")
+		if(length(custom_name) > MAX_NAME_LEN)
+			to_chat(user,"<span class='danger'>Name is too long!</span>")
+			return FALSE
+		if(custom_name)
+			name = custom_name
+			desc = "A large pillow depicting [custom_name] in a compromising position. Featuring as many dimensions as you."
+	else
+		switch(user.a_intent)
+			if(INTENT_HELP)
+				user.visible_message("<span class='notice'>[user] hugs the [name].</span>")
+				playsound(src, "rustle", 50, 1, -5)
+			if(INTENT_DISARM)
+				user.visible_message("<span class='notice'>[user] kisses the [name].</span>")
+				playsound(src, "rustle", 50, 1, -5)
+			if(INTENT_GRAB)
+				user.visible_message("<span class='warning'>[user] holds the [name]!</span>")
+				playsound(src, 'sound/items/bikehorn.ogg', 50, 1)
+			if(INTENT_HARM)
+				user.visible_message("<span class='danger'>[user] punches the [name]!</span>")
+				playsound(src, 'sound/effects/shieldbash.ogg', 50, 1)
+		user.changeNext_move(CLICK_CD_MELEE)
+
+////////////////////////////
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 67989257f2..5e1ea02509 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -11,6 +11,7 @@
 	else
 		new /obj/item/weapon/storage/backpack/satchel/cap(src)
 	new /obj/item/clothing/neck/cloak/cap(src)
+	new /obj/item/weapon/storage/daki(src) 
 	new /obj/item/weapon/storage/backpack/dufflebag/captain(src)
 	new /obj/item/clothing/head/crown/fancy(src)
 	new /obj/item/clothing/suit/captunic(src)
diff --git a/icons/obj/daki.dmi b/icons/obj/daki.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..2b075f959cca5212493ba88f4d66ca41b2f31139
GIT binary patch
literal 5187
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
M*S)6mLCYrOe+YTFfdBvi

literal 0
HcmV?d00001

diff --git a/tgstation.dme b/tgstation.dme
index f1150ac026..5558002155 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -873,6 +873,7 @@
 #include "code\game\objects\items\weapons\storage\book.dm"
 #include "code\game\objects\items\weapons\storage\boxes.dm"
 #include "code\game\objects\items\weapons\storage\briefcase.dm"
+#include "code\game\objects\items\weapons\storage\dakis.dm"
 #include "code\game\objects\items\weapons\storage\fancy.dm"
 #include "code\game\objects\items\weapons\storage\firstaid.dm"
 #include "code\game\objects\items\weapons\storage\internal.dm"