shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Big Gulps

Browse Source 
Fixed earshattering fryer sound overshadowing ding sound
This commit is contained in:
AlManiak
2024-10-24 17:03:27 +02:00
parent a90d5c8eff
commit 19f4c34381
5 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/looping_sounds/machinery_sounds.dm
+1 -8
View File
@@ -54,7 +54,7 @@
mid_sounds = list('sound/machines/fryer/deep_fryer_1.ogg' = 1, 'sound/machines/fryer/deep_fryer_2.ogg' = 1)
mid_length = 2
end_sound = 'sound/machines/fryer/deep_fryer_emerge.ogg'
volume = 15
volume = 5
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -66,13 +66,6 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/datum/looping_sound/deep_fryer
mid_length = 2
mid_sounds = list('sound/machines/fryer/deep_fryer_1.ogg' = 1, 'sound/machines/fryer/deep_fryer_2.ogg' = 1)
volume = 30
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/datum/looping_sound/microwave
start_sound = 'sound/machines/microwave/microwave-start.ogg'
start_length = 10
code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+5 -6
View File
@@ -142,7 +142,6 @@
reagent_flags = OPENCONTAINER
spillable = TRUE
container_HP = 5
pickup_sound = 'sound/items/handling/cardboardbox_pickup.ogg'
drop_sound = 'sound/items/handling/cardboardbox_drop.ogg'
@@ -150,7 +149,7 @@
name = "Small Gulp Cup"
desc = "A paper cup. It can hold up to 50 units. It's not very strong."
icon_state = "small"
materials = list(MAT_PLASTIC=200)
custom_materials = list(/datum/material/plastic=200)
w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/drinks/flask/paper_cup/medium
@@ -158,7 +157,7 @@
desc = "It's a paper cup, but you wouldn't call it 'medium' though. It can hold up to 75 units. It's not very strong."
icon_state = "medium"
volume = 75
materials = list(MAT_PLASTIC=300)
custom_materials = list(/datum/material/plastic=300)
w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/drinks/flask/paper_cup/big
@@ -166,7 +165,7 @@
desc = "A huge paper cup, a normal person would struggle to drink it all in one sitting. It can hold up to 120 units. It's not very strong."
icon_state = "big"
volume = 120
materials = list(MAT_PLASTIC=500)
custom_materials = list(/datum/material/plastic=500)
w_class = WEIGHT_CLASS_NORMAL
/obj/item/reagent_containers/food/drinks/flask/paper_cup/extra_big
@@ -174,7 +173,7 @@
desc = "A comically large paper cup. It can hold up to 160 units. It's not very strong."
icon_state = "extra_big"
volume = 160
materials = list(MAT_PLASTIC=600)
custom_materials = list(/datum/material/plastic=600)
w_class = WEIGHT_CLASS_BULKY
/obj/item/reagent_containers/food/drinks/flask/paper_cup/super_extra_big
@@ -182,5 +181,5 @@
desc = "Its called a paper 'cup', but it looks more like an oversized bucket to you. It can hold up to 250 units. It's not very strong."
icon_state = "super_extra_big"
volume = 250
materials = list(MAT_PLASTIC=1000)
custom_materials = list(/datum/material/plastic=1000)
w_class = WEIGHT_CLASS_HUGE
code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
+5 -5
View File
@@ -82,7 +82,7 @@
name = "Small Gulp Cup"
id = "Small_Gulp"
build_type = AUTOLATHE
materials = list(MAT_PLASTIC=200)
materials = list(/datum/material/plastic=200)
build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/small
category = list("initial","Dinnerware")
@@ -90,7 +90,7 @@
name = "Medium Gulp Cup"
id = "Medium_Gulp"
build_type = AUTOLATHE
materials = list(MAT_PLASTIC=300)
materials = list(/datum/material/plastic=300)
build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/medium
category = list("initial","Dinnerware")
@@ -98,7 +98,7 @@
name = "Big Gulp Cup"
id = "Big_Gulp"
build_type = AUTOLATHE
materials = list(MAT_PLASTIC=500)
materials = list(/datum/material/plastic=500)
build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/big
category = list("initial","Dinnerware")
@@ -106,7 +106,7 @@
name = "Extra Big Gulp Cup"
id = "Extra_Big_Gulp"
build_type = AUTOLATHE
materials = list(MAT_PLASTIC=600)
materials = list(/datum/material/plastic=600)
build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/extra_big
category = list("initial","Dinnerware")
@@ -114,7 +114,7 @@
name = "Super Extra Big Gulp Cup"
id = "Super_Extra_Big_Gulp"
build_type = AUTOLATHE
materials = list(MAT_PLASTIC=1000)
materials = list(/datum/material/plastic=1000)
build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/super_extra_big
category = list("initial","Dinnerware")