mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-31 00:49:06 +01:00
Fixes spawning with psionics. (#16969)
Fixes a error when sanitizing a character that doesnt have psionics. Fixes #16966 Co-authored-by: Werner <Arrow768@users.noreply.github.com>
This commit is contained in:
@@ -49,6 +49,9 @@
|
||||
)
|
||||
|
||||
/datum/category_item/player_setup_item/general/psionics/load_special(savefile/S)
|
||||
if(!pref.psionics)
|
||||
pref.psionics = "{}"
|
||||
|
||||
var/before = pref.psionics
|
||||
try
|
||||
pref.psionics = json_decode(pref.psionics)
|
||||
|
||||
@@ -473,7 +473,7 @@ var/list/preferences_datums = list()
|
||||
|
||||
character.headset_choice = headset_choice
|
||||
|
||||
if(length(psionics) && character.client)
|
||||
if(length(psionics))
|
||||
for(var/power in psionics)
|
||||
var/singleton/psionic_power/P = GET_SINGLETON(text2path(power))
|
||||
if(istype(P) && (P.ability_flags & PSI_FLAG_CANON))
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
# balance
|
||||
# admin
|
||||
# backend
|
||||
# security
|
||||
# refactor
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: Arrow768
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- bugfix: "Fixes spawning with psionics."
|
||||
- bugfix: "Fixes a error when sanitizing a character that doesnt have psionics."
|
||||
Reference in New Issue
Block a user