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

Life improvements: Part 1 (#13912)

Browse Source
This commit is contained in:
mikomyazaki
2022-05-18 14:22:43 +02:00
committed by GitHub
parent c854cd149c
commit dae76e0558
34 changed files with 109 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/internal/_internal.dm
+1 -1
View File
@@ -108,7 +108,7 @@
damage = between(0, src.damage + amount, max_damage)
//only show this if the organ is not robotic
if(owner && can_feel_pain() && parent_organ && (amount > 5 || prob(10)))
if(owner && ORGAN_CAN_FEEL_PAIN(src) && parent_organ && (amount > 5 || prob(10)))
var/obj/item/organ/external/parent = owner.get_organ(parent_organ)
if(parent && !silent)
var/degree = ""
code/modules/organs/internal/appendix.dm
+6 -5
View File
@@ -14,10 +14,11 @@
/obj/item/organ/internal/appendix/process()
..()
if(inflamed && owner && !(status & ORGAN_ROBOT))
if(inflamed && owner && !BP_IS_ROBOTIC(src))
var/can_feel_pain = ORGAN_CAN_FEEL_PAIN(src)
inflamed++
if(prob(5))
if(owner.can_feel_pain())
if(can_feel_pain)
owner.custom_pain("You feel a stinging pain in your abdomen!")
owner.visible_message("<B>\The [owner]</B> winces slightly.")
var/obj/item/organ/external/O = owner.get_organ(parent_organ)
@@ -26,7 +27,7 @@
if(inflamed > 200)
if(prob(3))
take_internal_damage(0.1)
if(owner.can_feel_pain())
if(can_feel_pain)
owner.visible_message("<B>\The [owner]</B> winces painfully.")
var/obj/item/organ/external/O = owner.get_organ(parent_organ)
if(O)
@@ -38,7 +39,7 @@
owner.vomit()
if(inflamed > 600)
if(prob(1))
if(owner.can_feel_pain())
if(can_feel_pain)
owner.custom_pain("You feel a stinging pain in your abdomen!")
owner.Weaken(10)
@@ -47,4 +48,4 @@
E.germ_level = max(INFECTION_LEVEL_TWO, E.germ_level)
owner.adjustToxLoss(25)
removed()
qdel(src)
qdel(src)