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

tg moved projectiles out of /item, added '/item' back

Browse Source
This commit is contained in:
Solaris-Shade
2022-03-06 16:29:58 -05:00
parent 2fdb70b2b9
commit c5be81c589
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/effect_system/effects_smoke.dm
+2 -2
View File
@@ -135,8 +135,8 @@
/obj/effect/particle_effect/smoke/bad/Crossed(atom/movable/AM, oldloc)
. = ..()
if(istype(AM, /obj/projectile/beam))
var/obj/projectile/beam/B = AM
if(istype(AM, /obj/item/projectile/beam))
var/obj/item/projectile/beam/B = AM
B.damage = (B.damage/2)
/datum/effect_system/smoke_spread/bad
code/game/objects/structures/girders.dm
+1 -1
View File
@@ -298,7 +298,7 @@
/obj/structure/girder/CanAllowThrough(atom/movable/mover, turf/target)
. = ..()
if((mover.pass_flags & PASSGRILLE) || istype(mover, /obj/projectile))
if((mover.pass_flags & PASSGRILLE) || istype(mover, /obj/item/projectile))
return prob(girderpasschance)
/obj/structure/girder/CanAStarPass(ID, dir, caller)
code/game/objects/structures/grille.dm
+1 -1
View File
@@ -127,7 +127,7 @@
/obj/structure/grille/CanAllowThrough(atom/movable/mover, turf/target)
. = ..()
if(!. && istype(mover, /obj/projectile))
if(!. && istype(mover, /obj/item/projectile))
return prob(30)
/obj/structure/grille/CanAStarPass(ID, dir, caller)