diff --git a/code/modules/surgery/organs/autosurgeon.dm b/code/modules/surgery/organs/autosurgeon.dm index 96b3179df780..e073aa74359b 100644 --- a/code/modules/surgery/organs/autosurgeon.dm +++ b/code/modules/surgery/organs/autosurgeon.dm @@ -94,6 +94,12 @@ /obj/item/autosurgeon/reviver starting_organ = /obj/item/organ/cyberimp/chest/reviver - + /obj/item/autosurgeon/medibeam starting_organ = /obj/item/organ/cyberimp/arm/medibeam + +///obj/item/autosurgeon/hivenode //Yogs Start: put this here as putting it in a copy put in the yougs folder will caue it to be loaded too late +// starting_organ = /obj/item/organ/alien/hivenode //disabled as it is ony used for /obj/item/storage/box/syndie_kit/xeno_infestation_kit, which is disabled too. Obviosly uncomment this if you want to use the other, or delete this if delete xeno_infestation_kit + +/obj/item/autosurgeon/plasmavessel //Just an autosurgeon with a plasma vessel in it, used in /obj/item/storage/box/syndie_kit/xeno_organ_kit + starting_organ = /obj/item/organ/alien/plasmavessel //Yogs End diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 23f7e0696197..5bb6c624bb2c 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1805,7 +1805,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) name = "Arm Mounted Medical Beamgun" desc = "An arm mounted medical beamgun to heal your best buds (disclaimer: does not come with friends)." item = /obj/item/autosurgeon/medibeam - restricted_roles = list("Medical Doctor", "Chief Medical Officer") + restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Paramedic", "Mining Medic") //yogs cost = 8 manufacturer = /datum/corporation/traitor/cybersun @@ -1842,7 +1842,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) desc = "A disk containing the procedure to perform a brainwashing surgery, allowing you to implant an objective onto a target. \ Insert into an Operating Console to enable the procedure." item = /obj/item/disk/surgery/brainwashing - restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Roboticist") + restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Roboticist", "Mining Medic") //yogs cost = 5 manufacturer = /datum/corporation/traitor/cybersun @@ -1950,7 +1950,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 5 //you need two for full damage, so total of 10 for maximum damage manufacturer = /datum/corporation/traitor/donkco // Unless you're donk co, then it's 8 limited_stock = 2 //you can't use more than two! - restricted_roles = list("Shaft Miner") + restricted_roles = list("Shaft Miner", "Mining Medic") //yogs /datum/uplink_item/role_restricted/magillitis_serum name = "Magillitis Serum Autoinjector" diff --git a/yogstation/code/game/objects/items/storage/uplink_kits.dm b/yogstation/code/game/objects/items/storage/uplink_kits.dm index 8156ef25b122..b1e3c236ac38 100644 --- a/yogstation/code/game/objects/items/storage/uplink_kits.dm +++ b/yogstation/code/game/objects/items/storage/uplink_kits.dm @@ -22,3 +22,22 @@ /obj/item/storage/box/syndie_kit/imp_greytide/PopulateContents() new /obj/item/implanter/greytide(src) + +///obj/item/storage/box/syndie_kit/xeno_infestation_kit //disabled as creating a xenomorph infestation is not very helpful, but left it in here incase you want to add it +// name = "Xenomorph Infestation Starter Kit" +// +///obj/item/storage/box/syndie_kit/xeno_infestation_kit/PopulateContents() +// new /obj/item/autosurgeon/hivenode(src) +// for(var/i in 1 to 3) +// new /obj/item/organ/body_egg/alien_embryo(src) + +/obj/item/storage/box/syndie_kit/xeno_organ_kit //Just a kit with some basic xeno organs in it and an autosurgeon, as they are kinda rare and cool + name = "Xenomorph Organ Kit" + +/obj/item/storage/box/syndie_kit/xeno_organ_kit/PopulateContents() + new /obj/item/autosurgeon/plasmavessel(src) + new /obj/item/organ/alien/resinspinner(src) + new /obj/item/organ/alien/neurotoxin(src) + new /obj/item/organ/alien/acid(src) + //new /obj/item/organ/alien/hivenode(src) //disabled as a hive node is fairly pointless if you arent dealing with xenos have an egg sac, or know someone else with one. + //new /obj/item/organ/alien/eggsac(src) //disabled as an egg sac is not very helpful for a traitor and can ruin some rounds... *ahem* diff --git a/yogstation/code/modules/uplink/uplink_item.dm b/yogstation/code/modules/uplink/uplink_item.dm index bb8cea1c4a70..0edd926fcc40 100644 --- a/yogstation/code/modules/uplink/uplink_item.dm +++ b/yogstation/code/modules/uplink/uplink_item.dm @@ -3,7 +3,7 @@ var/list/exclude_objectives = list() //objectives to disallow the buyer from buying this item var/surplus_nullcrates -/datum/uplink_item/New() +/datum/uplink_item/New() . = ..() if(isnull(surplus_nullcrates)) surplus_nullcrates = surplus @@ -70,7 +70,7 @@ cost = 5 surplus = 0 exclude_modes = list(/datum/game_mode/nuclear) - + /datum/uplink_item/device_tools/arm/nuke cost = 15 exclude_modes = list() @@ -81,6 +81,20 @@ user.change_number_of_hands(limbs+1) to_chat(user, "You feel more dexterous") +///datum/uplink_item/race_restricted/xeno_infestation_kit //Disabled as creating a xeno infestation is not very helpful, bit left it in here in case you want it +// name = "Xenomorph Infestation Starter Kit" +// desc = "A kit containing the basics for starting a xenomorph infestation. Contains a hivenode, autosurgen, and three alien embryos. Does not include hosts." +// cost = 5 +// item = /obj/item/storage/box/syndie_kit/xeno_infestation_kit +// restricted_species = list("polysmorph") + +/datum/uplink_item/race_restricted/xeno_organ_kit + name = "Xenomorph Organ Kit" + desc = "A kit containing the some organs that were... \"donated\" by your ancestors. Contains a autosurgen, plasma vessel, resin spinner, an acid gland, and a neurotoxin gland." + cost = 15 //Price might not be ballenced as I am not too familiar with tator uplink stuff, feedback would be nice + item = /obj/item/storage/box/syndie_kit/xeno_organ_kit + restricted_species = list("polysmorph") + /datum/uplink_item/role_restricted/gondola_meat name = "Gondola meat" desc = "A slice of gondola meat will turn any hard-working, brainwashed NT employee into a goody-two-shoes gondola in a matter of minutes."