From 83a688ca4e57f2ebe4183a43a5fe5c3affa16680 Mon Sep 17 00:00:00 2001 From: LordFowl Date: Sat, 7 Jan 2017 16:50:33 -0500 Subject: [PATCH] Fixes #1418 #1420 and #1431 (#1443) Fixes #1418 Fixes #1420 Fixes #1431 --- code/_onclick/hud/screen_objects.dm | 1 - code/game/objects/items/devices/flash.dm | 6 +++--- .../items/weapons/grenades/flashbang.dm | 2 +- .../living/carbon/human/species/species.dm | 2 +- code/modules/organs/organ_external.dm | 4 ++-- code/modules/power/power.dm | 2 +- icons/mob/human_races/robotic.dmi | Bin 1746 -> 1743 bytes 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 76eda425996..251623607fb 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -351,7 +351,6 @@ if ("phoron") if(t.air_contents.gas["phoron"] && !t.air_contents.gas["nitrogen"]) contents.Add(t.air_contents.gas["phoron"]) - world << "Phoron check." else contents.Add(0) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 909e5f7211c..732b49a8f3e 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -82,7 +82,7 @@ flick("e_flash", M.flash) //Vaurca damage 15/01/16 var/mob/living/carbon/human/H = M - if(H.species.name == "Vaurca") + if(H.species.get_bodytype() == "Vaurca") var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"] if(!E) return @@ -154,9 +154,9 @@ /obj/item/device/flash/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) if(!user || !clown_check(user)) return - + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - + if(broken) user.show_message("The [src.name] is broken", 2) return diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 4f7d0316fb4..d6c27db66ee 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -55,7 +55,7 @@ M.Weaken(10) //Vaurca damage 15/01/16 var/mob/living/carbon/human/H = M - if(H.species.name == "Vaurca") + if(H.species.get_bodytype() == "Vaurca") var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"] if(!E) return diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 16650543c76..a779cfc5ad8 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -282,7 +282,7 @@ for(var/obj/item/organ/I in H.internal_organs) I.robotize() - if(H.species && H.species.name == "Vaurca") + if(H.species && H.species.get_bodytype() == "Vaurca") for (var/obj/item/organ/external/E in H.organs) if ((E.status & ORGAN_CUT_AWAY) || (E.status & ORGAN_DESTROYED)) continue diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 37741398f2b..33d5410e0fd 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -936,8 +936,8 @@ Note that amputating the affected organ does in fact remove the infection from t if(company) model = company var/datum/robolimb/R = all_robolimbs[company] - if(species && !(species.name in R.species_can_use)) - R = basic_robolimb + /*if(species && !(species.name in R.species_can_use && species.get_bodytype() != "Machine")) + R = basic_robolimb*/ if(R) force_icon = R.icon name = "[R.company] [initial(name)]" diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 73daf815c69..e3a90e4e369 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -322,7 +322,7 @@ var/mob/living/carbon/human/H = null if (ishuman(M)) H = M //20/1/16 Insulation (vaurca) - if(H.species.name == "Vaurca") return 0 + if(H.species.get_bodytype() == "Vaurca") return 0 var/area/source_area if(istype(power_source,/area)) source_area = power_source diff --git a/icons/mob/human_races/robotic.dmi b/icons/mob/human_races/robotic.dmi index 94c4e20aac1879113cd55513459849fe3f0ff79b..c5b2dae83668355e8a8bfdd6edd84894daf9caf7 100644 GIT binary patch delta 1419 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