cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #3777

Browse Source 
Signed-off-by: Mloc <colmohici@gmail.com>
This commit is contained in:
Mloc
2013-10-16 11:21:51 +01:00
parent e6c145d6f8
commit 90378111e1
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
code/modules/projectiles/projectile.dm
View File

@@ -112,27 +112,25 @@
M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>" M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
msg_admin_attack("UNKNOWN shot [M] ([M.ckey]) with a [src] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[firer.x];Y=[firer.y];Z=[firer.z]'>JMP</a>)") //BS12 EDIT ALG msg_admin_attack("UNKNOWN shot [M] ([M.ckey]) with a [src] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[firer.x];Y=[firer.y];Z=[firer.z]'>JMP</a>)") //BS12 EDIT ALG
spawn(0) if(A)
if (!forcedodge)
if(A) forcedodge = A.bullet_act(src, def_zone) // searches for return value
if (!forcedodge) if(forcedodge == -1) // the bullet passes through a dense object!
forcedodge = A.bullet_act(src, def_zone) // searches for return value bumped = 0 // reset bumped variable!
if(forcedodge == -1) // the bullet passes through a dense object! if(istype(A, /turf))
bumped = 0 // reset bumped variable! loc = A
if(istype(A, /turf)) else
loc = A loc = A.loc
else permutated.Add(A)
loc = A.loc return 0
permutated.Add(A) if(istype(A,/turf))
return 0 for(var/obj/O in A)
if(istype(A,/turf)) O.bullet_act(src)
for(var/obj/O in A) for(var/mob/M in A)
O.bullet_act(src) M.bullet_act(src, def_zone)
for(var/mob/M in A) density = 0
M.bullet_act(src, def_zone) invisibility = 101
density = 0 del(src)
invisibility = 101
del(src)
return 1 return 1

4
code/modules/projectiles/projectile/animate.dm
View File

@@ -7,7 +7,7 @@
flag = "energy" flag = "energy"
/obj/item/projectile/animate/Bump(var/atom/change) /obj/item/projectile/animate/Bump(var/atom/change)
. = ..() if((istype(change, /obj/item) || istype(change, /obj/structure)) && !is_type_in_list(change, protected_objects))
if(istype(change, /obj/item) || istype(change, /obj/structure) && !is_type_in_list(change, protected_objects))
var/obj/O = change var/obj/O = change
new /mob/living/simple_animal/hostile/mimic/copy(O.loc, O, firer) new /mob/living/simple_animal/hostile/mimic/copy(O.loc, O, firer)
..()