resting stuff

This commit is contained in:
kevinz000
2019-12-15 00:29:18 -07:00
parent 586dcb6f81
commit 297c909b76
5 changed files with 30 additions and 8 deletions
@@ -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
+8 -2
View File
@@ -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))
+3 -1
View File
@@ -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
@@ -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>")