diff --git a/code/datums/components/face_decal.dm b/code/datums/components/face_decal.dm index 674f17fe86c..f045a4f18df 100644 --- a/code/datums/components/face_decal.dm +++ b/code/datums/components/face_decal.dm @@ -118,7 +118,8 @@ GLOBAL_LIST_INIT(creamable, typecacheof(list( /mob/living/carbon/human, /mob/living/basic/pet/dog/corgi, - /mob/living/silicon/ai))) + /mob/living/silicon/ai, +))) /datum/component/face_decal/creampie/Initialize() . = ..() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 2590609c73b..78dbcdeff4a 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -220,7 +220,7 @@ ignored_mobs = user ) - if(chambered.integrity_damage) + if(chambered?.integrity_damage) take_damage(chambered.integrity_damage, sound_effect = FALSE) /obj/item/gun/atom_destruction(damage_flag) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 9471051440e..0763a22f8a4 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -480,6 +480,8 @@ return ..() /obj/item/gun/ballistic/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1) + if(isnull(chambered)) + return ..() if(can_misfire && chambered.can_misfire != FALSE) misfire_probability += misfire_percentage_increment misfire_probability = clamp(misfire_probability, 0, misfire_probability_cap)