From 297c909b7636de21bb0a760a0f4ee63088ca9689 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sun, 15 Dec 2019 00:29:18 -0700
Subject: [PATCH] resting stuff

---
 .../modules/mob/living/carbon/update_icons.dm |  2 +-
 code/modules/mob/living/silicon/ai/ai.dm      | 10 ++++++++--
 code/modules/mob/living/silicon/pai/pai.dm    |  4 +++-
 .../mob/living/silicon/pai/pai_shell.dm       | 20 +++++++++++++++----
 tgstation.dme                                 |  2 ++
 5 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm
index 66be8058f1..dc32f4c64d 100644
--- a/code/modules/mob/living/carbon/update_icons.dm
+++ b/code/modules/mob/living/carbon/update_icons.dm
@@ -1,5 +1,5 @@
 //IMPORTANT: Multiple animate() calls do not stack well, so try to do them all at once if you can.
-/mob/living/carbon/update_transform()
+/mob/living/update_transform()
 	var/matrix/ntransform = matrix(transform) //aka transform.Copy()
 	var/final_pixel_y = pixel_y
 	var/final_dir = dir
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 0444458841..356907aa64 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -681,14 +681,20 @@
 				"green face" = 'icons/mob/ai.dmi',
 				"xeno queen" = 'icons/mob/alien.dmi',
 				"horror" = 'icons/mob/ai.dmi',
-				"creature" = 'icons/mob/ai.dmi'
+				"creature" = 'icons/mob/ai.dmi',
+				"custom"
 				)
 
 			input = input("Please select a hologram:") as null|anything in icon_list
 			if(input)
 				qdel(holo_icon)
 				switch(input)
-					if("xeno queen")
+					if("custom")
+						if(client?.prefs?.custom_holoform_icon)
+							holo_icon = client.prefs.custom_holoform_icon
+						else
+							holo_icon = getHologramIcon(icon("female", 'icons/mob/ai.dmi'))
+					else if("xeno queen")
 						holo_icon = getHologramIcon(icon(icon_list[input],"alienq"))
 					else
 						holo_icon = getHologramIcon(icon(icon_list[input], input))
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 7ec63cf415..bd73de3513 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -61,7 +61,7 @@
 	var/list/possible_chassis = list("cat" = TRUE, "mouse" = TRUE, "monkey" = TRUE, "corgi" = FALSE,
 									"fox" = FALSE, "repairbot" = TRUE, "rabbit" = TRUE, "borgi" = FALSE ,
 									"parrot" = FALSE, "bear" = FALSE , "mushroom" = FALSE, "crow" = FALSE ,
-									"fairy" = FALSE , "spiderbot" = FALSE)		//assoc value is whether it can be picked up.
+									"fairy" = FALSE , "spiderbot" = FALSE, "custom" = FALSE)		//assoc value is whether it can be picked up.
 	var/static/item_head_icon = 'icons/mob/pai_item_head.dmi'
 	var/static/item_lh_icon = 'icons/mob/pai_item_lh.dmi'
 	var/static/item_rh_icon = 'icons/mob/pai_item_rh.dmi'
@@ -80,6 +80,8 @@
 	var/silent = FALSE
 	var/brightness_power = 5
 
+	var/icon/custom_holoform_icon
+
 /mob/living/silicon/pai/can_unbuckle()
 	return FALSE
 
diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm
index 164a3e7389..43de68d7f7 100644
--- a/code/modules/mob/living/silicon/pai/pai_shell.dm
+++ b/code/modules/mob/living/silicon/pai/pai_shell.dm
@@ -91,11 +91,23 @@
 	..()
 	update_resting_icon(resting)
 
-/mob/living/silicon/pai/proc/update_resting_icon(rest)
-	if(rest)
-		icon_state = "[chassis]_rest"
+/mob/living/silicon/pai/update_icon()
+	if((chassis == "custom") && !custom_holoform_icon)
+		chassis = pick(possible_chassis - "custom")
+	if(chassis != "custom")
+		icon_state = "[chassis]_[resting]"
 	else
-		icon_state = "[chassis]"
+		icon = custom_holoform_icon
+		icon_state = ""
+	update_transform()
+
+/mob/living/silicon/pai/proc/update_resting_icon(rest)
+	if(chassis == "custom")
+		if(resting)
+			lying = pick(90, 270)
+	else
+		lying = 0
+	update_icon()
 	if(loc != card)
 		visible_message("<span class='notice'>[src] [rest? "lays down for a moment..." : "perks up from the ground"]</span>")
 
diff --git a/tgstation.dme b/tgstation.dme
index 4c7e29739f..4838c07d1a 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -118,6 +118,7 @@
 #include "code\__HELPERS\areas.dm"
 #include "code\__HELPERS\AStar.dm"
 #include "code\__HELPERS\cmp.dm"
+#include "code\__HELPERS\custom_holoforms.dm"
 #include "code\__HELPERS\dates.dm"
 #include "code\__HELPERS\donator_groupings.dm"
 #include "code\__HELPERS\files.dm"
@@ -1529,6 +1530,7 @@
 #include "code\modules\client\preferences_toggles.dm"
 #include "code\modules\client\preferences_vr.dm"
 #include "code\modules\client\verbs\aooc.dm"
+#include "code\modules\client\verbs\custom_holoform.dm"
 #include "code\modules\client\verbs\etips.dm"
 #include "code\modules\client\verbs\looc.dm"
 #include "code\modules\client\verbs\ooc.dm"