mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 13:10:02 +01:00
fb2610776d
## About The Pull Request Adds the Synth Persocomm to both cybernetic brains. Allows automatic connection of ID to internal computer as well with the ID in your ID slot. No more linking it via janky methods (though you still can). Fixes the bug with spawning as lone infil as a synth. No more bugged uplink in your brain computer. ## Why It's Good For The Game If my brain is half computer I should be able to use it as a computer. Fixes multiple issues with the Persocom and adds it to organics with an augmented brain. Also bugfix good. ## Proof Of Testing <img width="1622" height="823" alt="image" src="https://github.com/user-attachments/assets/9d259d09-2347-4bee-a61a-e873d3eb8b7e" /> <img width="1449" height="647" alt="image" src="https://github.com/user-attachments/assets/be36fdc7-fbcc-43d6-99d1-e0a7d5fc6dc8" /> <img width="1463" height="838" alt="image" src="https://github.com/user-attachments/assets/18b2dd39-c05e-43fc-bac5-00da4d642fca" /> <img width="1520" height="789" alt="image" src="https://github.com/user-attachments/assets/f63fd2a2-bf3b-4652-9e92-32baff97f36d" /> <details> <summary>Screenshots/Videos</summary> </details> ## Changelog 🆑 fix: Uplink location being set to the Persocom when playing as a synth. It will now fall back to one of the other options. add: Small persocom update. Automatic ID imprinting and PDA theme application on spawn. Ghost roles will not automatically imprint their ID. Don't imprint it as a Persistence role or Ruggero will punch you. add: Persocom to cybernetic brain options. add: Additional EMP effects such as stuttering and jittering to the surplus brain to bring it in line with the cortical brain. EMP effects are tripled compared to the cortical brain. Woe. /🆑 --------- Co-authored-by: nikothedude <59709059+nikothedude@users.noreply.github.com>
143 lines
5.3 KiB
Plaintext
143 lines
5.3 KiB
Plaintext
//Unifying vox brains and android brains, so that when one is updated the other is as well.
|
|
|
|
//The accessible cybernetic brain
|
|
/obj/item/organ/brain/cybernetic/cortical
|
|
name = "cortically-augmented brain"
|
|
desc = "A brain which has been, in some part, mechanized."
|
|
icon = 'modular_skyrat/master_files/icons/obj/medical/organs/organs.dmi'
|
|
icon_state = "brain-c"
|
|
organ_flags = ORGAN_ORGANIC | ORGAN_ROBOTIC | ORGAN_VITAL | ORGAN_PROMINENT //it's a bit weird to be both organic and robotic, but yk
|
|
emp_dmg_mult = 1.5 //Note that the base damage is 20/10
|
|
|
|
//internal computer for cortical
|
|
var/obj/item/modular_computer/pda/synth/internal_computer
|
|
actions_types = list(/datum/action/item_action/synth/open_internal_computer)
|
|
|
|
/obj/item/organ/brain/cybernetic/cortical/Initialize(mapload)
|
|
. = ..()
|
|
internal_computer = new(src)
|
|
ADD_TRAIT(src, TRAIT_SILICON_EMOTES_ALLOWED, INNATE_TRAIT)
|
|
|
|
/obj/item/organ/brain/cybernetic/cortical/Destroy()
|
|
QDEL_NULL(internal_computer)
|
|
return ..()
|
|
|
|
/obj/item/organ/brain/cybernetic/cortical/on_mob_insert(mob/living/carbon/human/brain_owner, special, movement_flags)
|
|
. = ..()
|
|
if(!istype(brain_owner))
|
|
return
|
|
RegisterSignal(brain_owner, COMSIG_MOB_EQUIPPED_ITEM, PROC_REF(on_equip_signal))
|
|
if(internal_computer && brain_owner.wear_id)
|
|
internal_computer.handle_id_slot(brain_owner, brain_owner.wear_id)
|
|
|
|
/obj/item/organ/brain/cybernetic/cortical/on_mob_remove(mob/living/carbon/human/brain_owner, special)
|
|
. = ..()
|
|
if(!istype(brain_owner))
|
|
return
|
|
UnregisterSignal(brain_owner, COMSIG_MOB_EQUIPPED_ITEM)
|
|
if(internal_computer)
|
|
internal_computer.handle_id_slot(brain_owner)
|
|
internal_computer.clear_id_slot_signals(brain_owner.wear_id)
|
|
|
|
/obj/item/organ/brain/cybernetic/cortical/proc/on_equip_signal(datum/source, obj/item/item, slot)
|
|
SIGNAL_HANDLER
|
|
if(isnull(internal_computer))
|
|
return
|
|
if(slot == ITEM_SLOT_ID)
|
|
internal_computer.handle_id_slot(owner, item)
|
|
|
|
//Extra effects
|
|
/obj/item/organ/brain/cybernetic/cortical/emp_act(severity)
|
|
. = ..()
|
|
if(. & EMP_PROTECT_SELF)
|
|
return
|
|
if(owner.stat == DEAD)
|
|
return
|
|
switch(severity)
|
|
if(1)
|
|
owner.set_jitter_if_lower(30 SECONDS)
|
|
owner.adjust_stutter(30 SECONDS)
|
|
owner.adjust_confusion(10 SECONDS)
|
|
if(2)
|
|
owner.set_jitter_if_lower(15 SECONDS)
|
|
owner.adjust_stutter(15 SECONDS)
|
|
owner.adjust_confusion(3 SECONDS)
|
|
|
|
//New vox Brain
|
|
/obj/item/organ/brain/cybernetic/cortical/vox
|
|
name = "vox-augmented brain"
|
|
desc = "A brain which has been in some part mechanized. The components are seamlessly integrated into the flesh, which protect that grey matter from biological processes."
|
|
organ_flags = ORGAN_ROBOTIC | ORGAN_VITAL | ORGAN_PROMINENT //Vox brains weren't organic originally. See no reason to change it
|
|
emp_dmg_mult = 1 //20/10 is the voxs' original damage factor
|
|
emp_dmg_max = 150 //this was originally in vox stuffs, as well
|
|
|
|
//surplus
|
|
//note that this is a direct child of the android brain, and is thus not organic
|
|
/obj/item/organ/brain/cybernetic/surplus
|
|
name = "surplus augmented brain"
|
|
desc = "A mostly-mechanized brain. Not much of the flesh remains. Does this make them an IPC?"
|
|
icon = 'modular_skyrat/master_files/icons/obj/medical/organs/organs.dmi'
|
|
icon_state = "brain-a" //visually more similar to what the description says
|
|
maxHealth = BRAIN_DAMAGE_DEATH*0.75 //200 -> 150, per original intention
|
|
emp_dmg_mult = 1.5 //Note that the base damage is 20/10
|
|
emp_dmg_max = 999
|
|
|
|
//internal computer for surplus
|
|
var/obj/item/modular_computer/pda/synth/internal_computer
|
|
actions_types = list(/datum/action/item_action/synth/open_internal_computer)
|
|
/obj/item/organ/brain/cybernetic/surplus/Initialize(mapload)
|
|
. = ..()
|
|
internal_computer = new(src)
|
|
ADD_TRAIT(src, TRAIT_SILICON_EMOTES_ALLOWED, INNATE_TRAIT)
|
|
|
|
/obj/item/organ/brain/cybernetic/surplus/Destroy()
|
|
QDEL_NULL(internal_computer)
|
|
return ..()
|
|
|
|
/obj/item/organ/brain/cybernetic/surplus/on_mob_insert(mob/living/carbon/human/brain_owner, special, movement_flags)
|
|
. = ..()
|
|
if(!istype(brain_owner))
|
|
return
|
|
RegisterSignal(brain_owner, COMSIG_MOB_EQUIPPED_ITEM, PROC_REF(on_equip_signal))
|
|
if(internal_computer && brain_owner.wear_id)
|
|
internal_computer.handle_id_slot(brain_owner, brain_owner.wear_id)
|
|
|
|
/obj/item/organ/brain/cybernetic/surplus/on_mob_remove(mob/living/carbon/human/brain_owner, special)
|
|
. = ..()
|
|
if(!istype(brain_owner))
|
|
return
|
|
UnregisterSignal(brain_owner, COMSIG_MOB_EQUIPPED_ITEM)
|
|
if(internal_computer)
|
|
internal_computer.handle_id_slot(brain_owner)
|
|
internal_computer.clear_id_slot_signals(brain_owner.wear_id)
|
|
|
|
/obj/item/organ/brain/cybernetic/surplus/proc/on_equip_signal(datum/source, obj/item/item, slot)
|
|
SIGNAL_HANDLER
|
|
if(isnull(internal_computer))
|
|
return
|
|
if(slot == ITEM_SLOT_ID)
|
|
internal_computer.handle_id_slot(owner, item)
|
|
|
|
|
|
|
|
//Extra effects for surplus - tripled from cortical
|
|
/obj/item/organ/brain/cybernetic/surplus/emp_act(severity)
|
|
. = ..()
|
|
if(. & EMP_PROTECT_SELF)
|
|
return
|
|
if(owner.stat == DEAD)
|
|
return
|
|
switch(severity)
|
|
if(1)
|
|
owner.set_jitter_if_lower(90 SECONDS)
|
|
owner.adjust_stutter(90 SECONDS)
|
|
owner.adjust_confusion(30 SECONDS)
|
|
if(2)
|
|
owner.set_jitter_if_lower(45 SECONDS)
|
|
owner.adjust_stutter(45 SECONDS)
|
|
owner.adjust_confusion(9 SECONDS)
|
|
|
|
/obj/item/organ/brain/cybernetic/surplus/Initialize(mapload)
|
|
. = ..()
|
|
AddElement(/datum/element/dangerous_organ_removal, /*surgical = */ TRUE, /*annihilate = */ FALSE) //annihilate just means it wont qdel when removed
|