Merge pull request #4870 from Citadel-Station-13/upstream-merge-34315

[MIRROR] Calling WEAKREF with a /datum/weakref returns the input
2018-01-16 13:49:06 -06:00
parent fcb61314fd a44abb3fac
commit fce1c1232a
1 changed files with 2 additions and 0 deletions
@@ -1,5 +1,7 @@
 /proc/WEAKREF(datum/input)
 	if(istype(input) && !QDELETED(input))
+		if(istype(input, /datum/weakref))
+			return input
 		if(!input.weak_reference)
 			input.weak_reference = new /datum/weakref(input)
 		return input.weak_reference