Merge remote-tracking branch 'upstream/master'

This commit is contained in:
BongaTheProto
2022-06-07 19:10:13 -05:00
62 changed files with 363 additions and 200 deletions
@@ -205,6 +205,10 @@
if(!throw_item(target, I, user))
break
if(user)
shake_camera(user, (pressureSetting * 0.75 + 1), (pressureSetting * 0.75))
/obj/item/pneumatic_cannon/proc/throw_item(turf/target, obj/item/I, mob/user)
if(!istype(I))
return FALSE