Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup

2020-01-18 18:30:51 +08:00
parent 04b34ec8ed fd440ac379
commit fdf3871cb7
243 changed files with 2866 additions and 1802 deletions
--- a/code/modules/modular_computers/computers/machinery/modular_computer.dm
+++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm
@@ -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 ..()