diff --git a/aurorastation.dme b/aurorastation.dme index 52f5d31dedf..e8db1b878a8 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -28,6 +28,7 @@ #include "code\__defines\color.dm" #include "code\__defines\damage_organs.dm" #include "code\__defines\dna.dm" +#include "code\__defines\drinks.dm" #include "code\__defines\dview.dm" #include "code\__defines\extools.dm" #include "code\__defines\flags.dm" diff --git a/code/__defines/drinks.dm b/code/__defines/drinks.dm new file mode 100644 index 00000000000..2f25b7c039b --- /dev/null +++ b/code/__defines/drinks.dm @@ -0,0 +1,4 @@ +#define NO_EMPTY_ICON 1 //does NOT have an iconstate_empty icon. If adding empty icons for a drink, make sure it does not have this flag +#define UNIQUE_EMPTY_ICON 2 //Uses the empty_icon_state listed. Should really only be used when one trash state applies to multiple drinks. Remove if one is added +#define UNIQUE_EMPTY_ICON_FILE 4 //Uses the empty_icon_state listed. also doesn't change its icon file, giving it a pseudo contained sprite status +#define IS_GLASS 8 //Container is glass. Affects shattering, unacidable, etc. \ No newline at end of file diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 4a2ea700257..5a314d2fa94 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -485,6 +485,8 @@ All custom items with worn sprites must follow the contained sprite system: http which smells of the barrel it was aged in. The region and producer are on the label." icon = 'icons/obj/custom_items/leonce_cognac.dmi' icon_state = "leonce_cognac" + empty_icon_state = "leonce_cognac_empty" + drink_flags = UNIQUE_EMPTY_ICON_FILE | IS_GLASS /obj/item/clothing/suit/storage/fluff/sonorous_mantle //Maraziite Throw Over - Sonorous Zouzoror - sleepywolf diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index f9a364d97b3..5c3c124a5e1 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -1,8 +1,3 @@ -//drink_flags defines -#define NO_EMPTY_ICON 1 //does NOT have an iconstate_empty icon. If adding empty icons for a drink, make sure it does not have this flag -#define UNIQUE_EMPTY_ICON 2 //Uses the empty_icon_state listed. Should really only be used when one trash state applies to multiple drinks. Remove if one is added -#define IS_GLASS 4 //Container is glass. Affects shattering, unacidable, etc. - /* Standards for trash/empty states under the /drinks path: Adding Empty States: Trash/Empty states should be placed in the drinks_empty.dmi and should be the drink's icon_state name followed by _empty (ex: whiskeybottle_empty) and the NO_EMPTY_ICON flag should be removed. @@ -44,11 +39,11 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I if(drink_flags & UNIQUE_EMPTY_ICON) icon = 'icons/obj/drinks_empty.dmi' icon_state = empty_icon_state - return - if(!(drink_flags & NO_EMPTY_ICON)) + else if(drink_flags & UNIQUE_EMPTY_ICON_FILE) + icon_state = empty_icon_state + else if(!(drink_flags & NO_EMPTY_ICON)) icon = 'icons/obj/drinks_empty.dmi' icon_state = "[initial(icon_state)]_empty" - return else icon = initial(icon) //Necessary for refilling empty drinks icon_state = initial(icon_state) diff --git a/html/changelogs/geeves-cognac_fix.yml b/html/changelogs/geeves-cognac_fix.yml new file mode 100644 index 00000000000..3df4983fb9a --- /dev/null +++ b/html/changelogs/geeves-cognac_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixed the Old Earth Luxury Cognac lacking an empty sprite." \ No newline at end of file diff --git a/icons/obj/custom_items/leonce_cognac.dmi b/icons/obj/custom_items/leonce_cognac.dmi index 984c8d43f06..2122e4167cf 100644 Binary files a/icons/obj/custom_items/leonce_cognac.dmi and b/icons/obj/custom_items/leonce_cognac.dmi differ