Merge remote-tracking branch 'citadel/master' into stuff

2020-02-13 04:14:44 -07:00
parent a8a071851a 4345f01322
commit 863ce5152b
85 changed files with 998 additions and 457 deletions
@@ -68,8 +68,8 @@

 /obj/item/clockwork/replica_fabricator/pre_attack(atom/target, mob/living/user, params)
 	if(!target || !user || !is_servant_of_ratvar(user) || istype(target, /obj/item/storage))
-		return TRUE
-	return fabricate(target, user)
+		return ..()
+	return !fabricate(target, user)

 //A note here; return values are for if we CAN BE PUT ON A TABLE, not IF WE ARE SUCCESSFUL, unless no_table_check is TRUE
 /obj/item/clockwork/replica_fabricator/proc/fabricate(atom/target, mob/living/user, silent, no_table_check)