From bf31be8946e51e8cdcbcc89e532416c162d57388 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 28 Jan 2023 21:15:37 +0100 Subject: [PATCH] [MIRROR] Fixes the holy water flask looking like a beer bottle [MDB IGNORE] (#18993) Fixes the holy water flask looking like a beer bottle (#72979) ## About The Pull Request Adds new inhand sprites for the holy water to fix its current appearance, which is a beer bottle. ## Why It's Good For The Game Chaplains are supposed to be _covertly_ alchoholic. Makes the holy flask look as it's supposed to when held so the chaplain can drink their holy spirits in peace. ![image](https://user-images.githubusercontent.com/13398309/214944917-92647a63-0410-4d5d-a608-143b09b28c23.png) ![image](https://user-images.githubusercontent.com/13398309/214944958-1eaf0df4-f151-4ba6-b859-d93fe352c5ea.png) ![image](https://user-images.githubusercontent.com/13398309/214945001-0ed2544e-9b02-4710-879e-da032ab0fdd8.png) ## Changelog :cl: imageadd: new inhand sprites for the holy flask fix: chaplains will no longer look like they are carrying a beer bottle when holding their holy flask /:cl: Co-authored-by: Bloop --- .../reagent_containers/cups/bottle.dm | 1 + .../reagent_containers/cups/glassbottle.dm | 1 + icons/mob/inhands/items/drinks_lefthand.dmi | Bin 1735 -> 3658 bytes icons/mob/inhands/items/drinks_righthand.dmi | Bin 1645 -> 3636 bytes 4 files changed, 2 insertions(+) diff --git a/code/modules/reagents/reagent_containers/cups/bottle.dm b/code/modules/reagents/reagent_containers/cups/bottle.dm index 60be37c8042..027ae611aca 100644 --- a/code/modules/reagents/reagent_containers/cups/bottle.dm +++ b/code/modules/reagents/reagent_containers/cups/bottle.dm @@ -110,6 +110,7 @@ desc = "A small bottle. Contains the liquid essence of the gods." icon = 'icons/obj/drinks/bottles.dmi' icon_state = "holyflask" + inhand_icon_state = "holyflask" list_reagents = list(/datum/reagent/medicine/adminordrazine = 30) /obj/item/reagent_containers/cup/bottle/capsaicin diff --git a/code/modules/reagents/reagent_containers/cups/glassbottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm index 6e48ff54380..0ff6df28941 100644 --- a/code/modules/reagents/reagent_containers/cups/glassbottle.dm +++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm @@ -304,6 +304,7 @@ desc = "A flask of the chaplain's holy water." icon = 'icons/obj/drinks/bottles.dmi' icon_state = "holyflask" + inhand_icon_state = "holyflask" list_reagents = list(/datum/reagent/water/holywater = 100) drink_type = NONE diff --git a/icons/mob/inhands/items/drinks_lefthand.dmi b/icons/mob/inhands/items/drinks_lefthand.dmi index 4c0a6f22e15437a25ab0f3977f5ba089cf955eef..edbffeee2fc3ba344e1040d1ab20160a04991618 100644 GIT binary patch literal 3658 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 GNB;nz3fou! literal 1735 zcmYL}dpy(oAIHCBggJIXj!JIHB|ql(by9I=IzwZ_LI}~YX_6As{BSCDEJubWTQm2l z+}cT5WmBDWF*}WN8|lZIUv4M&+xY&L-=+8C@p->KpU)r9*ZcE+KOP^NueXPm#x@NA z0JN}&Foyv^$yl*~&6^ZAyQV`j71H91^LJBdc7WO47_0p|l$>@dF`3Nv_I3z@egOax z0L+RGK#-73Cbzb>0-<}{X(STJWRips350|oNCH72_^TTY0)UTY!;rHx^o9YgLQDVv zg#ZMB0HnwO6C%;+^oE885QLaQfIuKXLLetc(`T;=(^U;30ZbCmcoep_z6t>#079L$ zX1@?k%hG`n;aO-HJtIO+O-<$H<>B#o>+^M+9D|02hLA!DjwKY;XWUafKq>LCw;zC( z^^z2ad8&UVoDkk0a?WG6m z?d7iGq}j!Q{wgn%xErk|PhWmICMXfzxQj{;eP?mn-E##mKsnzz_1rj8{TL^}QTe+H zxoU7NI?u@`O}o)A3@uu;c|U)W+&o?_2)Z9&>DL${4mH2LWyQLw_6Y|0;THAj_rX9u z&4JJ&enCZoby%C-zaQ6l&u%55N5`68%wz`lv-Z_`>HUWEJAh%2ldV6hIBrr;X%0A{ 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 gllkf{xk(O-y7iiuWME6I^=HdG+`LiE$3imx0n