cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #7301

Browse Source
This commit is contained in:
Zuhayr
2014-12-09 02:35:46 +10:30
parent b4becaa587
commit a2d3a0055e
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/portable_turret.dm
View File

@@ -362,6 +362,10 @@ Status: []<BR>"},
/obj/machinery/porta_turret/bullet_act(var/obj/item/projectile/Proj) /obj/machinery/porta_turret/bullet_act(var/obj/item/projectile/Proj)
if(Proj.damage_type == HALLOSS)
return
if(on) if(on)
if(!attacked && !emagged) if(!attacked && !emagged)
attacked = 1 attacked = 1

6
code/game/machinery/turrets.dm
View File

@@ -89,6 +89,8 @@
return return
/obj/machinery/turret/bullet_act(var/obj/item/projectile/Proj) /obj/machinery/turret/bullet_act(var/obj/item/projectile/Proj)
if(Proj.damage_type == HALLOSS)
return
take_damage(Proj.damage) take_damage(Proj.damage)
..() ..()
return return
@@ -297,6 +299,8 @@
popping = 0 popping = 0
/obj/machinery/turret/bullet_act(var/obj/item/projectile/Proj) /obj/machinery/turret/bullet_act(var/obj/item/projectile/Proj)
if(Proj.damage_type == HALLOSS)
return
src.health -= Proj.damage src.health -= Proj.damage
..() ..()
if(prob(45) && Proj.damage > 0) src.spark_system.start() if(prob(45) && Proj.damage > 0) src.spark_system.start()
@@ -512,6 +516,8 @@
bullet_act(var/obj/item/projectile/Proj) bullet_act(var/obj/item/projectile/Proj)
if(Proj.damage_type == HALLOSS)
return
take_damage(Proj.damage) take_damage(Proj.damage)
..() ..()
return return