Merge pull request #12950 from phil235/AIMechStunFix

Fixes flashbanged mmis in mechs losing access to most mech functions
This commit is contained in:
duncathan salt
2015-11-11 16:34:24 -06:00
5 changed files with 21 additions and 4 deletions
+6
View File
@@ -53,6 +53,12 @@
waterlevel = maxwater
nutrilevel = 3
/obj/machinery/hydroponics/Destroy()
if(myseed)
qdel(myseed)
myseed = null
return ..()
/obj/machinery/hydroponics/constructable/attackby(obj/item/I, mob/user, params)
if(default_deconstruction_screwdriver(user, "hydrotray3", "hydrotray3", I))
return
@@ -38,3 +38,9 @@
/mob/living/carbon/brain/UnarmedAttack(atom/A)//Stops runtimes due to attack_animal being the default
return
/mob/living/carbon/brain/check_ear_prot()
return 1
/mob/living/carbon/brain/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0)
return // no eyes, no flashing
@@ -469,6 +469,9 @@
if(affect_silicon)
return ..()
/mob/living/silicon/check_ear_prot()
return 1
/mob/living/silicon/update_transform()
var/matrix/ntransform = matrix(transform) //aka transform.Copy()
var/changed = 0
@@ -46,7 +46,8 @@
reac_volume = ..()
M.apply_damage(0.6*reac_volume, TOX)
M.hallucination += 0.6*reac_volume
M.reagents.add_reagent("spore", 0.4*reac_volume)
if(M.reagents)
M.reagents.add_reagent("spore", 0.4*reac_volume)
/datum/reagent/blob/lexorin_jelly //does tons of oxygen damage and a little brute
name = "Lexorin Jelly"
@@ -82,7 +83,8 @@
reac_volume = ..()
M.apply_damage(0.4*reac_volume, BURN)
M.adjustStaminaLoss(0.4*reac_volume)
M.reagents.add_reagent("frostoil", 0.4*reac_volume)
if(M.reagents)
M.reagents.add_reagent("frostoil", 0.4*reac_volume)
/datum/reagent/blob/dark_matter //does brute damage and throws or pulls nearby objects at the target
name = "Dark Matter"