cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Many bugfixes!

Browse Source
This commit is contained in:
Cadyn
2020-08-23 19:54:11 -07:00
parent f039e2802e
commit 5e02857320
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/_onclick/cyborg.dm
View File

@@ -60,7 +60,6 @@
A.add_hiddenprint(src) A.add_hiddenprint(src)
A.attack_robot(src) A.attack_robot(src)
return return
// buckled cannot prevent machine interlinking but stops arm movement // buckled cannot prevent machine interlinking but stops arm movement
if( buckled ) if( buckled )
return return
@@ -69,7 +68,9 @@
W.attack_self(src) W.attack_self(src)
return 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) // 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)) if(A == loc || (A in loc) || (A in contents))
// No adjacency checks // No adjacency checks

3
code/controllers/subsystems/supply.dm
View File

@@ -205,7 +205,8 @@ SUBSYSTEM_DEF(supply)
else if(islist(SP.access) && SP.one_access) else if(islist(SP.access) && SP.one_access)
var/list/L = SP.access // access var is a plain var, we need a list var/list/L = SP.access // access var is a plain var, we need a list
A.req_one_access = L.Copy() 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) else if(islist(SP.access) && !SP.one_access)
var/list/L = SP.access var/list/L = SP.access
A.req_access = L.Copy() A.req_access = L.Copy()

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

@@ -68,6 +68,9 @@
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
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) if(!H.eyecheck() <= 0)
continue continue
flash_time *= H.species.flash_mod flash_time *= H.species.flash_mod

2
code/modules/reagents/reagent_containers/syringes.dm
View File

@@ -63,7 +63,7 @@
to_chat(user, "<span class='warning'>This syringe is broken!</span>") to_chat(user, "<span class='warning'>This syringe is broken!</span>")
return 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)) if((CLUMSY in user.mutations) && prob(50))
target = user target = user
syringestab(target, user) syringestab(target, user)

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

@@ -482,7 +482,7 @@
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.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) 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. // 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