diff --git a/code/datums/uplink/medical_vr.dm b/code/datums/uplink/medical_vr.dm index cb6c9e62312..17a3ddf33a1 100644 --- a/code/datums/uplink/medical_vr.dm +++ b/code/datums/uplink/medical_vr.dm @@ -1,6 +1,26 @@ /********** * Medical * **********/ +/datum/uplink_item/item/medical/fire + name = "Fire medical kit" + item_cost = 10 + path = /obj/item/weapon/storage/firstaid/fire + +/datum/uplink_item/item/medical/toxin + name = "Toxin medical kit" + item_cost = 10 + path = /obj/item/weapon/storage/firstaid/toxin + +/datum/uplink_item/item/medical/o2 + name = "Oxygen medical kit" + item_cost = 10 + path = /obj/item/weapon/storage/firstaid/o2 + +/datum/uplink_item/item/medical/adv + name = "Advanced medical kit" + item_cost = 10 + path = /obj/item/weapon/storage/firstaid/adv + /datum/uplink_item/item/medical/mre name = "Meal, Ready to eat (Random)" item_cost = 5 @@ -26,6 +46,11 @@ item_cost = 5 path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity +/datum/uplink_item/item/medical/pain + name = "Pain injector" + item_cost = 5 + path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/pain + /datum/uplink_item/item/medical/brute name = "Brute injector" item_cost = 5 @@ -46,6 +71,11 @@ item_cost = 5 path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/oxy +/datum/uplink_item/item/medical/organ + name = "Organ Repair injector" + item_cost = 10 + path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ + /datum/uplink_item/item/medical/nanites name = "Healing Nanite pill bottle" item_cost = 30 diff --git a/code/datums/uplink/tools_vr.dm b/code/datums/uplink/tools_vr.dm index 5a165f7aacc..34794c5cdf6 100644 --- a/code/datums/uplink/tools_vr.dm +++ b/code/datums/uplink/tools_vr.dm @@ -26,6 +26,11 @@ item_cost = 20 path = /obj/item/modular_computer/laptop/preset/custom_loadout/elite +/datum/uplink_item/item/tools/inducer + name = "Inducer" + item_cost = 20 + path = /obj/item/weapon/inducer/syndicate + /datum/uplink_item/item/tools/luxurycapsule name = "Survival Capsule (Luxury)" item_cost = 40 @@ -36,6 +41,11 @@ item_cost = 40 path = /obj/item/device/perfect_tele +/datum/uplink_item/item/tools/uav + name = "Recon Skimmer" + item_cost = 40 + path = /obj/item/device/uav + /datum/uplink_item/item/tools/barcapsule name = "Survival Capsule (Bar)" item_cost = 80 diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index 5db091ac833..75789017348 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -1,6 +1,5 @@ some~user - Species -911earlyarther - Xenomorph Hybrid admiraldragon - Vox aetherelemental - Daemon arandomalien - Xenochimera @@ -9,9 +8,7 @@ aruis - Diona aruis - Xenochimera amarewolf - Xenochimera azmodan412 - Xenochimera -azmodan412 - Xenomorph Hybrid bothnevarbackwards - Diona -cameron653 - Xenomorph Hybrid crossexonar - Protean chillyfang - Black-Eyed Shadekin flaktual - Vox @@ -21,7 +18,6 @@ hollifex - Diona inuzari - Diona jademanique - Xenochimera jemli - Gutter -killerdragn - Xenomorph Hybrid ktccd - Diona mewchild - Diona mewchild - Vox @@ -32,14 +28,12 @@ paradoxspace - Xenochimera rapidvalj - Vox rapidvalj - Common Skrellian rapidvalj - High Skrellian -rikaru19xjenkins - Xenomorph Hybrid rikaru19xjenkins - Xenochimera rixunie - Diona rixunie - Gutter rykkastormheart - Xenochimera seiga - Vox sepulchre - Vox -sepulchre - Xenomorph Hybrid silvertalismen - Diona silvertalismen - Vox silvertalismen - Xenochimera @@ -49,12 +43,8 @@ tastypred - Xenochimera timidvi - Diona varonis - Xenochimera verkister - Xenochimera -westfire - Xenomorph Hybrid wickedtemp - Shadekin Empathy -wtfismyname - Xenomorph Hybrid xioen - Diona xioen - Xenochimera -xioen - Xenomorph Hybrid zalvine - Shadekin Empathy zammyman215 - Vox -zekesturm - Xenomorph Hybrid diff --git a/maps/tether/submaps/om_ships/shelter_6.dmm b/maps/tether/submaps/om_ships/shelter_6.dmm index 5d92740312d..e80de136a1c 100644 --- a/maps/tether/submaps/om_ships/shelter_6.dmm +++ b/maps/tether/submaps/om_ships/shelter_6.dmm @@ -1431,6 +1431,12 @@ dir = 9 }, /obj/item/weapon/inducer/hybrid, +/obj/item/weapon/cell/device/weapon/recharge/alien/hybrid, +/obj/item/weapon/cell/device/weapon/recharge/alien/hybrid, +/obj/item/weapon/cell/device/weapon/recharge/alien/hybrid, +/obj/item/weapon/cell/device/weapon/recharge/alien/hybrid, +/obj/item/weapon/circuitboard/machine/abductor/core/hybrid, +/obj/item/weapon/circuitboard/machine/abductor/core/hybrid, /turf/simulated/floor/tiled/techmaint, /area/shuttle/tabiranth) "bk" = (