cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-20 10:37:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3255 from VOREStation/aro-robocheck

Browse Source 
Fix incorrect robolimb checks
This commit is contained in:
Aronai Sieyes
2018-03-16 20:34:10 -04:00
committed by GitHub
parent b02773a71e 0c2c029537
commit 1e87a06292
7 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/bot/farmbot.dm
+1 -1
View File
@@ -343,7 +343,7 @@
new /obj/item/weapon/farmbot_arm_assembly(loc, src)
/obj/structure/reagent_dispensers/watertank/attackby(var/obj/item/organ/external/S, mob/user as mob)
if ((!istype(S, /obj/item/organ/external/arm)) || (!S.robotic == ORGAN_ROBOT))
if ((!istype(S, /obj/item/organ/external/arm)) || S.robotic != ORGAN_ROBOT)
..()
return
code/modules/mob/living/bot/medbot.dm
+1 -1
View File
@@ -333,7 +333,7 @@
qdel(src)
/obj/item/weapon/storage/firstaid/attackby(var/obj/item/organ/external/S, mob/user as mob)
if (!istype(S, /obj/item/organ/external/arm) || !(S.robotic == ORGAN_ROBOT))
if (!istype(S, /obj/item/organ/external/arm) || S.robotic != ORGAN_ROBOT)
..()
return
code/modules/mob/living/carbon/human/human.dm
+4 -1
View File
@@ -1291,9 +1291,12 @@
if(!affecting)
. = 0
fail_msg = "They are missing that limb."
else if (affecting.robotic >= ORGAN_ROBOT)
else if (affecting.robotic == ORGAN_ROBOT)
. = 0
fail_msg = "That limb is robotic."
else if (affecting.robotic >= ORGAN_LIFELIKE)
. = 0
fail_msg = "Your needle refuses to penetrate more than a short distance..."
else
switch(target_zone)
if(BP_HEAD)
code/modules/mob/living/carbon/human/human_defense.dm
+1 -1
View File
@@ -341,7 +341,7 @@ emp_act
/mob/living/carbon/human/emag_act(var/remaining_charges, mob/user, var/emag_source)
var/obj/item/organ/external/affecting = get_organ(user.zone_sel.selecting)
if(!affecting || !(affecting.status & ORGAN_ROBOT))
if(!affecting || !(affecting.robotic >= ORGAN_ROBOT))
user << "<span class='warning'>That limb isn't robotic.</span>"
return -1
if(affecting.sabotaged)
code/modules/virus2/effect.dm
+2 -2
View File
@@ -190,7 +190,7 @@
var/mob/living/carbon/human/H = mob
var/organ = pick(list("heart","kidney","liver", "lungs"))
var/obj/item/organ/internal/O = H.organs_by_name[organ]
if (!(O.robotic = ORGAN_ROBOT))
if (O.robotic != ORGAN_ROBOT)
O.damage += (5*multiplier)
H << "<span class='notice'>You feel a cramp in your guts.</span>"
@@ -370,7 +370,7 @@
var/mob/living/carbon/human/H = mob
var/obj/item/organ/internal/O = H.organs_by_name
for (var/organ in H.organs_by_name)
if (!(O.robotic = ORGAN_ROBOT))
if (O.robotic != ORGAN_ROBOT)
O.rejecting = 0