Merge pull request #21359 from phil235/WindowExplosionBlockFix

reinforced window and telehulk bugfixes
This commit is contained in:
Joan Lung
2016-11-05 19:33:15 -04:00
committed by GitHub
5 changed files with 6 additions and 17 deletions
+1 -1
View File
@@ -20,7 +20,7 @@
var/override = 0
for(var/datum/mutation/human/HM in dna.mutations)
override += HM.on_attack_hand(src, A)
override += HM.on_attack_hand(src, A, proximity)
if(override)
return
+4 -3
View File
@@ -79,7 +79,7 @@
/datum/mutation/human/proc/get_visual_indicator(mob/living/carbon/human/owner)
return
/datum/mutation/human/proc/on_attack_hand(mob/living/carbon/human/owner, atom/target)
/datum/mutation/human/proc/on_attack_hand(mob/living/carbon/human/owner, atom/target, proximity)
return
/datum/mutation/human/proc/on_ranged_attack(mob/living/carbon/human/owner, atom/target)
@@ -130,8 +130,9 @@
owner.status_flags &= ~status
owner.update_body_parts()
/datum/mutation/human/hulk/on_attack_hand(mob/living/carbon/human/owner, atom/target)
return target.attack_hulk(owner)
/datum/mutation/human/hulk/on_attack_hand(mob/living/carbon/human/owner, atom/target, proximity)
if(proximity) //no telekinetic hulk attack
return target.attack_hulk(owner)
/datum/mutation/human/hulk/on_life(mob/living/carbon/human/owner)
if(owner.health < 0)
@@ -71,9 +71,6 @@
else
..()
/obj/structure/table/attack_tk() // no telehulk sorry
return
/obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0)
if(height==0)
return 1
@@ -453,9 +450,6 @@
take_damage(rand(4,8), BRUTE, "melee", 1)
/obj/structure/rack/attack_tk() // no telehulk sorry
return
/obj/structure/rack/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
switch(damage_type)
if(BRUTE)
+1 -4
View File
@@ -285,6 +285,7 @@
var/atom/A = V
if(A.level >= affecting_level)
A.ex_act(severity, target)
CHECK_TICK
/turf/ratvar_act(force)
. = (prob(40) || force)
@@ -376,8 +377,4 @@
T.setDir(dir)
return T
/turf/contents_explosion(severity, target)
for(var/atom/A in contents)
A.ex_act(severity, target)
CHECK_TICK
-3
View File
@@ -116,9 +116,6 @@ By design, d1 is the smallest direction and d2 is the highest
else
icon_state = "[d1]-[d2]"
//Telekinesis has no effect on a cable
/obj/structure/cable/attack_tk(mob/user)
return
// Items usable on a cable :
// - Wirecutters : cut it duh !