cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 06:54:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

3/4 reagent container sprite and cafe tweaks and fixes (#17259)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2023-09-07 14:49:00 +00:00
committed by GitHub
parent a4a072130b
commit d469e93fc3
29 changed files with 119 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+4 -4
View File
@@ -122,7 +122,7 @@ All custom items with worn sprites must follow the contained sprite system: http
icon_state = "oz_plushie"
/obj/item/reagent_containers/glass/teapot/fluff/brianne_teapot //Ceramic Teapot - Sean Brianne - zelmana
/obj/item/reagent_containers/glass/beaker/teapot/fluff/brianne_teapot //Ceramic Teapot - Sean Brianne - zelmana
name = "ceramic teapot"
desc = "A blue ceramic teapot, gilded with the abbreviation for NanoTrasen."
icon = 'icons/obj/custom_items/brianne_items.dmi'
@@ -585,7 +585,7 @@ All custom items with worn sprites must follow the contained sprite system: http
user.update_inv_l_hand()
user.update_inv_r_hand()
/obj/item/reagent_containers/glass/teapot/fluff/thea_teapot //Bronze Teapot - Thea Reeves - shestrying
/obj/item/reagent_containers/glass/beaker/teapot/fluff/thea_teapot //Bronze Teapot - Thea Reeves - shestrying
name = "bronze teapot"
desc = "A round-bottomed, well-used teapot. It looks as though it's been carefully maintained."
icon = 'icons/obj/custom_items/thea_tea.dmi'
@@ -608,10 +608,10 @@ All custom items with worn sprites must follow the contained sprite system: http
icon_override = 'icons/obj/custom_items/thea_tea.dmi'
icon_state = "thea_teabox"
foldable = null
can_hold = list(/obj/item/reagent_containers/glass/teapot/fluff/thea_teapot, /obj/item/reagent_containers/food/drinks/fluff/thea_teacup)
can_hold = list(/obj/item/reagent_containers/glass/beaker/teapot/fluff/thea_teapot, /obj/item/reagent_containers/food/drinks/fluff/thea_teacup)
/obj/item/storage/box/fluff/thea_teabox/fill()
new /obj/item/reagent_containers/glass/teapot/fluff/thea_teapot(src)
new /obj/item/reagent_containers/glass/beaker/teapot/fluff/thea_teapot(src)
for(var/i in 1 to 4)
new /obj/item/reagent_containers/food/drinks/fluff/thea_teacup(src)
make_exact_fit()