diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index 99541008be4..eb38ca88ceb 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -121,7 +121,7 @@ /obj/item/weapon/antag_spawner/borg_tele name = "syndicate cyborg teleporter" - desc = "A single-use teleporter used to deploy a Syndicate cyborg on the field." + desc = "A single-use teleporter designed to deploy a single Syndicate cyborg onto the field." icon = 'icons/obj/device.dmi' icon_state = "locator" var/TC_cost = 0 @@ -130,8 +130,11 @@ /obj/item/weapon/antag_spawner/borg_tele/attack_self(mob/user) if(used) - user << "The teleporter is out of power." + user << "The teleporter's power has been expended."." return + if(!user.mind in ticker.mode.syndicates) + user << "AUTHENTICATION FAILURE. ACCESS DENIED." + return 0 borg_to_spawn = input("What type?", "Cyborg Type", type) as null|anything in possible_types if(!borg_to_spawn) return @@ -141,7 +144,7 @@ var/client/C = pick(borg_candicates) spawn_antag(C, get_turf(src.loc), "syndieborg") else - user << "Unable to connect to Syndicate Command. Please wait and try again later or use the teleporter on your uplink to get your points refunded." + user << "Unable to connect to Syndicate command. Please wait and try again later or use the teleporter on your uplink to get your points refunded." /obj/item/weapon/antag_spawner/borg_tele/spawn_antag(client/C, turf/T, type = "") if(!borg_to_spawn) //If there's no type at all, let it still be used but don't do anything diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 4ed579e1a7f..e22e919cd55 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -112,7 +112,7 @@ /obj/item/weapon/melee/energy/sword/cyborg/saw //Used by medical Syndicate cyborgs name = "energy saw" - desc = "For heavy duty cutting. It has a carbon-fiber blade and an energy capacitor that can be toggled to make it more powerful." + desc = "For heavy duty cutting. It has a carbon-fiber blade in addition to a toggleable hard-light edge to dramatically increase sharpness." icon_state = "esaw" force_on = 30 force = 18 //About as much as a spear @@ -121,13 +121,14 @@ icon = 'icons/obj/surgery.dmi' icon_state = "esaw_0" icon_state_on = "esaw_1" - hitcost = 75 //Costs more because it's not intended to be a murderbone weapon + hitcost = 75 //Costs more than a standard cyborg esword item_color = null w_class = 3 sharpness = IS_SHARP /obj/item/weapon/melee/energy/sword/cyborg/saw/New() ..() + icon_state = "esaw_0" item_color = null /obj/item/weapon/melee/energy/sword/cyborg/saw/IsShield() diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index d4cf25c2e3f..7d5acd2960c 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1123,23 +1123,23 @@ radio = new /obj/item/device/radio/borg/syndicate(src) module = new /obj/item/weapon/robot_module/syndicate(src) laws = new /datum/ai_laws/syndicate_override() + spawn(5) + if(playstyle_string) + src << playstyle_string /mob/living/silicon/robot/syndicate/medical icon_state = "syndi-medi" designation = "Syndicate Medical" playstyle_string = "You are a Syndicate medical cyborg!
\ You are armed with powerful medical tools to aid you in your mission: help the operatives secure the nuclear authentication disk. \ - Your hypospray will produce Restorative Nanites, a wonder-drug that will heal most types of bodily damages, including clone and brain damage. It also produces morphine for offense. \ + Your synthesizer will produce Restorative Nanites, a wonder-drug that will heal most types of bodily damages, including clone and brain damage. It also produces morphine for offense. \ Your defibrillator paddles can revive operatives through their hardsuits, or can be used on harm intent to shock enemies! \ Your energy saw functions as a circular saw, but can be activated to deal more damage, and your operative pinpointer will find and locate fellow nuclear operatives. \ Help the operatives secure the disk at all costs!" -/mob/living/silicon/robot/syndicate/New(loc) +/mob/living/silicon/robot/syndicate/medical/New(loc) ..() module = new /obj/item/weapon/robot_module/syndicate_medical(src) - spawn(5) - if(playstyle_string) - src << playstyle_string /mob/living/silicon/robot/proc/notify_ai(notifytype, oldname, newname) if(!connected_ai) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 4073292af07..597a3514ba9 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -278,6 +278,7 @@ modules += new /obj/item/weapon/scalpel(src) modules += new /obj/item/weapon/melee/energy/sword/cyborg/saw(src) //Energy saw -- primary weapon modules += new /obj/item/roller/robo(src) + modules += new /obj/item/weapon/card/emag(src) modules += new /obj/item/weapon/tank/jetpack/carbondioxide(src) modules += new /obj/item/weapon/crowbar(src) modules += new /obj/item/weapon/pinpointer/operative(src) diff --git a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm index 43c4effc01f..6253c02ff83 100644 --- a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm @@ -914,16 +914,16 @@ datum/reagent/medicine/tricordrazine/overdose_process(mob/living/M) datum/reagent/medicine/syndicate_nanites //Used exclusively by Syndicate medical cyborgs name = "Restorative Nanites" id = "syndicate_nanites" - description = "Miniature medical robots that swiftly restore bodily damage." + description = "Miniature medical robots that swiftly restore bodily damage. May begin to attack their host's cells in high amounts." reagent_state = SOLID color = "#555555" datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/M) - M.adjustBruteLoss(-2*REM) - M.adjustFireLoss(-2*REM) - M.adjustOxyLoss(-2*REM) - M.adjustToxLoss(-2*REM) - M.adjustBrainLoss(-5*REM) - M.adjustCloneLoss(-1*REM) + M.adjustBruteLoss(-5*REM) //A ton of healing - this is a 50 telecrystal investment. + M.adjustFireLoss(-5*REM) + M.adjustOxyLoss(-15*REM) + M.adjustToxLoss(-5*REM) + M.adjustBrainLoss(-15*REM) + M.adjustCloneLoss(-3*REM) ..() return diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 51e5e9e8756..171aa224a3c 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -55,7 +55,7 @@ Borg Hypospray //update_icon() return 1 -// Purely for testing purposes I swear~ +// Purely for testing purposes I swear~ //don't lie to me /* /obj/item/weapon/reagent_containers/borghypo/verb/add_cyanide() set src in world @@ -128,7 +128,7 @@ Borg Hypospray /obj/item/weapon/reagent_containers/borghypo/syndicate name = "syndicate cyborg hypospray" - desc = "A modified hypospray that generates reagents more quickly and consumes less power." + desc = "An experimental piece of Syndicate technology used to produce powerful restorative nanites used to very quickly restore injuries of all types. Also metabolizes potassium iodide, for radiation poisoning, and morphine, for offense." icon_state = "borghypo_s" charge_cost = 20 recharge_time = 2 @@ -149,7 +149,7 @@ Borg Shaker reagent_ids = list("beer", "orangejuice", "limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale") /obj/item/weapon/reagent_containers/borghypo/borgshaker/attack(mob/M, mob/user) - return //Can't inject stuff with a shaker, can we? + return //Can't inject stuff with a shaker, can we? //not with that attitude /obj/item/weapon/reagent_containers/borghypo/borgshaker/regenerate_reagents() if(isrobot(src.loc))