cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for Mloc, part 2.

Browse Source
This commit is contained in:
DJSnapshot
2014-04-25 13:31:10 -07:00
parent bd2b46078a
commit a6fbde8f2f
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/objects/items/weapons/cigs_lighters.dm
View File

@@ -167,9 +167,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM
location.hotspot_expose(700, 5)
if(reagents && reagents.total_volume) // check if it has any reagents at all
if(iscarbon(loc) && (src == loc:wear_mask)) // if it's in the human/monkey mouth, transfer reagents to the mob
if(istype(loc, /mob/living/carbon/human))
var/mob/living/carbon/human/H = loc
if(H.species.flags & IS_SYNTHETIC)
return
var/mob/living/carbon/C = loc
if(C.flags & IS_SYNTHETIC)
return
if(prob(15)) // so it's not an instarape in case of acid
reagents.reaction(C, INGEST)
reagents.trans_to(C, REAGENTS_METABOLISM)

2
code/game/objects/items/weapons/tools.dm
View File

@@ -357,7 +357,7 @@
if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/H = user
var/datum/organ/internal/eyes/E = H.internal_organs["eyes"]
if(H.flags & IS_SYNTHETIC)
if(H.species.flags & IS_SYNTHETIC)
return
switch(safety)
if(1)