Merge pull request #25 from ARF-SS13/fenwork

Should fix glass containers clink on tables
ARF-SS13 · Jul 17, 2024 · 033ba3a · 033ba3a
2 parents c92b789 + 1c63ba4
commit 033ba3a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/_maps/map_files/coyote_bayou/foxybar.dmm b/_maps/map_files/coyote_bayou/foxybar.dmm
@@ -3989,6 +3989,20 @@
 	icon_state = "horizontalbottomborderbottom3"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
+"wUh" = (
+/obj/effect/decal/cleanable/glitter/blue{
+	color = "#993311";
+	layer = 3;
+	plane = -1
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
 "xaI" = (
 /obj/structure/easel,
 /obj/effect/overlay/fog/fog2{
@@ -6844,7 +6858,7 @@ okV
 qxm
 wev
 irF
-iku
+wUh
 wxN
 iKD
 wxN

diff --git a/_maps/map_files/coyote_bayou/foxybarupper.dmm b/_maps/map_files/coyote_bayou/foxybarupper.dmm
@@ -1232,7 +1232,8 @@
 "ph" = (
 /obj/effect/decal/cleanable/glitter/blue{
 	color = "#444499";
-	layer = 3
+	layer = 3;
+	plane = -1
 	},
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
@@ -1516,7 +1517,8 @@
 	},
 /obj/effect/decal/cleanable/glitter/blue{
 	color = "#444499";
-	layer = 3
+	layer = 3;
+	plane = -1
 	},
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
@@ -3080,7 +3082,8 @@
 /area/f13/fb/bar)
 "LE" = (
 /obj/effect/decal/cleanable/glitter/white{
-	color = "#884444"
+	color = "#884444";
+	plane = -1
 	},
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)

diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -15,6 +15,7 @@
 	volume = 50
 	resistance_flags = NONE
 	var/isGlass = TRUE //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it
+	tableplacesound = 'sound/machines/glassclink.ogg'
 
 /obj/item/reagent_containers/food/drinks/on_reagent_change(changetype)
 	if (gulp_size < 5)

diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
@@ -4,7 +4,6 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = null
 	w_class = WEIGHT_CLASS_TINY
-	tableplacesound = 'sound/machines/glassclink.ogg'
 	var/amount_per_transfer_from_this = 5
 	var/list/possible_transfer_amounts = list(5,10,15,20,25,30)
 	var/volume = 30