diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm index 8b427efd2dd..b14ec08cbeb 100644 --- a/code/modules/events/infestation.dm +++ b/code/modules/events/infestation.dm @@ -68,8 +68,8 @@ spawn_area_type = /area/engineering/atmos locstrings[numlocs] = "atmospherics" if(LOC_INCIN) - spawn_area_type = /area/maintenance/incinerator - locstrings[numlocs] = "the incinerator" + spawn_area_type = /area/maintenance/disposal + locstrings[numlocs] = "waste disposal" if(LOC_CHAPEL) spawn_area_type = /area/chapel/main locstrings[numlocs] = "the chapel" diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index b3f287255f9..b7d0ec9fa1a 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -151,6 +151,9 @@ emp_act ..() /mob/living/carbon/human/resolve_item_attack(obj/item/I, mob/living/user, var/target_zone) + if(check_attack_throat(I, user)) + return null + if(user == src) // Attacking yourself can't miss return target_zone diff --git a/icons/obj/custom_items/make_items.dmi b/icons/obj/custom_items/make_items.dmi index a124f278f2a..1c4c86aa137 100644 Binary files a/icons/obj/custom_items/make_items.dmi and b/icons/obj/custom_items/make_items.dmi differ