Skip to content

Commit 2fb68cc

Browse files
authored
Biotech and Organ related fixes (#230)
1 parent 5774660 commit 2fb68cc

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

code/modules/aberrants/organs/mods/3_output.dm

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,11 @@
8181

8282
for(var/quality in output_selection)
8383
var/datum/reagent/hormone/H
84-
var/effect = initial(H.name)
8584
if(ispath(quality, /datum/reagent/hormone))
8685
H = quality
87-
88-
new_output_qualities |= initial(H.name)
89-
new_output_qualities[effect] = quality
86+
var/effect = initial(H.name)
87+
new_output_qualities |= effect
88+
new_output_qualities[effect] = quality
9089

9190
O.output_qualities = new_output_qualities
9291
..()

code/modules/aberrants/organs/mods/component/_component.dm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,14 @@
4141
. = ..()
4242

4343
/datum/component/modification/organ/check_item(obj/item/I, mob/living/user)
44-
..()
44+
. = ..()
45+
if(!.)//hero . saves me from actually fixing the nightmare inheritance of this code
46+
return FALSE
4547

4648
if(istype(I, /obj/item/organ))
4749
var/obj/item/organ/O = I
4850

4951
var/organ_nature = modifications[ORGAN_NATURE] ? modifications[ORGAN_NATURE] : O.nature
50-
5152
if(LAZYFIND(apply_to_qualities, organ_nature))
5253
return TRUE
5354

code/modules/organs/internal/_internal.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@
413413
current_blood = initial(current_blood)
414414
for(var/woundtype in wounddatums)
415415
remove_wound(wounddatums[woundtype])
416+
handle_organ_eff()//makes sure the organ is properly re-added to internal_organs_by_efficiency
416417

417418
// Store these so we can properly restore them when installing/removing mods
418419
/obj/item/organ/internal/proc/initialize_organ_efficiencies()

0 commit comments

Comments
 (0)