cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-10401

Browse Source
This commit is contained in:
Nadyr
2021-05-27 22:40:15 -04:00
committed by GitHub
parent e33c671a92 0f6f622cd9
commit 92e1743b5c
314 changed files with 43393 additions and 73332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm
View File

@@ -39,7 +39,6 @@
if(istype(other_batt,chambered.type) && other_batt.shots_left)
switch_to(other_batt)
return new chambered.projectile_type()
break
return null

2
code/modules/projectiles/projectile/hook.dm
View File

@@ -127,7 +127,7 @@
if(!target_mob)
return
if(Bump(target_mob, forced=1)) //If we hit a turf, try to force an interaction with a mob on the turf.
if(Bump(target_mob)) //If we hit a turf, try to force an interaction with a mob on the turf.
done_mob_unique = TRUE
success = TRUE
else if(firer)