cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into universal-damage

Browse Source 
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
This commit is contained in:
Fox McCloud
2019-09-21 12:40:07 -04:00
parent aa49033844 2ec03f63e5
commit 238ea19d09
280 changed files with 2015 additions and 77150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/organ.dm
+1 -1
View File
@@ -100,7 +100,7 @@
return
//Process infections
if(is_robotic() || sterile || (owner && (IS_PLANT in owner.dna.species.species_traits)))
if(is_robotic() || sterile || (owner && (NO_GERMS in owner.dna.species.species_traits)))
germ_level = 0
return
code/modules/surgery/organs/organ_external.dm
+1 -1
View File
@@ -331,7 +331,7 @@ Note that amputating the affected organ does in fact remove the infection from t
*/
/obj/item/organ/external/proc/update_germs()
if(is_robotic() || (IS_PLANT in owner.dna.species.species_traits)) //Robotic limbs shouldn't be infected, nor should nonexistant limbs.
if(is_robotic() || (NO_GERMS in owner.dna.species.species_traits)) //Robotic limbs shouldn't be infected, nor should nonexistant limbs.
germ_level = 0
return
code/modules/surgery/organs/subtypes/standard.dm
+2 -2
View File
@@ -204,8 +204,8 @@
name = limb_name
..()
/obj/item/organ/external/head/receive_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE)
..(brute, burn, sharp, used_weapon, forbidden_limbs, ignore_resists)
/obj/item/organ/external/head/receive_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE, updating_health = TRUE)
..()
if(!disfigured)
if(brute_dam + burn_dam > 50)
disfigure()
code/modules/surgery/organs/subtypes/unbreakable.dm
+44 -12
View File
@@ -1,34 +1,66 @@
// Slime limbs.
/obj/item/organ/external/chest/unbreakable
cannot_break = 1
cannot_break = TRUE
/obj/item/organ/external/groin/unbreakable
cannot_break = 1
cannot_break = TRUE
/obj/item/organ/external/arm/unbreakable
cannot_break = 1
cannot_break = TRUE
/obj/item/organ/external/arm/right/unbreakable
cannot_break = 1
cannot_break = TRUE
/obj/item/organ/external/leg/unbreakable
cannot_break = 1
cannot_break = TRUE
/obj/item/organ/external/leg/right/unbreakable
cannot_break = 1
cannot_break = TRUE
/obj/item/organ/external/foot/unbreakable
cannot_break = 1
cannot_break = TRUE
/obj/item/organ/external/foot/right/unbreakable
cannot_break = 1
cannot_break = TRUE
/obj/item/organ/external/hand/unbreakable
cannot_break = 1
cannot_break = TRUE
/obj/item/organ/external/hand/right/unbreakable
cannot_break = 1
cannot_break = TRUE
/obj/item/organ/external/head/unbreakable
cannot_break = 1
cannot_break = TRUE
// Cannot dismember or break
/obj/item/organ/external/chest/unbreakable/sturdy
cannot_amputate = TRUE
/obj/item/organ/external/groin/unbreakable/sturdy
cannot_amputate = TRUE
/obj/item/organ/external/arm/unbreakable/sturdy
cannot_amputate = TRUE
/obj/item/organ/external/arm/right/unbreakable/sturdy
cannot_amputate = TRUE
/obj/item/organ/external/leg/unbreakable/sturdy
cannot_amputate = TRUE
/obj/item/organ/external/leg/right/unbreakable/sturdy
cannot_amputate = TRUE
/obj/item/organ/external/foot/unbreakable/sturdy
cannot_amputate = TRUE
/obj/item/organ/external/foot/right/unbreakable/sturdy
cannot_amputate = TRUE
/obj/item/organ/external/hand/unbreakable/sturdy
cannot_amputate = TRUE
/obj/item/organ/external/hand/right/unbreakable/sturdy
cannot_amputate = TRUE
/obj/item/organ/external/head/unbreakable/sturdy
cannot_amputate = TRUE
code/modules/surgery/organs/subtypes/vox.dm
+9 -34
View File
@@ -2,53 +2,28 @@
name = "vox liver"
icon = 'icons/obj/species_organs/vox.dmi'
alcohol_intensity = 1.6
/obj/item/organ/internal/stack
name = "cortical stack"
icon = 'icons/obj/species_organs/vox.dmi'
icon_state = "cortical-stack"
parent_organ = "head"
organ_tag = "stack"
slot = "vox_stack"
status = ORGAN_ROBOT
vital = TRUE
var/stackdamaged = FALSE
/obj/item/organ/internal/stack/on_life()
if(damage < 1 && stackdamaged)
owner.mutations.Remove(SCRAMBLED)
owner.dna.SetSEState(SCRAMBLEBLOCK,0)
genemutcheck(owner,SCRAMBLEBLOCK,null,MUTCHK_FORCED)
stackdamaged = FALSE
..()
/obj/item/organ/internal/stack/emp_act(severity)
if(owner)
owner.mutations.Add(SCRAMBLED)
owner.dna.SetSEState(SCRAMBLEBLOCK,1,1)
genemutcheck(owner,SCRAMBLEBLOCK,null,MUTCHK_FORCED)
owner.AdjustConfused(4)
if(!stackdamaged)
stackdamaged = TRUE
..()
sterile = TRUE
/obj/item/organ/internal/eyes/vox
name = "vox eyeballs"
icon = 'icons/obj/species_organs/vox.dmi'
sterile = TRUE
/obj/item/organ/internal/heart/vox
name = "vox heart"
icon = 'icons/obj/species_organs/vox.dmi'
sterile = TRUE
/obj/item/organ/internal/brain/vox
name = "cortical stack"
desc = "A peculiarly advanced bio-electronic device that seems to hold the memories and identity of a Vox."
icon = 'icons/obj/species_organs/vox.dmi'
desc = "A brain with spikes on top of it. It has some odd metallic slot with wires on the side."
icon_state = "brain2"
icon_state = "cortical-stack"
mmi_icon = 'icons/obj/species_organs/vox.dmi'
mmi_icon_state = "mmi_full"
sterile = TRUE
/obj/item/organ/internal/kidneys/vox
name = "vox kidneys"
icon = 'icons/obj/species_organs/vox.dmi'
icon = 'icons/obj/species_organs/vox.dmi'
sterile = TRUE