Upload files

2021-11-18 14:57:19 -03:00
parent 9e14469e09
commit 9d3857c94e
3 changed files with 19 additions and 9 deletions
@@ -52,12 +52,16 @@
 	return

 /**
-  * Properly removes the component from `parent` and cleans up references
-  * Setting `force` makes it not check for and remove the component from the parent
-  * Setting `silent` deletes the component without sending a `COMSIG_COMPONENT_REMOVING` signal
-  */
+ * Properly removes the component from `parent` and cleans up references
+ *
+ * Arguments:
+ * * force - makes it not check for and remove the component from the parent
+ * * silent - deletes the component without sending a [COMSIG_COMPONENT_REMOVING] signal
+ */
 /datum/component/Destroy(force=FALSE, silent=FALSE)
-	if(!force && parent)
+	if(!parent)
+		return ..()
+	if(!force)
 		_RemoveFromParent()
 	if(!silent)
 		SEND_SIGNAL(parent, COMSIG_COMPONENT_REMOVING, src)