Conflict fix

2020-01-20 13:50:52 +02:00
parent 782125b339 0f4f07dc95
commit f5ad854c2c
373 changed files with 6548 additions and 3989 deletions
@@ -158,4 +158,5 @@
 // "Brute" damage mostly damages the casing.
 /obj/machinery/modular_computer/bullet_act(obj/item/projectile/Proj)
 	if(cpu)
-		cpu.bullet_act(Proj)
+		return cpu.bullet_act(Proj)
+	return ..()