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

Merge pull request #2242 from Neerti/7/31/2016_technomancer_fixes

Browse Source 
Technomancer Fixes
This commit is contained in:
Yoshax
2016-08-01 01:18:13 +01:00
committed by GitHub
parent 2d91d68fb6 3d11717d13
commit 4779026748
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/gamemodes/technomancer/spells/aura/unstable_aura.dm
View File

@@ -15,7 +15,7 @@
glow_color = "#0000FF" //TODO glow_color = "#0000FF" //TODO
/obj/item/weapon/spell/aura/unstable/process() /obj/item/weapon/spell/aura/unstable/process()
if(!pay_energy(500)) if(!pay_energy(200))
qdel(src) qdel(src)
var/list/nearby_mobs = range(14,owner) var/list/nearby_mobs = range(14,owner)
for(var/mob/living/L in nearby_mobs) for(var/mob/living/L in nearby_mobs)
@@ -25,6 +25,7 @@
var/damage_to_inflict = max(L.health / L.maxHealth, 0) // Otherwise, those in crit would actually be healed. var/damage_to_inflict = max(L.health / L.maxHealth, 0) // Otherwise, those in crit would actually be healed.
var/armor_factor = abs(L.getarmor(null, "energy") - 100) var/armor_factor = abs(L.getarmor(null, "energy") - 100)
armor_factor = round(armor_factor / 100)
damage_to_inflict = damage_to_inflict * armor_factor damage_to_inflict = damage_to_inflict * armor_factor

4
code/game/gamemodes/technomancer/spells/gambit.dm
View File

@@ -6,11 +6,13 @@
obj_path = /obj/item/weapon/spell/gambit obj_path = /obj/item/weapon/spell/gambit
/var/global/list/all_technomancer_gambit_spells = typesof(/obj/item/weapon/spell) - list( /var/global/list/all_technomancer_gambit_spells = typesof(/obj/item/weapon/spell) - list(
/obj/item/weapon/spell,
/obj/item/weapon/spell/gambit, /obj/item/weapon/spell/gambit,
/obj/item/weapon/spell/projectile, /obj/item/weapon/spell/projectile,
/obj/item/weapon/spell/aura, /obj/item/weapon/spell/aura,
/obj/item/weapon/spell/insert, /obj/item/weapon/spell/insert,
/obj/item/weapon/spell/spawner) /obj/item/weapon/spell/spawner,
/obj/item/weapon/spell/summon)
/obj/item/weapon/spell/gambit /obj/item/weapon/spell/gambit
name = "gambit" name = "gambit"

2
code/game/gamemodes/technomancer/spells/summon/summon_ward.dm
View File

@@ -43,6 +43,8 @@
/mob/living/simple_animal/ward/death() /mob/living/simple_animal/ward/death()
if(creator) if(creator)
creator << "<span class='danger'>Your ward inside [get_area(src)] was killed!</span>" creator << "<span class='danger'>Your ward inside [get_area(src)] was killed!</span>"
..()
qdel(src)
/mob/living/simple_animal/ward/proc/expire() /mob/living/simple_animal/ward/proc/expire()
if(creator && src) if(creator && src)

2
code/game/gamemodes/technomancer/spells/track.dm
View File

@@ -39,6 +39,8 @@ var/list/technomancer_belongings = list()
for(var/mob/living/L in mob_list) for(var/mob/living/L in mob_list)
if(!is_ally(L) && !can_track_non_allies) if(!is_ally(L) && !can_track_non_allies)
continue continue
if(L == user)
continue
mob_choices += L mob_choices += L
var/choice = input(user,"Decide what or who to track.","Tracking") as null|anything in object_choices + mob_choices var/choice = input(user,"Decide what or who to track.","Tracking") as null|anything in object_choices + mob_choices
if(choice) if(choice)

11
code/modules/mob/living/carbon/human/human_defense.dm
View File

@@ -18,12 +18,11 @@ emp_act
//Shields //Shields
var/shield_check = check_shields(P.damage, P, null, def_zone, "the [P.name]") var/shield_check = check_shields(P.damage, P, null, def_zone, "the [P.name]")
if(shield_check) if(shield_check) // If the block roll succeeded, this is true.
if(shield_check < 0) if(shield_check < 0) // The shield did something weird and the bullet needs to keep doing things (e.g. it was reflected).
return shield_check return shield_check // Likely equal to PROJECTILE_FORCE_MISS or PROJECTILE_CONTINUE.
else else // Otherwise we blocked normally and stopped all the damage.
P.on_hit(src, 2, def_zone) return 0
return 2
//Shrapnel //Shrapnel
if(P.can_embed()) if(P.can_embed())