diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 3644b7ae69..f6fe3a4854 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -733,6 +733,15 @@ item_state = "wyatt_uniform" item_color = "wyatt_uniform" +////// Black Dress - Lillian Amsel - PapaDrow +/obj/item/clothing/under/fluff/lillian_amsel_1 + name = "Black Dress" + desc = "A knee-length, dark gray and black dress made of a sfot, velvety material." + icon = "icons/obj/custom_items.dmi' + icon_state = "lillian_dress" + item_state = "lillian_dress" + item_color = "lillian_dress" + //////////// Masks //////////// /* @@ -823,6 +832,15 @@ flags = FPRINT|TABLEPASS w_class = 1 +////// Apollon Pendant - Michael Guess - Dragor23 +/obj/item/clothing/mask/michael_guess_1 + name = "Apollon Pendant" + desc = "A pendant with the form of a sacrificial tripod, used in acient greece. It's a symbol of the Olympian Apollon, a god associated with oracles, poetry, the sun and healing." + icon = 'icons/obj/custom_items.dmi' + icon_state = "michael_guess_1" + flags = FPRINT|TABLEPASS + w_class = 1 + slot_flags = SLOT_MASK //////////// Shoes //////////// /obj/item/clothing/shoes/magboots/fluff/susan_harris_1 //sniperyeti: Susan Harris diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 176a5a8527..ef26746496 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -275,6 +275,8 @@ if(Entry[1] == src.ckey && Entry[2] == src.real_name) //They're in the list? Custom sprite time, var and icon change required custom_sprite = 1 icon = 'icons/mob/custom-synthetic.dmi' + if(icon_state == "robot") + icon_state = "[src.ckey]-Standard" /mob/living/silicon/robot/verb/Namepick() if(custom_name) diff --git a/icons/mob/custom-synthetic.dmi b/icons/mob/custom-synthetic.dmi index d32659f6d6..36b28d2597 100644 Binary files a/icons/mob/custom-synthetic.dmi and b/icons/mob/custom-synthetic.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index c773b9777a..1d1e631837 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 30c53fc8f9..c0b89d053d 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index 8d52a549b3..2c21dedfd5 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ