shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31809 from ShizCalev/helper-cleanup

Browse Source 
Cleans up some istypes not using helpers
This commit is contained in:
Leo
2017-10-17 22:20:42 -02:00
committed by CitadelStationBot
parent 9691c9130f
commit 28656d3347
18 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/beam_rifle.dm
+1 -1
View File
@@ -509,7 +509,7 @@
if(wall_pierce++ < wall_pierce_amount)
loc = target
if(prob(wall_devastate))
if(istype(target, /turf/closed/wall))
if(iswallturf(target))
var/turf/closed/wall/W = target
W.dismantle_wall(TRUE, TRUE)
else
code/modules/projectiles/projectile.dm
+1 -1
View File
@@ -101,7 +101,7 @@
/obj/item/projectile/proc/on_hit(atom/target, blocked = FALSE)
var/turf/target_loca = get_turf(target)
if(!nodamage && (damage_type == BRUTE || damage_type == BURN) && istype(target_loca, /turf/closed/wall) && prob(75))
if(!nodamage && (damage_type == BRUTE || damage_type == BURN) && iswallturf(target_loca) && prob(75))
var/turf/closed/wall/W = target_loca
var/mutable_appearance/decal = mutable_appearance('icons/effects/effects.dmi', "bullet_hole", TURF_DECAL_LAYER)
if(target == original)
code/modules/projectiles/projectile/magic.dm
+1 -1
View File
@@ -76,7 +76,7 @@
OpenDoor(target)
else
var/turf/T = get_turf(target)
if(isclosedturf(T) && !istype(T, /turf/closed/indestructible))
if(isclosedturf(T) && !isindestructiblewall(T))
CreateDoor(T)
/obj/item/projectile/magic/door/proc/CreateDoor(turf/T)