cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8823 from cadyn/cadyn-bugfixes

Browse Source 
Couple bugfixes
This commit is contained in:
Novacat
2020-08-25 16:37:30 -04:00
committed by GitHub
parent 3de27a9e8f f18c075cfd
commit 0ef6772c9b
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/machinery/flasher.dm
View File

@@ -68,6 +68,11 @@
var/flash_time = strength var/flash_time = strength
if(istype(O, /mob/living/carbon/human)) if(istype(O, /mob/living/carbon/human))
var/mob/living/carbon/human/H = O 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) if(!H.eyecheck() <= 0)
continue continue
flash_time *= H.species.flash_mod flash_time *= H.species.flash_mod

6
code/modules/vore/eating/belly_obj_vr.dm
View File

@@ -483,9 +483,9 @@
var/mob/living/carbon/human/Prey = M var/mob/living/carbon/human/Prey = M
var/mob/living/carbon/human/Pred = owner var/mob/living/carbon/human/Pred = owner
//Reagent sharing for absorbed with pred - Copy so both pred and prey have these reagents. //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.bloodstr.trans_to_holder(Pred.ingested, 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) 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. // 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 // 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. // problems when A absorbs B, and then C absorbs A, resulting in B holding onto an invalid reagent container.