Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Brain nerf #4052

Merged
merged 2 commits into from
Jul 30, 2023
Merged

Brain nerf #4052

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adc9681
initial
morrowwolf Jul 29, 2023
51ce68e
da review
morrowwolf Jul 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/life.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
handle_chemicals_in_body(delta_time)

//Organs and blood
handle_organs()
handle_organs(delta_time)
handle_blood()

//Random events (vomiting etc)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/human/life/handle_organs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Takes care of organ & limb related updates, such as broken and missing limbs
/mob/living/carbon/human/proc/handle_organs()
/mob/living/carbon/human/proc/handle_organs(delta_time)

last_dam = getBruteLoss() + getFireLoss() + getToxLoss()

// Processing internal organs is pretty cheap, do that first.
for(var/datum/internal_organ/I as anything in internal_organs)
I.process()
I.process(delta_time)

for(var/obj/limb/E as anything in limbs_to_process)
if(!E)
Expand Down
14 changes: 14 additions & 0 deletions code/modules/organs/organ_internal.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,20 @@
robotic_type = /obj/item/organ/brain/prosthetic
vital = 1

/datum/internal_organ/brain/process(delta_time)
..()

if(organ_status >= ORGAN_BRUISED && prob(10 * delta_time))
var/dir_choice = pick(list(NORTH, SOUTH, EAST, WEST))
owner.Move(get_step(get_turf(owner), dir_choice))
owner.drop_held_items()
to_chat(owner, SPAN_NOTICE("Your mind wanders and goes blank a moment..."))
morrowwolf marked this conversation as resolved.
Show resolved Hide resolved

if(organ_status >= ORGAN_BROKEN && prob(10 * delta_time))
morrowwolf marked this conversation as resolved.
Show resolved Hide resolved
owner.apply_effect(1, PARALYZE)
owner.make_jittery(50)
to_chat(owner, SPAN_NOTICE("Your body seizes against your control!"))
morrowwolf marked this conversation as resolved.
Show resolved Hide resolved

/datum/internal_organ/brain/prosthetic //used by synthetic species
robotic = ORGAN_ROBOT
removed_type = /obj/item/organ/brain/prosthetic
Expand Down
Loading