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

Emergency fixes for the last merge (#7484)

Browse Source 
Emergency fixes for the last merge
This commit is contained in:
Matt Atlas
2019-11-22 17:29:36 +01:00
committed by Erki
parent 8edb9874f8
commit b2e28f914f
8 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/brain/brain_item.dm
+2 -1
View File
@@ -18,7 +18,7 @@
var/lobotomized = 0
var/can_lobotomize = 1
/obj/item/organ/pariah_brain
/obj/item/organ/internal/pariah_brain
name = "brain remnants"
desc = "Did someone tread on this? It looks useless for cloning or cyborgification."
organ_tag = "brain"
@@ -39,6 +39,7 @@
/obj/item/organ/internal/brain/Initialize(mapload)
. = ..()
health = config.default_brain_health
max_damage = 60
if (!mapload)
addtimer(CALLBACK(src, .proc/clear_screen), 5)
code/modules/mob/living/carbon/human/species/outsider/vox.dm
+1 -1
View File
@@ -109,7 +109,7 @@
BP_LUNGS = /obj/item/organ/internal/lungs/vox,
BP_LIVER = /obj/item/organ/internal/liver/vox,
BP_KIDNEYS = /obj/item/organ/internal/kidneys/vox,
BP_BRAIN = /obj/item/organ/pariah_brain,
BP_BRAIN = /obj/item/organ/internal/pariah_brain,
BP_EYES = /obj/item/organ/internal/eyes
)
spawn_flags = IS_RESTRICTED
code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm
+1 -1
View File
@@ -75,7 +75,7 @@
reagent_tag = IS_MACHINE
has_organ = list(
BP_BRAIN = /obj/item/organ/mmi_holder/posibrain,
BP_BRAIN = /obj/item/organ/internal/mmi_holder/posibrain,
BP_CELL = /obj/item/organ/cell,
BP_OPTICS = /obj/item/organ/internal/eyes/optical_sensor,
BP_IPCTAG = /obj/item/organ/internal/ipc_tag
code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm
+2 -2
View File
@@ -86,7 +86,7 @@
breakcuffs = list(MALE, FEMALE)
has_organ = list(
BP_BRAIN = /obj/item/organ/mmi_holder/posibrain,
BP_BRAIN = /obj/item/organ/internal/mmi_holder/posibrain,
BP_CELL = /obj/item/organ/cell,
BP_OPTICS = /obj/item/organ/internal/eyes/optical_sensor,
"surge" = /obj/item/organ/surge/advanced
@@ -224,7 +224,7 @@
)
has_organ = list(
BP_BRAIN = /obj/item/organ/mmi_holder/posibrain/terminator,
BP_BRAIN = /obj/item/organ/internal/mmi_holder/posibrain/terminator,
"shielded cell" = /obj/item/organ/cell/terminator,
BP_OPTICS = /obj/item/organ/internal/eyes/optical_sensor/terminator,
"data core" = /obj/item/organ/data,