diff --git a/code/controllers/autotransfer.dm b/code/controllers/autotransfer.dm index f847f06908..6593076c72 100644 --- a/code/controllers/autotransfer.dm +++ b/code/controllers/autotransfer.dm @@ -18,7 +18,7 @@ var/datum/controller/transfer_controller/transfer_controller currenttick = currenttick + 1 //VOREStation Edit START if (round_duration_in_ds >= shift_last_vote - 2 MINUTES) - shift_last_vote = 999999999999 //Setting to a stupidly high number since it'll be not used again. + shift_last_vote = 1000000000000 //Setting to a stupidly high number since it'll be not used again. to_world("Warning: This upcoming round-extend vote will be your last chance to vote for shift extension. Wrap up your scenes in the next 60 minutes if the round is extended.") //CHOMPStation Edit if (round_duration_in_ds >= shift_hard_end - 1 MINUTE) init_shift_change(null, 1) diff --git a/code/game/objects/kasscbuttons_ch.dm b/code/game/objects/kasscbuttons_ch.dm index 53787acb5c..89a9ee007f 100644 --- a/code/game/objects/kasscbuttons_ch.dm +++ b/code/game/objects/kasscbuttons_ch.dm @@ -172,7 +172,8 @@ icon = icon_types[index] ? icon_types[index] : icon_types["def"] icon_state = icon_state_types[index] ? icon_state_types[index] : icon_state_types["def"] trig_proc = trig_proc_types[index] ? trig_proc_types[index] : trig_proc_types["def"] - trig_args = trig_args_types[index].len ? trig_args_types[index] : trig_args_types["def"] + var/list/trig_arg_type = trig_args_types[index] + trig_args = (istype(trig_arg_type) && trig_arg_type.len) ? trig_args_types[index] : trig_args_types["def"] /obj/kbutton/toggle/button_trigger() toggled = !toggled diff --git a/code/modules/events/metroid_infestation.dm b/code/modules/events/metroid_infestation.dm index ad4b321f99..c23e14dd74 100644 --- a/code/modules/events/metroid_infestation.dm +++ b/code/modules/events/metroid_infestation.dm @@ -15,7 +15,7 @@ var/in_area = get_area(temp_vent) if(istype(in_area, /area/crew_quarters/sleep) || istype(in_area, /area/hallway/secondary/entry)) continue - if(!temp_vent.welded && temp_vent.network && temp_vent.loc.z in using_map.station_levels) + if(!temp_vent.welded && temp_vent.network && (temp_vent.loc.z in using_map.station_levels)) if(temp_vent.network.normal_members.len > 10) //CHOMP Edit: Most our networks are 40. SM is 4 and toxins is 2. This needed to change in order to spawn. vents += temp_vent diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 1b3c7c3e31..017abf52b4 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -685,7 +685,8 @@ if(isnull(gene_chem[i])) gene_chem[i] = 0 - if(chems[rid].len < i) //YW Edit: allows plants whose reagents have not been defined uniformly to splice properly + var/list/chems_rid = chems[rid] + if(istype(chems_rid) && (chems_rid.len < i)) //YW Edit: allows plants whose reagents have not been defined uniformly to splice properly continue if(chems[rid][i]) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types_ch.dm index cb9f45d12d..2e41c7c986 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types_ch.dm @@ -58,8 +58,8 @@ You struggle to stay awake while floating helplessly in the goo." player_msg = "You are Rakshasa. You are not to directly harm crew, only consume. You never speak a language." energy_adminbuse = TRUE - maxHealth = 999999999999 - health = 999999999999 + maxHealth = 1000000000000 + health = 1000000000000 eye_state = "BLUE EYES" eye_icon_state = "e_rakshasa" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm index 6e634ac57a..517bdfd926 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm @@ -104,7 +104,7 @@ var/global/list/moth_amount = 0 // Chompstation Addition, Rykka waz here. *pawst PN = attached.powernet release_vore_contents() prey_excludes.Cut() - moth_amount++ + moth_amount = moth_amount + 1 death_star() /mob/living/simple_mob/vore/solargrub/proc/death_star() diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index d318e3728f..79edd92a76 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -258,7 +258,9 @@ selected_list["liq_interacts"]["liq_reagent_addons"] = list() for(var/flag_name in selected.reagent_mode_flag_list) if(selected.reagent_mode_flags & selected.reagent_mode_flag_list[flag_name]) - selected_list["liq_interacts"]["liq_reagent_addons"].Add(flag_name) + var/list/selected_list_member = selected_list["liq_interacts"]["liq_reagent_addons"] + ASSERT(islist(selected_list_member)) + selected_list_member.Add(flag_name) selected_list["show_liq_fullness"] = selected.show_fullness_messages selected_list["liq_messages"] = list()