diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 383e485c6b2..3b1784a1fbc 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -355,7 +355,6 @@ if(prob(50)) qdel(src) return - else return /obj/machinery/computer/scan_consolenew/Initialize() diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index 661dee3fedb..039ccec0dd5 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/code/modules/client/preference_setup/vore/07_traits.dm @@ -604,11 +604,11 @@ var/global/list/valid_bloodreagents = list("default",REAGENT_ID_IRON,REAGENT_ID_ tgui_alert_async(user, "The trait you've selected cannot be taken by the species you've chosen!", "Error") return TOPIC_REFRESH - if((trait_choice in pref.pos_traits) + pref.neu_traits + pref.neg_traits) + if(trait_choice in (pref.pos_traits + pref.neu_traits + pref.neg_traits)) conflict = instance.name varconflict: - for(var/P in pref.pos_traits + pref.neu_traits + pref.neg_traits) + for(var/P in (pref.pos_traits + pref.neu_traits + pref.neg_traits)) var/datum/trait/instance_test = all_traits[P] if(path in instance_test.excludes) conflict = instance_test.name diff --git a/code/modules/integrated_electronics/core/special_pins/dir_pin.dm b/code/modules/integrated_electronics/core/special_pins/dir_pin.dm index 139350b6fc3..9ce3699d1df 100644 --- a/code/modules/integrated_electronics/core/special_pins/dir_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/dir_pin.dm @@ -20,7 +20,7 @@ write_data_to_pin(new_data) /datum/integrated_io/dir/write_data_to_pin(var/new_data) - if(isnull(new_data) || ((new_data in alldirs) + list(UP, DOWN))) + if(isnull(new_data) || (new_data in (alldirs + list(UP, DOWN)))) data = new_data holder.on_data_written() diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index 4fd9050c7fb..363b382a718 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -462,7 +462,7 @@ /obj/item/dogborg/sleeper/proc/inject_chem(mob/user, chem) if(patient && patient.reagents) - if((chem in injection_chems) + REAGENT_ID_INAPROVALINE) + if(chem in (injection_chems + REAGENT_ID_INAPROVALINE)) if(hound.cell.charge < 800) //This is so borgs don't kill themselves with it. to_chat(hound, span_notice("You don't have enough power to synthesize fluids.")) return