VOREStation Specific Merge Changes

* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
This commit is contained in:
Leshana
2018-02-17 16:56:31 -05:00
parent 5edfc7516b
commit ef3df27528
12 changed files with 18 additions and 27 deletions
+4 -2
View File
@@ -95,5 +95,7 @@
return -1
/obj/item/organ/internal/eyes/emp_act(severity)
..() //Returns if the organ isn't robotic
owner.eye_blurry += (4/severity)
// ..() //Returns if the organ isn't robotic // VOREStation Edit - Don't take damage
if(!(robotic >= ORGAN_ASSISTED))
return
owner.eye_blurry += (4/severity)
@@ -1,11 +0,0 @@
/obj/item/organ/internal/eyes/emp_act(severity)
if(!(robotic >= ORGAN_ASSISTED))
return
owner.eye_blurry += (4/severity)
/obj/item/organ/internal/cell/emp_act(severity)
owner.nutrition = max(0, owner.nutrition - rand(10/severity, 50/severity))
/obj/item/organ/internal/mmi_holder/emp_act(severity)
owner.adjustToxLoss(rand(6/severity, 12/severity))
+2 -2
View File
@@ -18,7 +18,7 @@
owner.visible_message("<span class='danger'>\The [owner] twitches visibly!</span>")
/obj/item/organ/internal/cell/emp_act(severity)
..()
// ..() // VOREStation Edit - Don't take damage
owner.nutrition = max(0, owner.nutrition - rand(10/severity, 50/severity))
// Used for an MMI or posibrain being installed into a human.
@@ -88,7 +88,7 @@
qdel(src)
/obj/item/organ/internal/mmi_holder/emp_act(severity)
..()
// ..() // VOREStation Edit - Don't take damage
owner.adjustToxLoss(rand(6/severity, 12/severity))
/obj/item/organ/internal/mmi_holder/posibrain