third pass

This commit is contained in:
Drulikar
2025-02-17 03:25:49 -06:00
parent e3f0895c8e
commit c1be5b06b6
4 changed files with 4 additions and 5 deletions
-1
View File
@@ -355,7 +355,6 @@
if(prob(50))
qdel(src)
return
else
return
/obj/machinery/computer/scan_consolenew/Initialize()
@@ -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
@@ -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()
@@ -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