Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald

This commit is contained in:
Detective Google
2020-06-20 14:00:14 -05:00
262 changed files with 8625 additions and 265592 deletions
-11
View File
@@ -41,17 +41,6 @@
/turf/closed/wall/attack_tk()
return
/turf/closed/wall/handle_projectile_ricochet(obj/item/projectile/P) //A huge pile of shitcode!
var/turf/p_turf = get_turf(P)
var/face_direction = get_dir(src, p_turf)
var/face_angle = dir2angle(face_direction)
var/incidence_s = GET_ANGLE_OF_INCIDENCE(face_angle, (P.Angle + 180))
if(abs(incidence_s) > 90 && abs(incidence_s) < 270)
return FALSE
var/new_angle_s = SIMPLIFY_DEGREES(face_angle + incidence_s)
P.setAngle(new_angle_s)
return TRUE
/turf/closed/wall/proc/dismantle_wall(devastated=0, explode=0)
if(devastated)
devastate_wall()