cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-16 09:34:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into reagentToDefines

Browse Source
This commit is contained in:
Kashargul
2024-12-06 21:57:14 +01:00
committed by GitHub
parent 429398bdd7 5092af9321
commit 939fcbb488
212 changed files with 5049 additions and 1312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/internal/appendix.dm
+3 -6
View File
@@ -9,12 +9,9 @@
/mob/living/carbon/human/proc/appendicitis()
if(stat == DEAD)
return 0
var/obj/item/organ/internal/appendix/A = internal_organs_by_name[O_APPENDIX]
if(istype(A) && !A.inflamed)
A.inflamed = 1
return 1
ForceContractDisease(new /datum/disease/appendicitis)
return 0
/*
/obj/item/organ/internal/appendix/process()
..()
@@ -47,7 +44,7 @@
owner.adjustToxLoss(25)
groin.wounds += W
inflamed = 1
*/
/obj/item/organ/internal/appendix/removed()
if(inflamed)
icon_state = "[initial(icon_state)]inflamed"
code/modules/organs/robolimbs_vr.dm
+4
View File
@@ -1,3 +1,7 @@
GLOBAL_LIST_INIT(dsi_to_species, list(SPECIES_TAJARAN = "DSI - Tajaran", SPECIES_UNATHI = "DSI - Lizard", SPECIES_SERGAL = "DSI - Sergal", SPECIES_NEVREAN = "DSI - Nevrean", \
SPECIES_VULPKANIN = "DSI - Vulpkanin", SPECIES_AKULA = "DSI - Akula", SPECIES_VASILISSAN = "DSI - Vasilissan", SPECIES_ZORREN = "DSI - Zorren",\
SPECIES_TESHARI = "DSI - Teshari", SPECIES_FENNEC = "DSI - Fennec"))
//CitRP Port
var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\
default=cyber_default;\
code/modules/organs/subtypes/nano.dm
+34 -13
View File
@@ -2,81 +2,84 @@
/obj/item/organ/external/chest/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 50 // <-- This is different from the rest
max_damage = 70 // <-- This is different from the rest
min_broken_damage = 1000
vital = TRUE // <-- This is different from the rest
vital = TRUE
model = "protean"
/obj/item/organ/external/groin/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 30 // <-- This is different from the rest
max_damage = 70
min_broken_damage = 1000 //Multiple
vital = FALSE
model = "protean"
/obj/item/organ/external/head/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 30
max_damage = 70
min_broken_damage = 1000 //Inheritance
vital = FALSE
model = "protean"
/obj/item/organ/external/arm/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 20
max_damage = 40
min_broken_damage = 1000 //Please
vital = FALSE
model = "protean"
/obj/item/organ/external/arm/right/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 20
max_damage = 40
min_broken_damage = 1000
vital = FALSE
model = "protean"
/obj/item/organ/external/leg/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 20
max_damage = 40
min_broken_damage = 1000
vital = FALSE
model = "protean"
/obj/item/organ/external/leg/right/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 20
max_damage = 40
min_broken_damage = 1000
vital = FALSE
model = "protean"
/obj/item/organ/external/hand/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 20
max_damage = 40
min_broken_damage = 1000
vital = FALSE
model = "protean"
/obj/item/organ/external/hand/right/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 20
max_damage = 40
min_broken_damage = 1000
vital = FALSE
model = "protean"
/obj/item/organ/external/foot/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 20
max_damage = 40
min_broken_damage = 1000
vital = FALSE
model = "protean"
/obj/item/organ/external/foot/right/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 20
max_damage = 40
min_broken_damage = 1000
vital = FALSE
model = "protean"
/obj/item/organ/external/head/unbreakable/nano/disfigure()
return //No way to repair disfigured prots
// // // Internal Organs
/obj/item/organ/internal/nano
robotic = ORGAN_ROBOT
@@ -180,9 +183,11 @@
icon = initial(icon)
icon_state = "posi1"
stored_mmi.icon_state = "posi1"
stored_mmi.brainmob.languages = owner.languages
/obj/item/organ/internal/mmi_holder/posibrain/nano/emp_act()
return //Proteans handle EMP's differently
// The 'out on the ground' object, not the organ holder
/obj/item/mmi/digital/posibrain/nano
name = "protean posibrain"
@@ -209,3 +214,19 @@
/obj/item/mmi/digital/posibrain/nano/transfer_identity()
. = ..()
icon_state = "posi1"
/obj/item/organ/internal/nano/digest_act(atom/movable/item_storage = null)
return FALSE
/datum/design/item/protean_reboot
name = "Protean Reboot Programmer"
id = "protean_reboot"
materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_PLASTEEL = 10000)
build_path = /obj/item/protean_reboot
sort_string = "JVAAZ"
/obj/item/protean_reboot
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 = 'icons/mob/species/protean/protean.dmi'
icon_state = "reboot"