mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2025-12-09 14:27:09 +00:00
fix unclear "in" instruction inside of if()
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -267,7 +267,7 @@ SUBSYSTEM_DEF(materials)
|
||||
/datum/controller/subsystem/materials/proc/tgui_materials_context(list/ids, full = FALSE)
|
||||
var/list/data = list()
|
||||
// a hack to make this default to all if not specified.
|
||||
for(var/id in ids || material_lookup)
|
||||
for((var/id in ids) || material_lookup)
|
||||
var/datum/material/mat = material_lookup[id]
|
||||
var/list/built = list(
|
||||
"name" = mat.display_name || mat.name,
|
||||
|
||||
@@ -374,7 +374,7 @@
|
||||
occupantData["name"] = connected.occupant.real_name
|
||||
occupantData["stat"] = connected.occupant.stat
|
||||
occupantData["isViableSubject"] = 1
|
||||
if (MUTATION_NOCLONE in connected.occupant.mutations || !src.connected.occupant.dna)
|
||||
if ((MUTATION_NOCLONE in connected.occupant.mutations) || !src.connected.occupant.dna)
|
||||
occupantData["isViableSubject"] = 0
|
||||
occupantData["health"] = connected.occupant.health
|
||||
occupantData["maxHealth"] = connected.occupant.maxHealth
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
for(var/obj/machinery/power/smes/S in GLOB.machines)
|
||||
var/area/current_area = get_area(S)
|
||||
if(current_area.type in skipped_areas || !(S.z in (LEGACY_MAP_DATUM).station_levels))
|
||||
if((current_area.type in skipped_areas) || !(S.z in (LEGACY_MAP_DATUM).station_levels))
|
||||
continue
|
||||
S.last_charge = S.charge
|
||||
S.last_output_attempt = S.output_attempt
|
||||
@@ -34,7 +34,7 @@
|
||||
C.cell.charge = C.cell.maxcharge
|
||||
for(var/obj/machinery/power/smes/S in GLOB.machines)
|
||||
var/area/current_area = get_area(S)
|
||||
if(current_area.type in skipped_areas || isNotStationLevel(S.z))
|
||||
if((current_area.type in skipped_areas) || isNotStationLevel(S.z))
|
||||
continue
|
||||
if(S.powerout_holders_used)
|
||||
S.charge = S.last_charge
|
||||
|
||||
@@ -593,7 +593,7 @@ datum
|
||||
weight = 20
|
||||
|
||||
get_points(var/job)
|
||||
if(job in science_positions || job in command_positions)
|
||||
if((job in science_positions) || (job in command_positions))
|
||||
return 20
|
||||
return 40
|
||||
|
||||
|
||||
@@ -551,7 +551,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
|
||||
/atom/proc/test_telecomms()
|
||||
var/datum/signal/signal = src.telecomms_process()
|
||||
var/pos_z = get_z(src)
|
||||
return (pos_z in signal.data["level"] && signal.data["done"])
|
||||
return ((pos_z in signal.data["level"]) && signal.data["done"])
|
||||
|
||||
/atom/proc/telecomms_process(var/do_sleep = 1)
|
||||
|
||||
|
||||
@@ -261,7 +261,7 @@ GLOBAL_LIST_EMPTY(buildholders)
|
||||
var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "viruses", "cuffed", "ka", "last_eaten", "urine")
|
||||
|
||||
master.buildmode.varholder = input(usr,"Enter variable name:" ,"Name", "name")
|
||||
if(master.buildmode.varholder in locked && !check_rights(R_DEBUG,0))
|
||||
if((master.buildmode.varholder in locked) && !check_rights(R_DEBUG,0))
|
||||
return 1
|
||||
var/thetype = input(usr,"Select variable type:" ,"Type") in list("text","number","mob-reference","obj-reference","turf-reference")
|
||||
if(!thetype) return 1
|
||||
|
||||
@@ -243,7 +243,7 @@
|
||||
ai_log("react_to_attack_polaris() : Was attacked by [attacker], but we already have a target.", AI_LOG_TRACE)
|
||||
on_attacked(attacker) // So we attack immediately and not threaten.
|
||||
return FALSE
|
||||
else if(attacker in attackers && world.time > last_target_time + 3 SECONDS) // Otherwise, let 'er rip
|
||||
else if((attacker in attackers) && world.time > last_target_time + 3 SECONDS) // Otherwise, let 'er rip
|
||||
ai_log("react_to_attack_polaris() : Was attacked by [attacker]. Can retaliate, waited 3 seconds.", AI_LOG_INFO)
|
||||
on_attacked(attacker) // So we attack immediately and not threaten.
|
||||
return give_target(attacker) // Also handles setting the appropiate stance.
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
var/obj/item/pda/pda = O
|
||||
id_card = pda.id
|
||||
|
||||
if(ACCESS_SECURITY_EQUIPMENT in id_card.access || emagged)
|
||||
if((ACCESS_SECURITY_EQUIPMENT in id_card.access) || emagged)
|
||||
to_chat(user, "You imprint your ID details onto the badge.")
|
||||
set_name(user.real_name)
|
||||
else
|
||||
|
||||
@@ -87,7 +87,7 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /singleton/overmap_event_handler, new)
|
||||
|
||||
/singleton/overmap_event_handler/proc/is_event_in_turf(var/datum/event/E, var/turf/T)
|
||||
for(var/obj/overmap/tiled/hazard/hazard in hazard_by_turf[T])
|
||||
if(E in hazard.events && E.severity == hazard.difficulty)
|
||||
if((E in hazard.events) && E.severity == hazard.difficulty)
|
||||
return TRUE
|
||||
|
||||
/singleton/overmap_event_handler/proc/is_event_included(var/list/hazards, var/obj/overmap/tiled/hazard/E, var/equal_or_better) // This proc is only used so it can break out of 2 loops cleanly
|
||||
|
||||
@@ -393,7 +393,7 @@
|
||||
|
||||
// NOTE: For some reason, this is only actually used for neutral traits??? Weird.
|
||||
if (species_id != SPECIES_ID_CUSTOM)
|
||||
if (trait_path in positive_traits || (trait_path in neutral_traits && trait.custom_only))
|
||||
if ((trait_path in positive_traits) || ((trait_path in neutral_traits) && trait.custom_only))
|
||||
available_trait.forbidden_reason = "This trait is only allowed for custom species."
|
||||
|
||||
available_trait.exclusive_with = exclusions[trait_path]
|
||||
|
||||
@@ -293,7 +293,7 @@
|
||||
|
||||
/datum/tgui_module/card_mod/standard/query_access_ids(mob/user, obj/item/card/id/editing, obj/item/card/id/authing, list/direct)
|
||||
. = list()
|
||||
for(var/id in direct || (((authing?.access || list())) & SSjob.cached_access_edit_relevant))
|
||||
for((var/id in direct) || (((authing?.access || list())) & SSjob.cached_access_edit_relevant))
|
||||
var/datum/access/A = SSjob.access_lookup(id)
|
||||
if(isnull(A.access_edit_list))
|
||||
continue
|
||||
@@ -304,19 +304,19 @@
|
||||
|
||||
/datum/tgui_module/card_mod/standard/query_access_types(mob/user, obj/item/card/id/editing, obj/item/card/id/authing, list/direct)
|
||||
. = NONE
|
||||
for(var/id in direct || (((authing?.access || list())) & SSjob.cached_access_edit_relevant))
|
||||
for((var/id in direct) || (((authing?.access || list())) & SSjob.cached_access_edit_relevant))
|
||||
var/datum/access/A = SSjob.access_lookup(id)
|
||||
. |= A.access_edit_type
|
||||
|
||||
/datum/tgui_module/card_mod/standard/query_access_categories(mob/user, obj/item/card/id/editing, obj/item/card/id/authing, list/direct)
|
||||
. = list()
|
||||
for(var/id in direct || (((authing?.access || list())) & SSjob.cached_access_edit_relevant))
|
||||
for((var/id in direct) || (((authing?.access || list())) & SSjob.cached_access_edit_relevant))
|
||||
var/datum/access/A = SSjob.access_lookup(id)
|
||||
. |= A.access_edit_category
|
||||
|
||||
/datum/tgui_module/card_mod/standard/query_access_regions(mob/user, obj/item/card/id/editing, obj/item/card/id/authing, list/direct)
|
||||
. = NONE
|
||||
for(var/id in direct || (((authing?.access || list())) & SSjob.cached_access_edit_relevant))
|
||||
for((var/id in direct) || (((authing?.access || list())) & SSjob.cached_access_edit_relevant))
|
||||
var/datum/access/A = SSjob.access_lookup(id)
|
||||
if(isnull(A.access_edit_region))
|
||||
continue
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
report("Scan Complete: No antibodies detected.", user)
|
||||
return
|
||||
|
||||
if (MUTATION_CLUMSY in user.mutations && prob(50))
|
||||
if ((MUTATION_CLUMSY in user.mutations) && prob(50))
|
||||
// I was tempted to be really evil and rot13 the output.
|
||||
report("Antibodies detected: [reverse_text(antigens2string(C.antibodies))]", user)
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user