cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 09:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes: custom item icons and Jotun wreckage fixes (#5931)

Browse Source 
-fixes some issues with the latest custom item sprites
-fixes the jotun wreckage name
-fixes #5936
This commit is contained in:
Alberyk
2019-01-12 17:08:47 -02:00
committed by Erki
parent b145fcbd33
commit c69166ade3
5 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
code/modules/customitems/item_defines.dm
View File

@@ -2499,7 +2499,7 @@ All custom items with worn sprites must follow the contained sprite system: http
icon_state = "aavs_mask"
item_state = "aavs_mask"
contained_sprite = TRUE
flags_inv = HIDEEARS|HIDEFACE
flags_inv = HIDEEARS|HIDEFACE|BLOCKHEADHAIR
body_parts_covered = HEAD|FACE|EYES
@@ -2509,6 +2509,7 @@ All custom items with worn sprites must follow the contained sprite system: http
icon = 'icons/obj/custom_items/krin_clothing.dmi'
icon_state = "krin_shirt"
item_state = "krin_shirt"
contained_sprite = TRUE
/obj/item/clothing/suit/storage/fluff/krin_jacket //Polychromatic Jacket - Krin Volqux - paradoxspace
name = "polychromatic jacket"
@@ -2536,7 +2537,20 @@ All custom items with worn sprites must follow the contained sprite system: http
contained_sprite = TRUE
/obj/item/clothing/under/fluff/rollsuit()
/obj/item/clothing/under/fluff/mira_uniform //Mira's Cloth Undersuit - Mira Akhandi - queenofyugoslavia
name = "dark clothes"
desc = "A set of dark under clothing, loosely fitting. The initials /M.A./ are stitched into the collar."
icon = 'icons/obj/custom_items/mira_clothing.dmi'
icon_state = "mira_uniform"
item_state = "mira_uniform"
contained_sprite = TRUE
/obj/item/clothing/under/fluff/mira_uniform/Initialize()
. = ..()
rolled_sleeves = 0
rolled_down = 0
/obj/item/clothing/under/fluff/mira_uniform/rollsuit()
set name = "Roll Down Jumpsuit"
set category = "Object"
@@ -2544,10 +2558,6 @@ All custom items with worn sprites must follow the contained sprite system: http
if (use_check(usr, USE_DISALLOW_SILICONS))
return
if(("[item_state]_d") in icon_states(src))
to_chat(usr, "<span class='notice'>You cannot roll down \the [src]!</span>")
return
if(rolled_sleeves)
to_chat(usr, "<span class='warning'>You must roll up your [src]'s sleeves first!</span>")
return
@@ -2561,7 +2571,7 @@ All custom items with worn sprites must follow the contained sprite system: http
item_state = initial(item_state)
update_clothing_icon()
/obj/item/clothing/under/fluff/rollsleeves()
/obj/item/clothing/under/fluff/mira_uniform/rollsleeves()
set name = "Roll Up Sleeves"
set category = "Object"
set src in usr
@@ -2569,10 +2579,6 @@ All custom items with worn sprites must follow the contained sprite system: http
if (use_check(usr, USE_DISALLOW_SILICONS))
return
if(("[item_state]_r") in icon_states(src))
to_chat(usr, "<span class='notice'>You cannot roll up your [src]'s sleeves!</span>")
return
if(rolled_down)
to_chat(usr, "<span class='warning'>You must roll up your [src] first!</span>")
return
@@ -2586,15 +2592,6 @@ All custom items with worn sprites must follow the contained sprite system: http
item_state = initial(item_state)
update_clothing_icon()
/obj/item/clothing/under/fluff/mira_uniform //Mira's Cloth Undersuit - Mira Akhandi - queenofyugoslavia
name = "dark clothes"
desc = "A set of dark under clothing, loosely fitting. The initials /M.A./ are stitched into the collar."
icon = 'icons/obj/custom_items/mira_clothing.dmi'
icon_state = "mira_uniform"
item_state = "mira_uniform"
contained_sprite = TRUE
/obj/item/clothing/suit/storage/toggle/labcoat/fluff/mira_robes //Junior Alchemist Robes - Mira Akhandi - queenofyugoslavia
name = "junior alchemist robes"
desc = "A robe with a light silky gold colored belt around the waist. Placed upon the print is two red jewels pinned to it neatly."