diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 67f867e2b948..dea25b955e0e 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -31,7 +31,7 @@ if(attached) icon_state = "[base_icon_state]_[mode ? "injecting" : "donating"]" else - icon_state = "[base_icon_state]_[mode ? "injecting" : "donating"]" + icon_state = "[base_icon_state]_[mode ? "injectidle" : "donateidle"]" return ..() /obj/machinery/iv_drip/update_overlays() diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm index 22ae79ad9719..f2c03c69139e 100644 --- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm +++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm @@ -43,7 +43,6 @@ return front_nodes + back_nodes + nodes /obj/machinery/atmospherics/pipe/layer_manifold/update_layer() - cut_overlays() layer = initial(layer) + (PIPING_LAYER_MAX * PIPING_LAYER_LCHANGE) //This is above everything else. /obj/machinery/atmospherics/pipe/layer_manifold/update_overlays() diff --git a/code/modules/projectiles/boxes_magazines/external/shotgun.dm b/code/modules/projectiles/boxes_magazines/external/shotgun.dm index 7fdd8bda0f9d..34f1a61ee0ae 100644 --- a/code/modules/projectiles/boxes_magazines/external/shotgun.dm +++ b/code/modules/projectiles/boxes_magazines/external/shotgun.dm @@ -2,6 +2,7 @@ name = "shotgun drum magazine (12g buckshot)" desc = "A bulky drum magazine for shotguns." icon_state = "m12gb" + base_icon_state = "m12gb" ammo_type = /obj/item/ammo_casing/shotgun/buckshot caliber = "12ga" max_ammo = 8 diff --git a/icons/obj/iv_drip.dmi b/icons/obj/iv_drip.dmi index cf1168899de9..e9cbbdffc99f 100644 Binary files a/icons/obj/iv_drip.dmi and b/icons/obj/iv_drip.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index c76bbe8d9979..97bbe730fac8 100644 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ