diff --git a/code/controllers/subsystems/supply.dm b/code/controllers/subsystems/supply.dm index c75909e493f..a7610dea59c 100644 --- a/code/controllers/subsystems/supply.dm +++ b/code/controllers/subsystems/supply.dm @@ -121,9 +121,9 @@ SUBSYSTEM_DEF(supply) if(istype(A, /obj/item/reagent_containers/glass/bottle/vaccine)) var/obj/item/reagent_containers/glass/bottle/vaccine/sale_bottle = A - if(istype(CR, /obj/structure/closet/crate/freezer)) + if(!istype(CR, /obj/structure/closet/crate/freezer)) EC.contents = list( - "error" = "Error: Product was improperly packaged. Send conents in freezer crate to preserver contents for transport." + "error" = "Error: Product was improperly packaged. Send conents in freezer crate to preserve contents for transport." ) else if(sale_bottle.reagents.reagent_list.len != 1 || sale_bottle.reagents.get_reagent_amount(REAGENT_ID_VACCINE) < sale_bottle.volume) EC.contents = list( diff --git a/code/game/machinery/pandemic.dm b/code/game/machinery/pandemic.dm index c13fed32102..54791587ed1 100644 --- a/code/game/machinery/pandemic.dm +++ b/code/game/machinery/pandemic.dm @@ -383,13 +383,13 @@ if(stat & (NOPOWER|BROKEN)) return if(beaker) - to_chat(user, span_warning("A beaker is already loaded into the machine!")) + to_chat(user, span_warning("A [beaker] is already loaded into the machine!")) return user.drop_item() beaker = I beaker.loc = src - to_chat(user, span_notice("You add the beaker to the machine.")) + to_chat(user, span_notice("You add \the [I] to the machine.")) update_tgui_static_data(user) icon_state = "pandemic1" else diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/macrophage.dm b/code/modules/mob/living/simple_mob/subtypes/vore/macrophage.dm index 3844bceadfd..33545cfb557 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/macrophage.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/macrophage.dm @@ -75,7 +75,7 @@ if(locate(/mob/living/carbon/human) in vore_selected) addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/simple_mob/vore/aggressive/macrophage, deathcheck)), 3000) else - dust() + death() /mob/living/simple_mob/vore/aggressive/macrophage/green icon_state = "macrophage-2" @@ -93,13 +93,17 @@ victim.ContractDisease(base_disease) /mob/living/simple_mob/vore/aggressive/macrophage/death() - . = ..() + ..() + visible_message(span_warning("\The [src] shrivels up and dies, unable to survive!")) if(isbelly(loc)) var/obj/belly/belly = loc if(belly) var/mob/living/pred = belly.owner pred.ForceContractDisease(base_disease) - dust(remains=/obj/effect/decal/cleanable/mucus) + else + var/obj/effect/decal/cleanable/mucus/sick = new(loc) + sick.viruses += base_disease + qdel(src) /obj/belly/macrophage name = "capsid"