cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 18:44:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Helps if I add the code where a flipped-up weldingmask actually fails to protect your eyes from shit.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1228 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
n3ophyt3@gmail.com
2011-03-21 23:58:59 +00:00
parent 25f60dfae8
commit c1a76d63d1
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/devices/flash.dm
+8 -2
View File
@@ -8,8 +8,11 @@
var/safety = null
if (istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if (istype(H.glasses, /obj/item/clothing/glasses/sunglasses) || istype(H.head, /obj/item/clothing/head/helmet/welding))
if (istype(H.glasses, /obj/item/clothing/glasses/sunglasses))
safety = 1
if (istype(H.head, /obj/item/clothing/head/helmet/welding))
if(!H.head:up)
safety = 1
if (istype(M, /mob/living/carbon/alien))//So aliens don't get flashed (they have no external eyes)/N
safety = 1
if(isrobot(user))
@@ -102,8 +105,11 @@
var/safety = null
if (istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if (istype(H.glasses, /obj/item/clothing/glasses/sunglasses) || istype(H.head, /obj/item/clothing/head/helmet/welding))
if (istype(H.glasses, /obj/item/clothing/glasses/sunglasses))
safety = 1
if (istype(H.head, /obj/item/clothing/head/helmet/welding))
if(!H.head:up)
safety = 1
if (istype(M, /mob/living/carbon/alien))//So aliens don't see those annoying flash screens.
safety = 1
if (!( safety ))
code/game/objects/items/weapons/grenades.dm
+15 -2
View File
@@ -143,7 +143,14 @@ FLASHBANG
M.ear_deaf += 10
if (prob(20))
M.ear_damage += rand(0, 4)
if ((!( istype(H.glasses, /obj/item/clothing/glasses/sunglasses) || istype(H.head, /obj/item/clothing/head/helmet/welding) ) || M.paralysis))
var/safe = 0
if (istype(H.glasses, /obj/item/clothing/glasses/sunglasses))
safe = 1
if (istype(H.head, /obj/item/clothing/head/helmet/welding))
if(!H.head:up)
safe = 1
if(!safe)
if(!(M.mutations & 8)) M.stunned = 7
if(!(M.mutations & 8)) M.weakened = 2
else
@@ -155,7 +162,13 @@ FLASHBANG
flick("flash", M.flash)
else
var/mob/living/carbon/human/H = M
if (!( istype(H.glasses, /obj/item/clothing/glasses/sunglasses) || istype(H.head, /obj/item/clothing/head/helmet/welding) ) )
var/safe = 0
if (istype(H.glasses, /obj/item/clothing/glasses/sunglasses))
safe = 1
if (istype(H.head, /obj/item/clothing/head/helmet/welding))
if(!H.head:up)
safe = 1
if(!safe)
flick("flash", M.flash)
M.eye_stat += rand(1, 2)
M.ear_deaf += 5
code/game/objects/items/weapons/tools.dm
+5 -1
View File
@@ -260,10 +260,14 @@ WELDINGTOOOL
return 1
var/safety = 0
if (istype(user, /mob/living/carbon/human))
if (istype(user:head, /obj/item/clothing/head/helmet/welding) || istype(user:head, /obj/item/clothing/head/helmet/space))
if (istype(user:head, /obj/item/clothing/head/helmet/welding))
if (!user:head:up)
safety = 2
else if (istype(user:head, /obj/item/clothing/head/helmet/space))
safety = 2
else if (istype(user:glasses, /obj/item/clothing/glasses/sunglasses))
safety = 1
else if (istype(user:glasses, /obj/item/clothing/glasses/thermal))
safety = -1
else