From 71b1c86a04e9e260f0664af33ac0f8e79f8ca19a Mon Sep 17 00:00:00 2001 From: Morrow Date: Sat, 12 Aug 2023 22:10:12 -0400 Subject: [PATCH 1/2] Initial --- code/game/objects/items.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index dd5e99545d11..7fdeaa8016ee 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -829,6 +829,7 @@ cases. Override_icon_state should be a list.*/ UnregisterSignal(src, list( COMSIG_ITEM_DROPPED, COMSIG_ITEM_UNWIELD, + COMSIG_PARENT_PREQDELETED, )) UnregisterSignal(user, COMSIG_MOB_MOVE_OR_LOOK) //General reset in case anything goes wrong, the view will always reset to default unless zooming in. @@ -861,6 +862,7 @@ cases. Override_icon_state should be a list.*/ RegisterSignal(src, list( COMSIG_ITEM_DROPPED, COMSIG_ITEM_UNWIELD, + COMSIG_PARENT_PREQDELETED, ), PROC_REF(unzoom_dropped_callback)) RegisterSignal(user, COMSIG_MOB_MOVE_OR_LOOK, PROC_REF(zoom_handle_mob_move_or_look)) From d4e09265c5680191ca38d0aa7f78255c7ff55044 Mon Sep 17 00:00:00 2001 From: Morrow Date: Tue, 22 Aug 2023 09:09:38 -0400 Subject: [PATCH 2/2] bam, might be an async problem when it calls back? Iunno I'm dumb. --- code/game/objects/items.dm | 4 ++-- config/example/custom_items.txt | 2 +- config/example/forumdbconfig.txt | 36 ++++++++++++++++---------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 7fdeaa8016ee..a98a9c25d1aa 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -829,7 +829,7 @@ cases. Override_icon_state should be a list.*/ UnregisterSignal(src, list( COMSIG_ITEM_DROPPED, COMSIG_ITEM_UNWIELD, - COMSIG_PARENT_PREQDELETED, + COMSIG_PARENT_QDELETING, )) UnregisterSignal(user, COMSIG_MOB_MOVE_OR_LOOK) //General reset in case anything goes wrong, the view will always reset to default unless zooming in. @@ -862,7 +862,7 @@ cases. Override_icon_state should be a list.*/ RegisterSignal(src, list( COMSIG_ITEM_DROPPED, COMSIG_ITEM_UNWIELD, - COMSIG_PARENT_PREQDELETED, + COMSIG_PARENT_QDELETING, ), PROC_REF(unzoom_dropped_callback)) RegisterSignal(user, COMSIG_MOB_MOVE_OR_LOOK, PROC_REF(zoom_handle_mob_move_or_look)) diff --git a/config/example/custom_items.txt b/config/example/custom_items.txt index 64a4bc648d7f..f4bb1a7028b7 100644 --- a/config/example/custom_items.txt +++ b/config/example/custom_items.txt @@ -1 +1 @@ -ckey: name: /path/to/obj +ckey: name: /path/to/obj diff --git a/config/example/forumdbconfig.txt b/config/example/forumdbconfig.txt index 61a2a2d6ecdc..0335ef90693d 100644 --- a/config/example/forumdbconfig.txt +++ b/config/example/forumdbconfig.txt @@ -1,19 +1,19 @@ -# This configuration file is for the forum database, if you need to set up -# population, death, etc. tracking see 'dbconfig.txt' -# The login credentials for this will likely differ from those in dbconfig.txt! - -# Server the MySQL database can be found at -# Examples: localhost, 200.135.5.43, www.mysqldb.com, etc. -ADDRESS localhost - -# MySQL server port (default is 3306) -PORT 3306 - -# Database the forum data may be found in -DATABASE tgstation13 - -# Username/Login used to access the database -LOGIN mylogin - -# Password used to access the database +# This configuration file is for the forum database, if you need to set up +# population, death, etc. tracking see 'dbconfig.txt' +# The login credentials for this will likely differ from those in dbconfig.txt! + +# Server the MySQL database can be found at +# Examples: localhost, 200.135.5.43, www.mysqldb.com, etc. +ADDRESS localhost + +# MySQL server port (default is 3306) +PORT 3306 + +# Database the forum data may be found in +DATABASE tgstation13 + +# Username/Login used to access the database +LOGIN mylogin + +# Password used to access the database PASSWORD mypassword \ No newline at end of file