cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +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()
code/modules/holidays/christmas/props.dm
+1 -1
View File
@@ -290,7 +290,7 @@
/obj/item/clothing/accessory/horrible,
/obj/item/clothing/shoes/heels,
/obj/item/storage/box/donkpockets,
/obj/item/reagent_containers/glass/teapot,
/obj/item/reagent_containers/glass/beaker/teapot,
/obj/item/device/flashlight/lantern,
/obj/item/clothing/mask/balaclava,
/obj/item/clothing/accessory/badge/old,
code/modules/reagents/Chemistry-Recipes.dm
+6 -6
View File
@@ -3147,22 +3147,22 @@
id = "pumpkinspce"
result = /singleton/reagent/spacespice/pumpkinspice
mix_message = "The spice brightens up."
required_reagents = list(/singleton/reagent/spacespice = 8, /singleton/reagent/nutriment/pumpkinpulp = 2)
result_amount = 10
required_reagents = list(/singleton/reagent/spacespice = 4, /singleton/reagent/nutriment/pumpkinpulp = 1)
result_amount = 5
/datum/chemical_reaction/drink/psfrappe
name = "Pumpkin Spice Frappe"
id = "psfrappe"
result = /singleton/reagent/drink/coffee/icecoffee/psfrappe
required_reagents = list(/singleton/reagent/drink/coffee/icecoffee = 6, /singleton/reagent/drink/syrup_pumpkin = 2, /singleton/reagent/drink/milk/cream = 2)
result_amount = 10
required_reagents = list(/singleton/reagent/drink/coffee/icecoffee = 4, /singleton/reagent/drink/syrup_pumpkin = 1)
result_amount = 5
/datum/chemical_reaction/drink/pslatte
name = "Pumpkin Spice Latte"
id = "pslatte"
result = /singleton/reagent/drink/coffee/latte/pumpkinspice
required_reagents = list(/singleton/reagent/drink/coffee = 6, /singleton/reagent/drink/syrup_pumpkin = 2, /singleton/reagent/drink/milk/cream = 2)
result_amount = 10
required_reagents = list(/singleton/reagent/drink/coffee/latte = 4, /singleton/reagent/drink/syrup_pumpkin = 1)
result_amount = 5
/datum/chemical_reaction/drink/caramel_latte
name = "Caramel latte"
code/modules/reagents/reagent_containers.dm
+1 -1
View File
@@ -115,7 +115,7 @@
return ..()
/obj/item/reagent_containers/afterattack(var/atom/target, var/mob/user, var/proximity, var/params)
if(!proximity || !is_open_container())
if(!proximity || (!is_open_container() && !is_pour_container()))
return
if(is_type_in_list(target,can_be_placed_into))
return
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+1 -3
View File
@@ -7,6 +7,7 @@
desc = "This blank bottle is unyieldingly anonymous, offering no clues to its contents."
icon_state = "glassbottle"
icon = 'icons/obj/item/reagent_containers/food/drinks/bottle.dmi'
filling_states = "10;20;30;40;50;60;70;80;90;100"
amount_per_transfer_from_this = 5//Smaller sip size for more BaRP and less guzzling a litre of vodka before you realise it
volume = 100
item_state = "broken_beer" //Generic held-item sprite until unique ones are made.
@@ -638,21 +639,18 @@
/obj/item/reagent_containers/food/drinks/bottle/small/beer/light
name = "Carp Lite"
desc = "Brewed with \"Pure Ice Asteroid Spring Water\"."
desc_extended = DRINK_FLUFF_GETMORE
icon_state = "litebeer"
reagents_to_add = list(/singleton/reagent/alcohol/beer/light = 30)
/obj/item/reagent_containers/food/drinks/bottle/small/beer/root
name = "Two-Time root beer"
desc = "A popular, old-fashioned brand of root beer, known for its extremely sugary formula. Might make you want a nap afterwards."
desc_extended = DRINK_FLUFF_GETMORE
icon_state = "twotime"
reagents_to_add = list(/singleton/reagent/drink/root_beer = 30)
/obj/item/reagent_containers/food/drinks/bottle/small/ale
name = "\improper Burszi-ale"
desc = "Manufactured in Virklund on New Gibson by Getmore, this is a true Burszian's drink of choice. That is, if you're not an IPC. You wouldn't be able to buy this ale then. Or think of buying it. Or afford it."
desc_extended = DRINK_FLUFF_GETMORE
icon_state = "alebottle"
item_state = "beer"
reagents_to_add = list(/singleton/reagent/alcohol/ale = 30)
code/modules/reagents/reagent_containers/glass.dm
+25 -23
View File
@@ -102,7 +102,7 @@
icon_state = "beaker"
item_state = "beaker"
filling_states = "20;40;60;80;100"
center_of_mass = list("x" = 15,"y" = 11)
center_of_mass = list("x" = 16,"y" = 13)
matter = list(MATERIAL_GLASS = 500)
drop_sound = 'sound/items/drop/drinkglass.ogg'
pickup_sound = 'sound/items/pickup/drinkglass.ogg'
@@ -152,7 +152,7 @@
name = "large beaker"
desc = "A large beaker."
icon_state = "beakerlarge"
center_of_mass = list("x" = 16,"y" = 11)
center_of_mass = list("x" = 17,"y" = 14)
matter = list(MATERIAL_GLASS = 5000)
volume = 120
amount_per_transfer_from_this = 10
@@ -174,7 +174,7 @@
name = "bluespace beaker"
desc = "A bluespace beaker, powered by experimental bluespace technology."
icon_state = "beakerbluespace"
center_of_mass = list("x" = 16,"y" = 11)
center_of_mass = list("x" = 16,"y" = 15)
matter = list(MATERIAL_PHORON = 1000, MATERIAL_DIAMOND = 100)
volume = 300
amount_per_transfer_from_this = 10
@@ -186,7 +186,7 @@
desc = "A small glass vial."
icon_state = "vial"
item_state = "dropper"
center_of_mass = list("x" = 15,"y" = 9)
center_of_mass = list("x" = 16,"y" = 16)
matter = list(MATERIAL_GLASS = 250)
volume = 30
amount_per_transfer_from_this = 10
@@ -198,7 +198,7 @@
desc = "A glass medicine cup. Like a shot glass for medicine."
icon_state = "medcup"
filling_states = "25;50;75;100"
center_of_mass = list("x" = 15,"y" = 9)
center_of_mass = list("x" = 16,"y" = 13)
matter = list(MATERIAL_GLASS = 250)
volume = 15
amount_per_transfer_from_this = 5
@@ -212,6 +212,26 @@
/obj/item/reagent_containers/glass/beaker/sulphuric/reagents_to_add = list(/singleton/reagent/acid = 60)
/obj/item/reagent_containers/glass/beaker/teapot
name = "teapot"
desc = "An elegant teapot. It simply oozes class."
icon_state = "teapot"
item_state = "teapot"
unacidable = TRUE
amount_per_transfer_from_this = 10
volume = 120
/obj/item/reagent_containers/glass/beaker/pitcher
name = "pitcher"
desc = "Everyone's best friend in the morning."
icon_state = "coffeepot"
unacidable = TRUE
amount_per_transfer_from_this = 10
volume = 120
possible_transfer_amounts = list(5,10,15,30,60,120)
// buckets
/obj/item/reagent_containers/glass/bucket
desc = "A blue plastic bucket."
name = "bucket"
@@ -290,21 +310,3 @@
return
..()
/obj/item/reagent_containers/glass/teapot
name = "teapot"
desc = "An elegant teapot. It simply oozes class."
icon_state = "teapot"
item_state = "teapot"
unacidable = TRUE
amount_per_transfer_from_this = 10
volume = 120
/obj/item/reagent_containers/glass/pitcher
name = "pitcher"
desc = "Everyone's best friend in the morning."
icon_state = "pitcher"
unacidable = TRUE
amount_per_transfer_from_this = 10
volume = 120
possible_transfer_amounts = list(5,10,15,30,60,120)
code/modules/reagents/reagent_containers/glass/bottle.dm
+2 -2
View File
@@ -30,7 +30,7 @@
/obj/item/reagent_containers/glass/bottle/Initialize()
. = ..()
if(!icon_state)
icon_state = "bottle-[rand(1,6)]"
icon_state = "bottle-[rand(1,4)]"
update_icon()
@@ -234,7 +234,7 @@
desc = "A small bottle dispenser."
icon_state = "syrup"
filling_states = "20;40;60;80;100"
flags = OPENCONTAINER
flags = POURCONTAINER
volume = 50
/obj/item/reagent_containers/glass/bottle/syrup/chocolate