cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-28 07:39:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge Fixes

Browse Source 
Fixes issues post merge and and with minor sanity checks and neatness.
This commit is contained in:
Nanai
2013-11-14 13:08:40 -05:00
parent ae31f9cdcf
commit 7ce2314c11
5 changed files with 84 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_internal.dm
+1 -7
View File
@@ -37,14 +37,8 @@
src.damage += amount
var/datum/organ/external/parent = owner.get_organ(parent_organ)
var/datum/organ/internal/eyes/E
var/datum/organ/internal/heart/H
if (!silent)
if(istype(E))
owner.custom_pain("Your eyes burn like mad!", 1)
if(istype(H))
owner.custom_pain("You feel a sudden, stabbing pain inside of your [parent.display_name]!", 1)
else owner.custom_pain("Something inside your [parent.display_name] hurts a lot.", 1)
owner.custom_pain("Something inside your [parent.display_name] hurts a lot.", 1)
/datum/organ/internal/proc/emp_act(severity)