From eeea851210b3687e9680c3107876e83c69666e87 Mon Sep 17 00:00:00 2001 From: Polyzonial <62524471+Polyzonial@users.noreply.github.com> Date: Sat, 4 Nov 2023 18:01:29 +0000 Subject: [PATCH] Mugs don't shatter and Single shot has wielded sprite (#2474) --- mojave/items/food/drinks.dm | 1 + mojave/items/guns/weapons/ballistic/revolver.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/mojave/items/food/drinks.dm b/mojave/items/food/drinks.dm index 50d82b9ffd3..fe59777161c 100644 --- a/mojave/items/food/drinks.dm +++ b/mojave/items/food/drinks.dm @@ -22,6 +22,7 @@ w_class = WEIGHT_CLASS_SMALL grid_height = 32 grid_width = 32 + isGlass = FALSE /obj/item/reagent_containers/food/drinks/mug/ms13/Initialize() . = ..() diff --git a/mojave/items/guns/weapons/ballistic/revolver.dm b/mojave/items/guns/weapons/ballistic/revolver.dm index 28ca8e4ac2a..cb8a2328521 100644 --- a/mojave/items/guns/weapons/ballistic/revolver.dm +++ b/mojave/items/guns/weapons/ballistic/revolver.dm @@ -60,6 +60,7 @@ weapon_weight = WEAPON_HEAVY grid_width = 192 grid_height = 32 + wield_info = /datum/wield_info/default/inhands /obj/item/gun/ballistic/revolver/ms13/mts name = "revolver shotgun"