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.

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

REOPEN: OD Pragma InvalidIndexOperation #1100

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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/__HELPERS/atoms.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///Returns the src and all recursive contents as a list.
/atom/proc/get_all_contents(ignore_flag_1)
/atom/proc/get_all_contents(ignore_flag_1) as list
. = list(src)
var/i = 0
while(i < length(.))
Expand Down
2 changes: 1 addition & 1 deletion code/__HELPERS/paths/path.dm
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,6 @@ GLOBAL_LIST_INIT(can_pass_info_vars, GLOBAL_PROC_REF(can_pass_check_vars))

/datum/can_pass_info/proc/compare_against(datum/can_pass_info/check_against)
for(var/comparable_var in GLOB.can_pass_info_vars)
if(!(vars[comparable_var] ~= check_against[comparable_var]))
if(!(vars[comparable_var] ~= check_against.vars[comparable_var]))
return FALSE
return TRUE
2 changes: 1 addition & 1 deletion code/datums/ai/hunting_behavior/hunting_behaviors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
. = ..()

if(!controller.blackboard[hunting_target_key]) //Target is gone for some reason. forget about this task!
controller[hunting_target_key] = null
controller.blackboard[hunting_target_key] = null //Used to be a direct var index, I think this was just wrong before????
finish_action(controller, FALSE, hunting_target_key)
return

Expand Down
2 changes: 1 addition & 1 deletion code/datums/mutations/speech.dm
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
return
UnregisterSignal(owner, COMSIG_MOB_SAY)

/datum/mutation/human/chav/proc/handle_speech(datum/source, mob/speech_args)
/datum/mutation/human/chav/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER

var/message = speech_args[SPEECH_MESSAGE]
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/topic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1692,7 +1692,7 @@
if(response.body == "[]")
dat += "<center><b>0 bans detected for [ckey]</b></center>"
else
bans = json_decode(response["body"])
bans = json_decode(response.body)

//Ignore bans from non-whitelisted sources, if a whitelist exists
var/list/valid_sources
Expand Down
4 changes: 2 additions & 2 deletions code/modules/admin/view_variables/debug_variables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
if(islist(owner))
var/index = name
if (value)
name = owner[name] //name is really the index until this line
name = owner.vars[name] //name is really the index until this line
else
value = owner[name]
value = owner.vars[name]
. = "<li style='backgroundColor:white'>([VV_HREF_TARGET_1V(owner, VV_HK_LIST_EDIT, "E", index)]) ([VV_HREF_TARGET_1V(owner, VV_HK_LIST_CHANGE, "C", index)]) ([VV_HREF_TARGET_1V(owner, VV_HK_LIST_REMOVE, "-", index)]) "
else
. = "<li style='backgroundColor:white'>([VV_HREF_TARGET_1V(owner, VV_HK_BASIC_EDIT, "E", name)]) ([VV_HREF_TARGET_1V(owner, VV_HK_BASIC_CHANGE, "C", name)]) ([VV_HREF_TARGET_1V(owner, VV_HK_BASIC_MASSEDIT, "M", name)]) "
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/head/frenchberet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
UnregisterSignal(M, COMSIG_MOB_SAY)
REMOVE_TRAIT(M, TRAIT_GARLIC_BREATH, type)

/obj/item/clothing/head/frenchberet/proc/handle_speech(datum/source, mob/speech_args)
/obj/item/clothing/head/frenchberet/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER
var/message = speech_args[SPEECH_MESSAGE]
if(message[1] != "*")
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/head/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
. = ..()
UnregisterSignal(M, COMSIG_MOB_SAY)

/obj/item/clothing/head/warden/drill/proc/handle_speech(datum/source, mob/speech_args)
/obj/item/clothing/head/warden/drill/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER
var/message = speech_args[SPEECH_MESSAGE]
if(message[1] != "*")
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mapping/mapping_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
if(response.errored || response.status_code != 200)
query_in_progress = FALSE
CRASH("Failed to fetch mapped custom json from url [json_url], code: [response.status_code], error: [response.error]")
var/json_data = response["body"]
var/json_data = response.body
json_cache[json_url] = json_data
query_in_progress = FALSE
return json_data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
if(!reagent)
say("Could not find [name]")
return
var/datum/chemical_reaction/reaction = SSreagents.chemical_reactions_list_product_index[reagent.type]
var/list/datum/chemical_reaction/reaction = SSreagents.chemical_reactions_list_product_index[reagent.type]
if(!reaction)
say("Could not find [name] reaction!")
return
Expand Down
1 change: 1 addition & 0 deletions tools/ci/od_lints.dme
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#pragma InvalidRange error
#pragma InvalidSetStatement error
#pragma InvalidOverride error
#pragma InvalidIndexOperation error
#pragma DanglingVarType error
#pragma MissingInterpolatedExpression error
#pragma AmbiguousResourcePath error
Expand Down
Loading