diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 0c99425147..a05a948f09 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,7 @@
W.attack_self(src)
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..52a8776071 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) //Chompstation Edit (TODO: Figure out why the fuck this works for others but not us)
+ A.req_access.Cut() //Chompstation Edit
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..5aa42ff26a 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -68,6 +68,11 @@
var/flash_time = strength
if(istype(O, /mob/living/carbon/human))
var/mob/living/carbon/human/H = O
+ //VOREStation Edit Start
+ if(H.nif && H.nif.flag_check(NIF_V_FLASHPROT,NIF_FLAGS_VISION))
+ H.nif.notify("High intensity light detected, and blocked!",TRUE)
+ continue
+ //VOREStation Edit End
if(!H.eyecheck() <= 0)
continue
flash_time *= H.species.flash_mod
diff --git a/code/game/objects/structures/flora/flora.dm b/code/game/objects/structures/flora/flora.dm
index a0f2c8c307..0e05e64539 100644
--- a/code/game/objects/structures/flora/flora.dm
+++ b/code/game/objects/structures/flora/flora.dm
@@ -233,6 +233,9 @@
. += "You can see something in there..."
/obj/structure/flora/pottedplant/attackby(obj/item/I, mob/user)
+ if(issilicon(user))
+ return // Don't try to put modules in here, you're a borg. TODO: Inventory refactor to not be ass.
+
if(stored_item)
to_chat(user, "[I] won't fit in. There already appears to be something in here...")
return
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 6d9becfbc6..f1a7d5cc2b 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -298,7 +298,8 @@
var/trans = reagents.trans_to_mob(target, syringestab_amount_transferred, CHEM_BLOOD)
if(isnull(trans)) trans = 0
add_attack_logs(user,target,"Stabbed with [src.name] containing [contained], trasferred [trans] units")
- break_syringe(target, user)
+ if(!issilicon(user))
+ break_syringe(target, user)
/obj/item/weapon/reagent_containers/syringe/proc/break_syringe(mob/living/carbon/target, mob/living/carbon/user)
desc += " It is broken."
diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index 69979ecc1e..48961a0362 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -481,9 +481,9 @@
var/mob/living/carbon/human/Prey = M
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.touching.trans_to_holder(Pred.bloodstr, Prey.touching.total_volume, copy = TRUE)
+ Prey.bloodstr.trans_to_holder(Pred.ingested, Prey.bloodstr.total_volume, copy = TRUE)
+ Prey.ingested.trans_to_holder(Pred.ingested, Prey.ingested.total_volume, copy = TRUE)
+ Prey.touching.trans_to_holder(Pred.ingested, 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
// problems when A absorbs B, and then C absorbs A, resulting in B holding onto an invalid reagent container.