cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 22:48:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pol Sync

Browse Source
This commit is contained in:
Cameron Lennox
2017-10-08 17:44:25 -04:00
parent 997d32d055 bd8c6d7cbf
commit 15a6472d14
301 changed files with 7133 additions and 3215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/internal/brain.dm
+1
View File
@@ -127,6 +127,7 @@
desc = "A complex, organic knot of jelly and crystalline particles."
icon = 'icons/mob/slimes.dmi'
icon_state = "green slime extract"
parent_organ = BP_TORSO
/obj/item/organ/internal/brain/golem
name = "chem"
code/modules/organs/internal/liver.dm
+3 -2
View File
@@ -39,10 +39,11 @@
// Do some reagent processing.
if(owner.chem_effects[CE_ALCOHOL_TOXIC])
take_damage(owner.chem_effects[CE_ALCOHOL_TOXIC] * 0.1 * PROCESS_ACCURACY, prob(1)) // Chance to warn them
if(filter_effect < 2) //Liver is badly damaged, you're drinking yourself to death
owner.adjustToxLoss(owner.chem_effects[CE_ALCOHOL_TOXIC] * 0.2 * PROCESS_ACCURACY)
if(filter_effect < 3)
owner.adjustToxLoss(owner.chem_effects[CE_ALCOHOL_TOXIC] * 0.1 * PROCESS_ACCURACY)
else
take_damage(owner.chem_effects[CE_ALCOHOL_TOXIC] * 0.1 * PROCESS_ACCURACY, prob(1)) // Chance to warn them
/obj/item/organ/internal/liver/handle_germ_effects()
. = ..() //Up should return an infection level as an integer
code/modules/organs/subtypes/slime.dm
+47
View File
@@ -0,0 +1,47 @@
/obj/item/organ/external/chest/unbreakable/slime
nonsolid = 1
max_damage = 50
encased = 0
/obj/item/organ/external/groin/unbreakable/slime
nonsolid = 1
max_damage = 30
/obj/item/organ/external/arm/unbreakable/slime
nonsolid = 1
max_damage = 5
/obj/item/organ/external/arm/right/unbreakable/slime
nonsolid = 1
max_damage = 5
/obj/item/organ/external/leg/unbreakable/slime
nonsolid = 1
max_damage = 5
/obj/item/organ/external/leg/right/unbreakable/slime
nonsolid = 1
max_damage = 5
/obj/item/organ/external/foot/unbreakable/slime
nonsolid = 1
max_damage = 5
/obj/item/organ/external/foot/right/unbreakable/slime
nonsolid = 1
max_damage = 5
/obj/item/organ/external/hand/unbreakable/slime
nonsolid = 1
max_damage = 5
/obj/item/organ/external/hand/right/unbreakable/slime
nonsolid = 1
max_damage = 5
/obj/item/organ/external/head/unbreakable/slime //They don't need this anymore.
nonsolid = 1
cannot_gib = 0
vital = 0
max_damage = 5
encased = 0
code/modules/organs/subtypes/unbreakable.dm
+1 -46
View File
@@ -40,49 +40,4 @@
/obj/item/organ/external/head/unbreakable
cannot_break = 1
dislocated = -1
// Slime limbs.
/obj/item/organ/external/chest/unbreakable/slime
nonsolid = 1
max_damage = 50
/obj/item/organ/external/groin/unbreakable/slime
nonsolid = 1
max_damage = 30
/obj/item/organ/external/arm/unbreakable/slime
nonsolid = 1
max_damage = 5
/obj/item/organ/external/arm/right/unbreakable/slime
nonsolid = 1
max_damage = 5
/obj/item/organ/external/leg/unbreakable/slime
nonsolid = 1
max_damage = 5
/obj/item/organ/external/leg/right/unbreakable/slime
nonsolid = 1
max_damage = 5
/obj/item/organ/external/foot/unbreakable/slime
nonsolid = 1
max_damage = 5
/obj/item/organ/external/foot/right/unbreakable/slime
nonsolid = 1
max_damage = 5
/obj/item/organ/external/hand/unbreakable/slime
nonsolid = 1
max_damage = 5
/obj/item/organ/external/hand/right/unbreakable/slime
nonsolid = 1
max_damage = 5
/obj/item/organ/external/head/unbreakable/slime
nonsolid = 1
max_damage = 5
dislocated = -1