shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2190 from Citadel-Station-13/upstream-merge-29565

Browse Source 
[MIRROR] Fixes a lot of eye damage procs
This commit is contained in:
LetterJay
2017-07-30 14:04:23 -05:00
committed by GitHub
parent 767b1b3e38 5da5e58ee5
commit ccbb3926d7
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/diseases/advance/symptoms/vision.dm
View File

@@ -101,7 +101,7 @@ Bonus
if(!..())
return
var/mob/living/M = A.affected_mob
var/obj/item/organ/eyes/eyes = M.getorganslot("eyes_sight")
var/obj/item/organ/eyes/eyes = M.getorganslot("eye_sight")
if (!eyes)
return
switch(A.stage)

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

@@ -504,7 +504,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
M.adjust_blurriness(3)
M.adjust_eye_damage(rand(2,4))
var/obj/item/organ/eyes/eyes = M.getorganslot("eyes_sight")
var/obj/item/organ/eyes/eyes = M.getorganslot("eye_sight")
if (!eyes)
return
if(eyes.eye_damage >= 10)

2
code/modules/mob/living/carbon/carbon_defense.dm
View File

@@ -269,7 +269,7 @@
var/damage = intensity - get_eye_protection()
if(.) // we've been flashed
var/obj/item/organ/eyes/eyes = getorganslot("eyes_sight")
var/obj/item/organ/eyes/eyes = getorganslot("eye_sight")
if (!eyes)
return
if(visual)

10
code/modules/mob/living/carbon/status_procs.dm
View File

@@ -3,9 +3,9 @@
// eye damage, eye_blind, eye_blurry, druggy, BLIND disability, NEARSIGHT disability, and HUSK disability.
/mob/living/carbon/damage_eyes(amount)
var/obj/item/organ/eyes/eyes = getorganslot("eyes_sight")
var/obj/item/organ/eyes/eyes = getorganslot("eye_sight")
if (!eyes)
return
return
if(amount>0)
eyes.eye_damage = amount
if(eyes.eye_damage > 20)
@@ -15,9 +15,9 @@
overlay_fullscreen("eye_damage", /obj/screen/fullscreen/impaired, 1)
/mob/living/carbon/set_eye_damage(amount)
var/obj/item/organ/eyes/eyes = getorganslot("eyes_sight")
var/obj/item/organ/eyes/eyes = getorganslot("eye_sight")
if (!eyes)
return
return
eyes.eye_damage = max(amount,0)
if(eyes.eye_damage > 20)
if(eyes.eye_damage > 30)
@@ -28,7 +28,7 @@
clear_fullscreen("eye_damage")
/mob/living/carbon/adjust_eye_damage(amount)
var/obj/item/organ/eyes/eyes = getorganslot("eyes_sight")
var/obj/item/organ/eyes/eyes = getorganslot("eye_sight")
if (!eyes)
return
eyes.eye_damage = max(eyes.eye_damage+amount, 0)

2
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
View File

@@ -686,7 +686,7 @@
taste_description = "dull toxin"
/datum/reagent/medicine/oculine/on_mob_life(mob/living/M)
var/obj/item/organ/eyes/eyes = M.getorganslot("eyes_sight")
var/obj/item/organ/eyes/eyes = M.getorganslot("eye_sight")
if (!eyes)
return
if(M.disabilities & BLIND)