Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
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: 2 additions & 0 deletions code/controllers/configuration/configuration.dm
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@
var/entry_is_abstract = initial(E.abstract_type) == entry_type
if(entry_is_abstract)
CRASH("Tried to retrieve an abstract config_entry: [entry_type]")
if(!islist(entries_by_type))
CRASH("entries_by_type is not a list when trying to get: [entry_type]")
E = entries_by_type[entry_type]
if(!E)
CRASH("Missing config entry for [entry_type]!")
Expand Down
3 changes: 3 additions & 0 deletions code/datums/components/religious_tool.dm
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@
return
var/selection2type = easy_access_sect.rites_list[rite_select]
performing_rite = new selection2type(parent)
if(!performing_rite)
to_chat(user, span_warning("Type [rite_select] is not a valid rite! Please make a bug report!"))
return
if(!performing_rite.perform_rite(user, parent))
QDEL_NULL(performing_rite)
else
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2121,7 +2121,7 @@ GLOBAL_LIST_EMPTY(mentor_races)
if(H.IsParalyzed() || H.IsStun())
return FALSE
var/obj/item/organ/tail = H.getorganslot(ORGAN_SLOT_TAIL)
return tail.get_availability(H.dna.species)
return tail?.get_availability(H.dna.species)

/datum/species/proc/is_wagging_tail(mob/living/carbon/human/H)
return ("waggingtail_human" in mutant_bodyparts) || ("waggingtail_lizard" in mutant_bodyparts)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
if(lastscan.len)
data["chems"] = lastscan["reagents"]["reagentlist"]
else
lastscan["reagents"] = list()
data["chems"] = lastscan["reagents"]["reagentlist"] = list()
return data

Expand Down
4 changes: 2 additions & 2 deletions code/modules/research/nanites/nanite_programs/healing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@

/datum/nanite_program/purging_advanced/check_conditions()
var/foreign_reagent = FALSE
for(var/datum/reagent/toxin/R in host_mob.reagents.reagent_list)
for(var/datum/reagent/toxin/R in host_mob.reagents?.reagent_list)
foreign_reagent = TRUE
break
if(!host_mob.getToxLoss() && !foreign_reagent)
Expand All @@ -158,7 +158,7 @@

/datum/nanite_program/purging_advanced/active_effect()
host_mob.adjustToxLoss(-1)
for(var/datum/reagent/toxin/R in host_mob.reagents.reagent_list)
for(var/datum/reagent/toxin/R in host_mob.reagents?.reagent_list)
host_mob.reagents.remove_reagent(R.type,1)

/datum/nanite_program/regenerative_advanced
Expand Down
2 changes: 2 additions & 0 deletions yogstation/code/modules/admin/verbs/adminhelp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -934,6 +934,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)

/proc/get_admin_counts(requiredflags = R_BAN)
. = list("total" = list(), "noflags" = list(), "afk" = list(), "stealth" = list(), "present" = list())
if(!GLOB.permissions)
CRASH("Tried to fetch admin counts when permissions were not initialized")
for(var/client/X in GLOB.permissions.admins)
.["total"] += X
if(requiredflags != 0 && !check_rights_for(X, requiredflags))
Expand Down