diff --git a/code/modules/modular_computers/computers/subtypes/dev_exonet_connection_system.dm b/code/modules/modular_computers/computers/subtypes/dev_exonet_connection_system.dm index d6ee397acc..b56ddd99df 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_exonet_connection_system.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_exonet_connection_system.dm @@ -19,16 +19,17 @@ /obj/item/modular_computer/ecs/first name = "exonet connection system." hardware_flag = PROGRAM_TABLET - desc = "A cirquit with some ports and wires. Looks like it's for a first generation IPC" + desc = "A simple circuit with some ports and wires." /obj/item/modular_computer/ecs/second name = "exonet connection system." hardware_flag = PROGRAM_TABLET - desc = "A cirquit with some ports and wires. Looks like it's for a second generation IPC" + desc = "A complex circuit with some ports and wires." + /obj/item/modular_computer/ecs/third name = "exonet connection system." hardware_flag = PROGRAM_LAPTOP - desc = "A cirquit with some ports and wires. Looks like it's for a third generation IPC" + desc = "An extremely complex circuit with some ports and wires." /obj/item/modular_computer/ecs/first/install_default_hardware() ..() diff --git a/code/modules/organs/internal/species/ipc.dm b/code/modules/organs/internal/species/ipc.dm index fd68beafc7..b7cd11b53c 100644 --- a/code/modules/organs/internal/species/ipc.dm +++ b/code/modules/organs/internal/species/ipc.dm @@ -363,10 +363,10 @@ if(do_after(user, 120, src)) new /obj/item/organ/internal/shackles (loc) src.unshackle() - to_chat(user, "You succsesfully remove shackles from the positronic brain.") + to_chat(user, "You succesfully remove shackles from the positronic brain.") else src.damage += 45 - to_chat(user, "Your hand slips while removing the shackles and severely damaged the positronic brain.") + to_chat(user, SPAN_WARNING("Your hand slips while removing the shackles severely damaging the positronic brain.")) else to_chat(user, "You have no idea how to do that!.") @@ -391,7 +391,7 @@ if(istype(C)) if(user.skill_check(SKILL_DEVICES, SKILL_PROF)) if(C.type == /obj/item/organ/internal/posibrain/ipc/third) - to_chat(user, "This posibrain generattion cannot support shackle module.") + to_chat(user, "This posibrain generation can not support shackle module.") return if(!newFreeFormLaw) to_chat(user, "No law detected on shackle module, please create one.") @@ -404,6 +404,9 @@ C.shackle(get_lawset()) to_chat(user, "You have successfully installed the shackles.") qdel(src) + else + C.damage += 40 + to_chat(user, SPAN_WARNING("You have damaged the positronic brain")) else to_chat(user, "You have no idea how to do that!") diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index a6117f1920..5ec4b05427 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -268,6 +268,9 @@ if(implant.organ_tag == O.organ_tag) to_chat(user, SPAN_WARNING("\The [target] already has [o_a][O.name].")) return + if(O.type == /obj/item/organ/internal/posibrain) + to_chat(user, SPAN_WARNING("There's no place in [target] to fit \the [O.organ_tag].")) + return if(O.organ_tag == BP_POSIBRAIN && !target.species.has_organ[BP_POSIBRAIN]) to_chat(user, SPAN_WARNING("There's no place in [target] to fit \the [O.organ_tag].")) else if(O.damage > (O.max_damage * 0.75)) diff --git a/infinity/code/modules/mob/living/carbon/human/machine_limb_functions.dm b/infinity/code/modules/mob/living/carbon/human/machine_limb_functions.dm index adf9aa219b..8ff9a5bbf3 100644 --- a/infinity/code/modules/mob/living/carbon/human/machine_limb_functions.dm +++ b/infinity/code/modules/mob/living/carbon/human/machine_limb_functions.dm @@ -102,8 +102,11 @@ if(stat) return - if(R.is_stump() || R.is_broken() || !R) + if(!R) + return + if(R.is_stump() || R.is_broken()) return + if(robohead.is_monitor) var/list/all_fhairs = typesof(/datum/sprite_accessory/facial_hair/ipc) - /datum/sprite_accessory/facial_hair/ipc var/list/fhairs = list() @@ -165,8 +168,9 @@ var/datum/robolimb/robohead = all_robolimbs[R.model] if(stat) return - - if(R.is_stump() || R.is_broken() || !R) + if(!R) + return + if(R.is_stump() || R.is_broken()) return if(robohead.is_monitor) f_style = "Off" @@ -182,7 +186,9 @@ var/obj/item/organ/external/head/R = src.get_organ(BP_HEAD) var/obj/item/organ/internal/ecs/enter = src.internal_organs_by_name[BP_EXONET] - if(R.is_stump() || R.is_broken() || !R) + if(!R) + return + if(R.is_stump() || R.is_broken()) return if(!enter) to_chat(usr, "You have no exonet connection port") @@ -199,7 +205,9 @@ var/obj/item/organ/internal/ecs/enter = src.internal_organs_by_name[BP_EXONET] var/datum/robolimb/robohead = all_robolimbs[R.model] - if(R.is_stump() || R.is_broken() || !R) + if(!R) + return + if(R.is_stump() || R.is_broken()) return if(!enter)