cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Conflicts and Sync with Upstream

Browse Source 
Fixes conflict in icons/obj/gun.dmi by importing sprites added by #172
This commit is contained in:
DZD
2015-01-16 17:07:22 -05:00
parent 475ca3f666 6bcb5d69f4
commit 3939abaf5d
50 changed files with 14252 additions and 13887 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile/special.dm
+4 -28
View File
@@ -187,38 +187,15 @@ obj/item/projectile/kinetic/New()
range--
if(range <= 0)
new /obj/item/effect/kinetic_blast(src.loc)
delete()
del(src)
/obj/item/projectile/kinetic/on_hit(var/atom/target)
/obj/item/projectile/kinetic/on_hit(atom/target)
var/turf/target_turf= get_turf(target)
if(istype(target_turf, /turf/simulated/mineral))
var/turf/simulated/mineral/M = target_turf
M.GetDrilled()
new /obj/item/effect/kinetic_blast(target_turf)
..(target,blocked)
/obj/item/projectile/kinetic/Bump(atom/A as mob|obj|turf|area)
if(!loc) return
if(A == firer)
loc = A.loc
return
if(src)//Do not add to this if() statement, otherwise the meteor won't delete them
if(A)
var/turf/target_turf = get_turf(A)
//testing("Bumped [A.type], on [target_turf.type].")
if(istype(target_turf, /turf/unsimulated/mineral))
var/turf/simulated/mineral/M = target_turf
M.GetDrilled()
// Now we bump as a bullet, if the atom is a non-turf.
if(!isturf(A))
..(A)
qdel(src) // Comment this out if you want to shoot through the asteroid, ERASER-style.
return 1
else
qdel(src)
return 0
..()
/obj/item/effect/kinetic_blast
name = "kinetic explosion"
@@ -228,5 +205,4 @@ obj/item/projectile/kinetic/New()
/obj/item/effect/kinetic_blast/New()
spawn(4)
del(src)
del(src)