cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-13 17:07:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better Bodyscanners and Surgery Stuff (#17520)

Browse Source 
* Better Bodyscanners and Surgery Stuff

* ope

* i can't believe that worked

* adv

* bodyscanner fixes
This commit is contained in:
Wowzewow (Wezzy)
2023-10-08 05:36:13 +08:00
committed by GitHub
parent a44d7a3b7f
commit ea1101ec5c
45 changed files with 1015 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon.dm
+1 -1
View File
@@ -240,7 +240,7 @@
if(org.status & ORGAN_BROKEN)
status += "hurts when touched"
if(org.status & ORGAN_DEAD)
status += "is bruised and necrotic"
status += "is necrotic"
if(!org.is_usable())
status += "dangling uselessly"
if(org.status & ORGAN_BLEEDING)
code/modules/mob/living/carbon/human/species/outsider/revenant.dm
+1 -1
View File
@@ -67,9 +67,9 @@
)
has_limbs = list(
BP_HEAD = list("path" = /obj/item/organ/external/head/unbreakable/revenant),
BP_CHEST = list("path" = /obj/item/organ/external/chest),
BP_GROIN = list("path" = /obj/item/organ/external/groin),
BP_HEAD = list("path" = /obj/item/organ/external/head/unbreakable/revenant),
BP_L_ARM = list("path" = /obj/item/organ/external/arm),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right),
BP_L_LEG = list("path" = /obj/item/organ/external/leg),
code/modules/mob/living/carbon/human/species/outsider/undead.dm
+1 -1
View File
@@ -181,9 +181,9 @@
BP_STOMACH = /obj/item/organ/internal/stomach
)
has_limbs = list(
BP_HEAD = list("path" = /obj/item/organ/external/head/zombie),
BP_CHEST = list("path" = /obj/item/organ/external/chest/zombie),
BP_GROIN = list("path" = /obj/item/organ/external/groin/zombie),
BP_HEAD = list("path" = /obj/item/organ/external/head/zombie),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/zombie),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/zombie),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/zombie),
code/modules/mob/living/carbon/human/species/species.dm
+4 -4
View File
@@ -240,22 +240,22 @@
///Determines the organs that the species spawns with and
var/list/has_organ = list( // which required-organ checks are conducted.
BP_BRAIN = /obj/item/organ/internal/brain,
BP_EYES = /obj/item/organ/internal/eyes,
BP_HEART = /obj/item/organ/internal/heart,
BP_LUNGS = /obj/item/organ/internal/lungs,
BP_LIVER = /obj/item/organ/internal/liver,
BP_KIDNEYS = /obj/item/organ/internal/kidneys,
BP_STOMACH = /obj/item/organ/internal/stomach,
BP_BRAIN = /obj/item/organ/internal/brain,
BP_APPENDIX = /obj/item/organ/internal/appendix,
BP_EYES = /obj/item/organ/internal/eyes
BP_APPENDIX = /obj/item/organ/internal/appendix
)
var/vision_organ // If set, this organ is required for vision. Defaults to BP_EYES if the species has them.
var/breathing_organ // If set, this organ is required to breathe. Defaults to BP_LUNGS if the species has them.
var/list/has_limbs = list(
BP_HEAD = list("path" = /obj/item/organ/external/head),
BP_CHEST = list("path" = /obj/item/organ/external/chest),
BP_GROIN = list("path" = /obj/item/organ/external/groin),
BP_HEAD = list("path" = /obj/item/organ/external/head),
BP_L_ARM = list("path" = /obj/item/organ/external/arm),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right),
BP_L_LEG = list("path" = /obj/item/organ/external/leg),
code/modules/mob/living/carbon/human/species/station/diona/diona.dm
+2 -2
View File
@@ -68,12 +68,12 @@
grab_mod = 0.6 // Viney Tentacles and shit to cling onto
resist_mod = 1.5 // Reasonably stronk, not moreso than an Unathi or robot.
has_organ = list( BP_STOMACH = /obj/item/organ/internal/stomach/diona)
has_organ = list(BP_STOMACH = /obj/item/organ/internal/stomach/diona)
has_limbs = list(
BP_HEAD = list("path" = /obj/item/organ/external/head/diona),
BP_CHEST = list("path" = /obj/item/organ/external/chest/diona),
BP_GROIN = list("path" = /obj/item/organ/external/groin/diona),
BP_HEAD = list("path" = /obj/item/organ/external/head/diona),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/diona),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/diona),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/diona),
code/modules/mob/living/carbon/human/species/station/golem.dm
+1 -1
View File
@@ -69,9 +69,9 @@ var/global/list/golem_types = list(
)
has_limbs = list(
BP_HEAD = list("path" = /obj/item/organ/external/head/unbreakable),
BP_CHEST = list("path" = /obj/item/organ/external/chest/unbreakable),
BP_GROIN = list("path" = /obj/item/organ/external/groin/unbreakable),
BP_HEAD = list("path" = /obj/item/organ/external/head/unbreakable),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/unbreakable),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/unbreakable),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/unbreakable),
code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm
+1 -1
View File
@@ -97,9 +97,9 @@
vision_organ = BP_EYES
has_limbs = list(
BP_HEAD = list("path" = /obj/item/organ/external/head/ipc),
BP_CHEST = list("path" = /obj/item/organ/external/chest/ipc),
BP_GROIN = list("path" = /obj/item/organ/external/groin/ipc),
BP_HEAD = list("path" = /obj/item/organ/external/head/ipc),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/ipc),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/ipc),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/ipc),
code/modules/mob/living/carbon/human/species/station/monkey.dm
+3 -3
View File
@@ -129,13 +129,13 @@
fall_mod = 0.25
has_organ = list(
BP_BRAIN = /obj/item/organ/internal/brain/skrell/neaera,
BP_EYES = /obj/item/organ/internal/eyes/skrell/neaera,
BP_HEART = /obj/item/organ/internal/heart/skrell/neaera,
BP_LUNGS = /obj/item/organ/internal/lungs/skrell/neaera,
BP_LIVER = /obj/item/organ/internal/liver/skrell/neaera,
BP_KIDNEYS = /obj/item/organ/internal/kidneys/skrell/neaera,
BP_BRAIN = /obj/item/organ/internal/brain/skrell/neaera,
BP_STOMACH = /obj/item/organ/internal/stomach,
BP_EYES = /obj/item/organ/internal/eyes/skrell/neaera
BP_STOMACH = /obj/item/organ/internal/stomach
)
/datum/species/monkey/unathi
code/modules/mob/living/carbon/human/species/station/skrell/skrell.dm
+4 -4
View File
@@ -46,9 +46,9 @@
possible_external_organs_modifications = list("Normal","Amputated","Prosthesis", "Diona Nymph")
has_limbs = list(
BP_HEAD = list("path" = /obj/item/organ/external/head/skrell),
BP_CHEST = list("path" = /obj/item/organ/external/chest),
BP_GROIN = list("path" = /obj/item/organ/external/groin),
BP_HEAD = list("path" = /obj/item/organ/external/head/skrell),
BP_L_ARM = list("path" = /obj/item/organ/external/arm),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right),
BP_L_LEG = list("path" = /obj/item/organ/external/leg),
@@ -60,13 +60,13 @@
)
has_organ = list(
BP_BRAIN = /obj/item/organ/internal/brain/skrell,
BP_EYES = /obj/item/organ/internal/eyes/skrell,
BP_HEART = /obj/item/organ/internal/heart/skrell,
BP_LUNGS = /obj/item/organ/internal/lungs/skrell,
BP_LIVER = /obj/item/organ/internal/liver/skrell,
BP_KIDNEYS = /obj/item/organ/internal/kidneys/skrell,
BP_BRAIN = /obj/item/organ/internal/brain/skrell,
BP_STOMACH = /obj/item/organ/internal/stomach,
BP_EYES = /obj/item/organ/internal/eyes/skrell
BP_STOMACH = /obj/item/organ/internal/stomach
)
pain_messages = list("I can't feel my headtails", "You really need some painkillers", "Stars above, the pain")
code/modules/mob/living/carbon/human/species/station/slime.dm
+1 -1
View File
@@ -38,9 +38,9 @@
push_flags = MONKEY|SLIME|SIMPLE_ANIMAL
has_limbs = list(
BP_HEAD = list("path" = /obj/item/organ/external/head/unbreakable),
BP_CHEST = list("path" = /obj/item/organ/external/chest/unbreakable),
BP_GROIN = list("path" = /obj/item/organ/external/groin/unbreakable),
BP_HEAD = list("path" = /obj/item/organ/external/head/unbreakable),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/unbreakable),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/unbreakable),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/unbreakable),
code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm
+3 -3
View File
@@ -109,14 +109,14 @@
zombie_type = SPECIES_ZOMBIE_TAJARA
has_organ = list(
BP_BRAIN = /obj/item/organ/internal/brain/tajara,
BP_EYES = /obj/item/organ/internal/eyes/night,
BP_HEART = /obj/item/organ/internal/heart/tajara,
BP_LUNGS = /obj/item/organ/internal/lungs/tajara,
BP_LIVER = /obj/item/organ/internal/liver/tajara,
BP_KIDNEYS = /obj/item/organ/internal/kidneys/tajara,
BP_STOMACH = /obj/item/organ/internal/stomach/tajara,
BP_BRAIN = /obj/item/organ/internal/brain/tajara,
BP_APPENDIX = /obj/item/organ/internal/appendix/tajara,
BP_EYES = /obj/item/organ/internal/eyes/night
BP_APPENDIX = /obj/item/organ/internal/appendix/tajara
)
stomach_capacity = 6
code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm
+3 -3
View File
@@ -160,21 +160,21 @@
bodyfall_sound = /singleton/sound_category/bodyfall_machine_sound
has_organ = list(
BP_BRAIN = /obj/item/organ/internal/brain/tajara,
BP_EYES = /obj/item/organ/internal/eyes/night,
BP_HEART = /obj/item/organ/internal/heart/tajara/tesla_body,
BP_LUNGS = /obj/item/organ/internal/lungs/tajara,
BP_LIVER = /obj/item/organ/internal/liver/tajara,
BP_KIDNEYS = /obj/item/organ/internal/kidneys/tajara,
BP_STOMACH = /obj/item/organ/internal/stomach/tajara,
BP_BRAIN = /obj/item/organ/internal/brain/tajara,
BP_APPENDIX = /obj/item/organ/internal/appendix/tajara,
BP_EYES = /obj/item/organ/internal/eyes/night,
BP_AUG_TESLA = /obj/item/organ/internal/augment/tesla/massive
)
has_limbs = list(
BP_HEAD = list("path" = /obj/item/organ/external/head),
BP_CHEST = list("path" = /obj/item/organ/external/chest/tesla_body),
BP_GROIN = list("path" = /obj/item/organ/external/groin/tesla_body),
BP_HEAD = list("path" = /obj/item/organ/external/head),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/tesla_body),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/tesla_body),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/tesla_body),
code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm
+8 -8
View File
@@ -105,14 +105,14 @@
)
has_organ = list(
BP_BRAIN = /obj/item/organ/internal/brain/unathi,
BP_HEART = /obj/item/organ/internal/heart/unathi,
BP_LIVER = /obj/item/organ/internal/liver/unathi,
BP_LUNGS = /obj/item/organ/internal/lungs/unathi,
BP_KIDNEYS = /obj/item/organ/internal/kidneys/unathi,
BP_STOMACH = /obj/item/organ/internal/stomach/unathi,
BP_EYES = /obj/item/organ/internal/eyes/unathi
)
BP_BRAIN = /obj/item/organ/internal/brain/unathi,
BP_EYES = /obj/item/organ/internal/eyes/unathi,
BP_HEART = /obj/item/organ/internal/heart/unathi,
BP_LIVER = /obj/item/organ/internal/liver/unathi,
BP_LUNGS = /obj/item/organ/internal/lungs/unathi,
BP_KIDNEYS = /obj/item/organ/internal/kidneys/unathi,
BP_STOMACH = /obj/item/organ/internal/stomach/unathi
)
alterable_internal_organs = list(BP_HEART, BP_EYES, BP_LUNGS, BP_LIVER, BP_KIDNEYS, BP_STOMACH)
code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm
+3 -3
View File
@@ -101,6 +101,8 @@
stamina_recovery = 2 //slow recovery
has_organ = list(
BP_BRAIN = /obj/item/organ/internal/brain/vaurca,
BP_EYES = /obj/item/organ/internal/eyes/night/vaurca,
BP_NEURAL_SOCKET = /obj/item/organ/internal/vaurca/neuralsocket,
BP_LUNGS = /obj/item/organ/internal/lungs/vaurca,
BP_FILTRATION_BIT = /obj/item/organ/internal/vaurca/filtrationbit,
@@ -109,9 +111,7 @@
BP_LIVER = /obj/item/organ/internal/liver/vaurca,
BP_KIDNEYS = /obj/item/organ/internal/kidneys/vaurca,
BP_STOMACH = /obj/item/organ/internal/stomach/vaurca,
BP_APPENDIX = /obj/item/organ/internal/appendix/vaurca,
BP_BRAIN = /obj/item/organ/internal/brain/vaurca,
BP_EYES = /obj/item/organ/internal/eyes/night/vaurca
BP_APPENDIX = /obj/item/organ/internal/appendix/vaurca
)
has_limbs = list(
code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm
+4 -4
View File
@@ -126,6 +126,8 @@
default_h_style = "Bald"
has_organ = list(
BP_BRAIN = /obj/item/organ/internal/brain/vaurca,
BP_EYES = /obj/item/organ/internal/eyes/night/vaurca,
BP_NEURAL_SOCKET = /obj/item/organ/internal/vaurca/neuralsocket/admin,
BP_LUNGS = /obj/item/organ/internal/lungs/vaurca,
BP_FILTRATION_BIT = /obj/item/organ/internal/vaurca/filtrationbit,
@@ -135,8 +137,6 @@
BP_KIDNEYS = /obj/item/organ/internal/kidneys/vaurca,
BP_STOMACH = /obj/item/organ/internal/stomach/vaurca,
BP_APPENDIX = /obj/item/organ/internal/appendix/vaurca,
BP_BRAIN = /obj/item/organ/internal/brain/vaurca,
BP_EYES = /obj/item/organ/internal/eyes/night/vaurca,
BP_HIVENET_SHIELD = /obj/item/organ/internal/augment/hiveshield
)
@@ -213,6 +213,8 @@
)
has_organ = list(
BP_BRAIN = /obj/item/organ/internal/brain/vaurca,
BP_EYES = /obj/item/organ/internal/eyes/night/vaurca,
BP_NEURAL_SOCKET = /obj/item/organ/internal/vaurca/neuralsocket,
BP_LUNGS = /obj/item/organ/internal/lungs/vaurca,
BP_HEART = /obj/item/organ/internal/heart/vaurca,
@@ -220,8 +222,6 @@
BP_VAURCA_LIVER = /obj/item/organ/internal/liver/vaurca/robo,
BP_VAURCA_KIDNEYS = /obj/item/organ/internal/kidneys/vaurca/robo,
BP_STOMACH = /obj/item/organ/internal/stomach,
BP_BRAIN = /obj/item/organ/internal/brain/vaurca,
BP_EYES = /obj/item/organ/internal/eyes/night/vaurca,
BP_FILTRATION_BIT = /obj/item/organ/internal/vaurca/filtrationbit,
BP_HIVENET_SHIELD = /obj/item/organ/internal/augment/hiveshield/advanced
)