[READY]integrated circuitry port+upgrade.

2017-11-14 12:05:22 +03:00
parent 4afc4f5b39
commit d8847ea167
61 changed files with 6933 additions and 9 deletions
@@ -1,4 +1,3 @@
-
 /proc/WEAKREF(datum/input)
 	if(istype(input) && !QDELETED(input))
 		if(!input.weak_reference)
@@ -16,4 +15,9 @@

 /datum/weakref/proc/resolve()
 	var/datum/D = locate(reference)
+<<<<<<< HEAD
 	return D.weak_reference == src? D : null
+=======
+	return (!QDELETED(D) && D.weak_reference == src) ? D : null
+
+>>>>>>> bdfbafd... [READY]integrated circuitry port+upgrade. (#32481)