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

Merge remote-tracking branch 'origin/BossFight' into BossFight

Browse Source
This commit is contained in:
Fluff
2023-03-14 18:49:00 -04:00
parent 499ff779c1 5d0a8ee8fb
commit f1b291cb35
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_organs.dm
+12 -12
View File
@@ -2,77 +2,77 @@
/obj/item/organ/external/chest/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 100 // <-- This is different from the rest
max_damage = 70 // <-- This is different from the rest
min_broken_damage = 1000
vital = 1
model = "protean"
/obj/item/organ/external/groin/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 100
max_damage = 70
min_broken_damage = 1000 //Multiple
vital = 0
model = "protean"
/obj/item/organ/external/head/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 100
max_damage = 70
min_broken_damage = 1000 //Inheritance
vital = 0
model = "protean"
/obj/item/organ/external/arm/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 65
max_damage = 40
min_broken_damage = 1000 //Please
vital = 0
model = "protean"
/obj/item/organ/external/arm/right/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 65
max_damage = 40
min_broken_damage = 1000
vital = 0
model = "protean"
/obj/item/organ/external/leg/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 65
max_damage = 40
min_broken_damage = 1000
vital = 0
model = "protean"
/obj/item/organ/external/leg/right/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 65
max_damage = 40
min_broken_damage = 1000
vital = 0
model = "protean"
/obj/item/organ/external/hand/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 65
max_damage = 40
min_broken_damage = 1000
vital = 0
model = "protean"
/obj/item/organ/external/hand/right/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 65
max_damage = 40
min_broken_damage = 1000
vital = 0
model = "protean"
/obj/item/organ/external/foot/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 65
max_damage = 40
min_broken_damage = 1000
vital = 0
model = "protean"
/obj/item/organ/external/foot/right/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 65
max_damage = 40
min_broken_damage = 1000
vital = 0
model = "protean"
@@ -213,4 +213,4 @@
name = "Protean Reboot Programmer"
desc = "A small, highly specialized programmer used to form the basis of a Protean swarm. A necessary component in reconstituting a Protean who has lost total body cohesion."
icon = 'modular_chomp/icons/mob/species/protean/protean.dmi'
icon_state = "reboot"
icon_state = "reboot"
modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm
+2
View File
@@ -41,6 +41,8 @@
//radiation_mod = 0 //Can't be assed with fandangling rad protections while blob formed/suited
darksight = 10
siemens_coefficient = 2
brute_mod = 0.8
burn_mod = 1.5
emp_dmg_mod = 0.8
emp_sensitivity = EMP_BLIND | EMP_DEAFEN | EMP_BRUTE_DMG | EMP_BURN_DMG
item_slowdown_mod = 1.5 //Gentle encouragement to let others wear you