cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Eyestab Stuff (#11812)

Browse Source
This commit is contained in:
Geeves
2021-05-08 12:03:34 +02:00
committed by GitHub
parent 7be7e6e498
commit cd15d63d05
17 changed files with 79 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/scanners.dm
+2 -1
View File
@@ -544,7 +544,8 @@ BREATH ANALYZER
if ( ((user.is_clumsy()) || (DUMB in user.mutations)) && prob(20))
to_chat(user,"<span class='danger'>Your hand slips from clumsiness!</span>")
eyestab(H,user)
if(!H.eyes_protected(src, FALSE))
eyestab(H,user)
to_chat(user,"<span class='danger'>Alert: No breathing detected.</span>")
return
code/game/objects/items/weapons/material/kitchen.dm
+1 -1
View File
@@ -37,7 +37,7 @@
return ..()
if(user.a_intent != I_HELP)
if(target_zone == BP_HEAD || target_zone == BP_EYES)
if((target_zone == BP_HEAD || target_zone == BP_EYES) && !M.eyes_protected(src, FALSE))
if((user.is_clumsy()) && prob(50))
M = user
return eyestab(M,user)
code/game/objects/items/weapons/material/knives.dm
+1 -1
View File
@@ -25,7 +25,7 @@
/obj/item/material/knife/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob, var/target_zone)
if(active == 1)
if(target_zone != BP_EYES && target_zone != BP_HEAD)
if((target_zone != BP_EYES && target_zone != BP_HEAD) || M.eyes_protected(src, FALSE))
return ..()
if((user.is_clumsy()) && prob(50))
M = user
code/game/objects/items/weapons/tools.dm
+1 -1
View File
@@ -104,7 +104,7 @@
/obj/item/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob, var/target_zone)
if(!istype(M) || user.a_intent == "help")
return ..()
if(target_zone != BP_EYES && target_zone != BP_HEAD)
if((target_zone != BP_EYES && target_zone != BP_HEAD) || M.eyes_protected(src, FALSE))
return ..()
if((user.is_clumsy()) && prob(50))
M = user