From 798b1b50f43a9473d03fa6d39257f7fd2d49b222 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 27 Dec 2020 10:38:07 -0700 Subject: [PATCH 1/2] Update plushes.dm --- code/game/objects/items/plushes.dm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 9bc20565a6..5b0a593267 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -33,6 +33,8 @@ //--end of love :'(-- var/snowflake_id //if we set from a config snowflake plushie. + /// wrapper, do not use, read only + var/__ADMIN_SET_TO_ID var/can_random_spawn = TRUE //if this is FALSE, don't spawn this for random plushies. /obj/item/toy/plush/random_snowflake/Initialize(mapload, set_snowflake_id) @@ -112,10 +114,21 @@ return ..() +/obj/item/toy/plush/vv_get_var(var_name) + if(var_name == NAMEOF(src, __ADMIN_SET_TO_ID)) + return debug_variables("__ADMIN: SET SNOWFLAKE ID", snowflake_id, 0, src) + return ..() + +/obj/item/toy/plush/vv_edit_var(var_name, var_value) + if(var_name == NAMEOF(src, __ADMIN_SET_TO_ID)) + return set_snowflake_from_config(var_value) + return ..() + /obj/item/toy/plush/proc/set_snowflake_from_config(id) var/list/configlist = CONFIG_GET(keyed_list/snowflake_plushies) var/list/jsonlist = configlist[id] - ASSERT(jsonlist) + if(!jsonlist) + return FALSE jsonlist = json_decode(jsonlist) if(jsonlist["inherit_from"]) var/path = text2path(jsonlist["inherit_from"]) @@ -151,6 +164,7 @@ var/datum/component/squeak/S = GetComponent(/datum/component/squeak) S?.override_squeak_sounds = squeak_override snowflake_id = id + return TRUE /obj/item/toy/plush/handle_atom_del(atom/A) if(A == grenade) From d4f94724ece7855fffd3b22f1c6018d4556767e4 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 27 Dec 2020 10:51:44 -0700 Subject: [PATCH 2/2] Update plushes.dm --- code/game/objects/items/plushes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 5b0a593267..3588b7be63 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -116,7 +116,7 @@ /obj/item/toy/plush/vv_get_var(var_name) if(var_name == NAMEOF(src, __ADMIN_SET_TO_ID)) - return debug_variables("__ADMIN: SET SNOWFLAKE ID", snowflake_id, 0, src) + return debug_variable("__ADMIN: SET SNOWFLAKE ID", snowflake_id, 0, src) return ..() /obj/item/toy/plush/vv_edit_var(var_name, var_value)