cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 09:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
This commit is contained in:
GinjaNinja32
2015-08-11 18:47:05 +01:00
parent a40e84f34a 7b1656f40c
commit 631ff21980
60 changed files with 714 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/organs/organ_internal.dm
View File

@@ -79,6 +79,21 @@
owner.b_eyes ? owner.b_eyes : 0
)
/obj/item/organ/eyes/take_damage()
var/oldbroken = is_broken()
..()
if(is_broken() && !oldbroken && owner && !owner.stat)
owner << "<span class='danger'>You go blind!</span>"
/obj/item/organ/eyes/process() //Eye damage replaces the old eye_stat var.
..()
if(!owner)
return
if(is_bruised())
owner.eye_blurry = 20
if(is_broken())
owner.eye_blind = 20
/obj/item/organ/liver
name = "liver"
icon_state = "liver"