cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 20:20:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Yet Another PR To Fix Various CI Failures (#14420)

Browse Source 
* Fixed mech CI not working (thanks safeties)

* Fixes consistent jumpsuits not working for the prefs menu

* Oops forgot to commit this

* We lost this from #10050, now they're grey again

* Fixes point-blank ballistic shots, fixing mech CI that way

* Adds the screenshot icons for our antags

* Adds a bunch of screenshots for all of our species (yes they're ugly but we'll fix them later)

* I Love Merge Conflict Markers
This commit is contained in:
GoldenAlpharex
2022-06-20 17:05:33 +01:00
committed by GitHub
parent bdeb09a811
commit 3858f626ee
37 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile.dm
+1 -1
View File
@@ -683,7 +683,7 @@
AddElement(/datum/element/embed, projectile_payload = shrapnel_type)
if(!log_override && firer && original)
log_combat(firer, original, "fired at", src, "from [get_area_name(src, TRUE)]")
if(direct_target && (get_dist(direct_target, get_turf(src)) <= 1)) // point blank shots
if(direct_target && (get_dist(direct_target, get_turf(fired_from)) <= 1)) // point blank shots // SKYRAT EDIT - ORIGINAL: if(direct_target && (get_dist(direct_target, get_turf(src)) <= 1))
process_hit(get_turf(direct_target), direct_target)
if(QDELETED(src))
return