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

2019-11-04 23:15:12 +01:00
parent 17e794bd59 4e8c8ad335
commit 4ab3512dda
118 changed files with 2817 additions and 2428 deletions
@@ -199,6 +199,7 @@
 	if(prob(35))
 		sparks.start()
 	P.firer = user ? user : src
+	P.fired_from = src
 	if(last_projectile_params)
 		P.p_x = last_projectile_params[2]
 		P.p_y = last_projectile_params[3]