shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moves tesla_ignore from var on /mob/living to secondary flag

Browse Source
This commit is contained in:
CitadelStationBot
2017-04-17 09:45:30 -05:00
parent 21827263f5
commit dd76874f1c
7 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/flags.dm
+3
View File
@@ -42,6 +42,9 @@
// those restrictions.
#define OMNITONGUE "omnitongue"
// TESLA_IGNORE grants immunity from being targeted by tesla-style electricity
#define TESLA_IGNORE "tesla_ignore"
//turf-only flags
#define NOJAUNT 1
#define UNUSED_TRANSIT_TURF 2
code/game/gamemodes/wizard/spellbook.dm
+1 -1
View File
@@ -213,7 +213,7 @@
/datum/spellbook_entry/lightningbolt/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) //return 1 on success
. = ..()
user.tesla_ignore = TRUE
SET_SECONDARY_FLAG(user, TESLA_IGNORE)
/datum/spellbook_entry/infinite_guns
name = "Lesser Summon Guns"
code/modules/mob/living/carbon/carbon_defense.dm
+1 -1
View File
@@ -169,7 +169,7 @@
..()
/mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, override = 0, tesla_shock = 0, illusion = 0, stun = TRUE)
if(tesla_shock && tesla_ignore)
if(tesla_shock && HAS_SECONDARY_FLAG(src, TESLA_IGNORE))
return FALSE
shock_damage *= siemens_coeff
if(dna && dna.species)
code/modules/mob/living/carbon/human/human_defense.dm
+1 -1
View File
@@ -456,7 +456,7 @@
else if(S.siemens_coefficient == (-1))
total_coeff -= 1
siemens_coeff = total_coeff
if(tesla_ignore)
if(HAS_SECONDARY_FLAG(src, TESLA_IGNORE))
siemens_coeff = 0
else if(!safety)
var/gloves_siemens_coeff = 1
code/modules/mob/living/living_defense.dm
+1 -1
View File
@@ -271,7 +271,7 @@
return 1
/mob/living/proc/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0, stun = TRUE)
if(tesla_shock && tesla_ignore)
if(tesla_shock && HAS_SECONDARY_FLAG(src, TESLA_IGNORE))
return FALSE
if(shock_damage > 0)
if(!illusion)
code/modules/mob/living/living_defines.dm
-1
View File
@@ -70,7 +70,6 @@
var/list/status_effects //a list of all status effects the mob has
var/list/implants = null
var/tesla_ignore = FALSE
var/datum/riding/riding_datum
code/modules/power/tesla/energy_ball.dm
+1 -1
View File
@@ -203,7 +203,7 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
else if(isliving(A))
var/dist = get_dist(source, A)
var/mob/living/L = A
if(dist <= zap_range && (dist < closest_dist || !closest_mob) && L.stat != DEAD && !L.tesla_ignore)
if(dist <= zap_range && (dist < closest_dist || !closest_mob) && L.stat != DEAD && !HAS_SECONDARY_FLAG(L, TESLA_IGNORE))
closest_mob = L
closest_atom = A
closest_dist = dist