diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 0c99425147..6ddb4453ad 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -60,7 +60,6 @@ A.add_hiddenprint(src) A.attack_robot(src) return - // buckled cannot prevent machine interlinking but stops arm movement if( buckled ) return @@ -69,7 +68,9 @@ W.attack_self(src) return - + if(A.type==/obj/structure/flora/pottedplant || A.parent_type==/obj/structure/flora/pottedplant) + return + // cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents) if(A == loc || (A in loc) || (A in contents)) // No adjacency checks diff --git a/code/controllers/subsystems/supply.dm b/code/controllers/subsystems/supply.dm index ad14c1e6cd..8d1ad6bcb0 100644 --- a/code/controllers/subsystems/supply.dm +++ b/code/controllers/subsystems/supply.dm @@ -205,7 +205,8 @@ SUBSYSTEM_DEF(supply) else if(islist(SP.access) && SP.one_access) var/list/L = SP.access // access var is a plain var, we need a list A.req_one_access = L.Copy() - A.req_access.Cut() + if(A.req_access) + A.req_access.Cut() else if(islist(SP.access) && !SP.one_access) var/list/L = SP.access A.req_access = L.Copy() 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/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 6d9becfbc6..9dc3cf37a7 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -63,7 +63,7 @@ to_chat(user, "This syringe is broken!") return - if(user.a_intent == I_HURT && ismob(target)) + if(user.a_intent == I_HURT && ismob(target) && user.type!=/mob/living/silicon/robot) if((CLUMSY in user.mutations) && prob(50)) target = user syringestab(target, user) diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 69979ecc1e..e9b093a611 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -482,7 +482,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