cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 22:48:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7305 from PsiOmegaDelta/dev-freeze

Browse Source 
Dev freeze
This commit is contained in:
PsiOmegaDelta
2014-12-08 17:50:30 +01:00
parent efe78df3ff 4d6d74b859
commit 3819bc6f27
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/portable_turret.dm
+5 -1
View File
@@ -338,6 +338,10 @@
die() //the death process :(
/obj/machinery/porta_turret/bullet_act(obj/item/projectile/Proj)
if(Proj.damage_type == HALLOSS)
return
if(on)
if(!attacked && !emagged)
attacked = 1
@@ -358,7 +362,7 @@
check_records = prob(50)
check_weapons = prob(50)
check_access = prob(20) // check_access is a pretty big deal, so it's least likely to get turned on
check_anomalies = prob(50)
check_anomalies = prob(50)
if(prob(5))
emagged = 1
code/game/machinery/turrets.dm
+6
View File
@@ -89,6 +89,8 @@
return
/obj/machinery/turret/bullet_act(var/obj/item/projectile/Proj)
if(Proj.damage_type == HALLOSS)
return
take_damage(Proj.damage)
..()
return
@@ -297,6 +299,8 @@
popping = 0
/obj/machinery/turret/bullet_act(var/obj/item/projectile/Proj)
if(Proj.damage_type == HALLOSS)
return
src.health -= Proj.damage
..()
if(prob(45) && Proj.damage > 0) src.spark_system.start()
@@ -376,6 +380,8 @@
bullet_act(var/obj/item/projectile/Proj)
if(Proj.damage_type == HALLOSS)
return
take_damage(Proj.damage)
..()
return