diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index ad82ffd656..694b27c437 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -68,6 +68,9 @@ var/flash_time = strength if(istype(O, /mob/living/carbon/human)) var/mob/living/carbon/human/H = O + if(H.nif && H.nif.flag_check(NIF_V_FLASHPROT,NIF_FLAGS_VISION)) + H.nif.notify("High intensity light detected, and blocked!",TRUE) + continue if(!H.eyecheck() <= 0) continue flash_time *= H.species.flash_mod diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index ef8b3d282e..18b4724521 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -484,7 +484,7 @@ var/mob/living/carbon/human/Pred = owner //Reagent sharing for absorbed with pred - Copy so both pred and prey have these reagents. Prey.bloodstr.trans_to_holder(Pred.bloodstr, Prey.bloodstr.total_volume, copy = TRUE) - Prey.ingested.trans_to_holder(Pred.bloodstr, Prey.ingested.total_volume, copy = TRUE) + Prey.ingested.trans_to_holder(Pred.ingested, Prey.ingested.total_volume, copy = TRUE) Prey.touching.trans_to_holder(Pred.bloodstr, Prey.touching.total_volume, copy = TRUE) // TODO - Find a way to make the absorbed prey share the effects with the pred. // Currently this is infeasible because reagent containers are designed to have a single my_atom, and we get