Fixes and Tweaks to Defenses

This commit is contained in:
Fox-McCloud
2015-05-30 01:47:25 -04:00
parent 01896f9209
commit 0602435d8a
7 changed files with 31 additions and 22 deletions
+1 -3
View File
@@ -35,7 +35,6 @@
var/permeability_coefficient = 1 // for chemicals/diseases
var/siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit)
var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up
var/reflect_chance = 0 //This var dictates what % of a time an object will reflect an energy based weapon's shot
var/armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
var/list/allowed = null //suit storage stuff.
var/obj/item/device/uplink/hidden/hidden_uplink = null // All items can have an uplink hidden inside, just remember to add the triggers.
@@ -537,8 +536,7 @@
return 0
/obj/item/proc/IsReflect(var/def_zone) //This proc determines if and at what% an object will reflect energy projectiles if it's in l_hand,r_hand or wear_suit
if(prob(reflect_chance))
return 1
return 0
/obj/item/proc/get_loc_turf()
var/atom/L = loc
+4 -2
View File
@@ -225,10 +225,8 @@ obj/item/weapon/twohanded/
/obj/item/weapon/twohanded/dualsaber/update_icon()
if(wielded)
icon_state = "dualsaber[blade_color][wielded]"
reflect_chance = 100
else
icon_state = "dualsaber0"
reflect_chance = 0
/obj/item/weapon/twohanded/dualsaber/attack(target as mob, mob/living/user as mob)
..()
@@ -268,6 +266,10 @@ obj/item/weapon/twohanded/
..()
hitsound = "swing_hit"
/obj/item/weapon/twohanded/dualsaber/IsReflect()
if(wielded)
return 1
/obj/item/weapon/twohanded/dualsaber/wield()
..()
hitsound = 'sound/weapons/blade1.ogg'