cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 12:02:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Le Kidney Beans (#7672)" (#7715)

Browse Source 
This reverts commit fce3617857.
This commit is contained in:
Erki
2019-12-17 17:23:05 +02:00
committed by GitHub
parent 542c288cd8
commit 6210e2bb44
15 changed files with 23 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/internal/kidneys.dm
+8 -29
View File
@@ -1,8 +1,8 @@
/obj/item/organ/internal/kidneys
name = "kidney"
name = "kidneys"
icon_state = "kidneys"
gender = PLURAL
organ_tag = BP_LKIDNEY
organ_tag = BP_KIDNEYS
parent_organ = BP_GROIN
robotic_name = "prosthetic kidneys"
robotic_sprite = "kidneys-prosthetic"
@@ -25,42 +25,21 @@
var/datum/reagent/coffee = locate(/datum/reagent/drink/coffee) in owner.reagents.reagent_list
if(coffee)
if(is_bruised())
owner.adjustToxLoss(0.1 * PROCESS_ACCURACY / 2)
owner.adjustToxLoss(0.1 * PROCESS_ACCURACY)
else if(is_broken())
owner.adjustToxLoss(0.3 * PROCESS_ACCURACY / 2)
owner.adjustToxLoss(0.3 * PROCESS_ACCURACY)
if(is_bruised())
if(prob(5) && reagents.get_reagent_amount("potassium") < 5)
reagents.add_reagent("potassium", REM*5 / 2)
reagents.add_reagent("potassium", REM*5)
if(is_broken())
if(owner.reagents.get_reagent_amount("potassium") < 15)
owner.reagents.add_reagent("potassium", REM*2 / 2)
owner.reagents.add_reagent("potassium", REM*2)
//If your kidneys aren't working, your body's going to have a hard time cleaning your blood.
if(!owner.chem_effects[CE_ANTITOXIN])
if(prob(33))
if(is_broken())
owner.adjustToxLoss(0.3)
if(status & ORGAN_DEAD)
owner.adjustToxLoss(0.5)
/obj/item/organ/internal/kidneys/attackby(var/obj/item/I, var/mob/user)
..()
if(istype(I, /obj/item/hemostat))
if(src.organ_tag == BP_LKIDNEY)
to_chat(usr, "You prepare the kidney for placement on the right side.")
organ_tag = BP_RKIDNEY
name = "right kidney"
else if(organ_tag == BP_RKIDNEY)
organ_tag = BP_LKIDNEY
to_chat(usr, "You prepare the kidney for placement on the left side.")
name = "left kidney"
/obj/item/organ/internal/kidneys/left
name = "left kidney"
organ_tag = BP_LKIDNEY
robotic_name = "prosthetic left kidneys"
/obj/item/organ/internal/kidneys/right
name = "right kidney"
robotic_name = "prosthetic right kidney"
organ_tag = BP_RKIDNEY
if(status & ORGAN_DEAD)
owner.adjustToxLoss(1)
code/modules/organs/subtypes/skrell.dm
-2
View File
@@ -7,8 +7,6 @@
/obj/item/organ/internal/kidneys/skrell
icon_state = "kidney_skrell"
/obj/item/organ/internal/kidneys/skrell/right
icon_state = "kidney_skrell"
/obj/item/organ/internal/eyes/skrell
icon_state = "eyes_skrell"