diff --git a/code/datums/uplink/ammunition_vr.dm b/code/datums/uplink/ammunition_vr.dm new file mode 100644 index 00000000000..3235bb7311f --- /dev/null +++ b/code/datums/uplink/ammunition_vr.dm @@ -0,0 +1,20 @@ +/************* +* Ammunition * +*************/ +/datum/uplink_item/item/ammo/cell + name = "Weapon cell" + +/datum/uplink_item/item/ammo/highcell + name = "High capacity cell" + path = /obj/item/weapon/cell/high + item_cost = 15 + +/datum/uplink_item/item/ammo/supercell + name = "Super capacity cell" + path = /obj/item/weapon/cell/super + item_cost = 30 + +/datum/uplink_item/item/ammo/voidcell + name = "Void cell" + path = /obj/item/weapon/cell/device/weapon/recharge/alien/hybrid + item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 1.5 diff --git a/code/datums/uplink/medical_vr.dm b/code/datums/uplink/medical_vr.dm index 17a3ddf33a1..8f0264d3e9d 100644 --- a/code/datums/uplink/medical_vr.dm +++ b/code/datums/uplink/medical_vr.dm @@ -1,25 +1,10 @@ /********** * 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/pizza + name = "Free Pizza Voucher" + item_cost = 5 + path = /obj/item/pizzavoucher /datum/uplink_item/item/medical/mre name = "Meal, Ready to eat (Random)" @@ -36,6 +21,11 @@ item_cost = 5 path = /obj/item/weapon/storage/mre/menu11 +/datum/uplink_item/item/medical/medical + name = "Meal, Ready to eat (medical)" + item_cost = 5 + path = /obj/item/weapon/storage/mre/menu13 + /datum/uplink_item/item/medical/glucose name = "Glucose injector" item_cost = 5 @@ -71,11 +61,41 @@ item_cost = 5 path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/oxy +/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/organ name = "Organ Repair injector" item_cost = 10 path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ +/datum/uplink_item/item/medical/stasis + name = "Stasis Bag" + item_cost = 20 + path = /obj/item/bodybag/cryobag + +/datum/uplink_item/item/medical/synth + name = "Synthmorph Bag" + item_cost = 20 + path = /obj/item/bodybag/cryobag/robobag + /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 34794c5cdf6..30b2cd725e0 100644 --- a/code/datums/uplink/tools_vr.dm +++ b/code/datums/uplink/tools_vr.dm @@ -1,6 +1,21 @@ /******************** * Devices and Tools * ********************/ +/datum/uplink_item/item/tools/oxygen + name = "Emergency Oxygen Tank" + item_cost = 2 + path = /obj/item/weapon/tank/emergency/oxygen/double + +/datum/uplink_item/item/tools/phoron + name = "Emergency Phoron Tank" + item_cost = 2 + path = /obj/item/weapon/tank/emergency/phoron/double + +/datum/uplink_item/item/tools/suitcooler + name = "Emergency Suit Cooler" + item_cost = 2 + path = /obj/item/device/suit_cooling_unit/emergency + /datum/uplink_item/item/tools/basiclaptop name = "Laptop (Basic)" item_cost = 5 @@ -16,6 +31,11 @@ item_cost = 10 path = /obj/item/stack/nanopaste/advanced +/datum/uplink_item/item/tools/autolok + name = "Autolok Voidsuit" + item_cost = 10 + path = /obj/item/clothing/suit/space/void/autolok + /datum/uplink_item/item/tools/elitetablet name = "Tablet (Advanced)" item_cost = 15 diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index 4c9ff8c2db0..744abb85d86 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -1,7 +1,7 @@ /obj/item/weapon/storage/backpack/saddlebag name = "Horse Saddlebags" desc = "A saddle that holds items. Seems slightly bulky." - icon = 'icons/obj/storage_vr.dmi' + icon = 'icons/obj/clothing/backpack_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' item_state = "saddlebag" icon_state = "saddlebag" @@ -33,7 +33,7 @@ /obj/item/weapon/storage/backpack/saddlebag_common //Shared bag for other taurs with sturdy backs name = "Taur Saddlebags" desc = "A saddle that holds items. Seems slightly bulky." - icon = 'icons/obj/storage_vr.dmi' + icon = 'icons/obj/clothing/backpack_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' item_state = "saddlebag" icon_state = "saddlebag" @@ -108,7 +108,7 @@ /obj/item/weapon/storage/backpack/saddlebag_common/robust //Shared bag for other taurs with sturdy backs name = "Robust Saddlebags" desc = "A saddle that holds items. Seems robust." - icon = 'icons/obj/storage_vr.dmi' + icon = 'icons/obj/clothing/backpack_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' item_state = "robustsaddle" icon_state = "robustsaddle" @@ -117,7 +117,7 @@ /obj/item/weapon/storage/backpack/saddlebag_common/vest //Shared bag for other taurs with sturdy backs name = "Taur Duty Vest" desc = "An armored vest with the armor modules replaced with various handy compartments with decent storage capacity. Useless for protection though." - icon = 'icons/obj/storage_vr.dmi' + icon = 'icons/obj/clothing/backpack_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' item_state = "taurvest" icon_state = "taurvest" @@ -141,49 +141,49 @@ /obj/item/weapon/storage/backpack/satchel/explorer name = "explorer satchel" desc = "A satchel for carrying a large number of supplies easily." - icon = 'icons/obj/storage_vr.dmi' + icon = 'icons/obj/clothing/backpack_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' item_state = "satchel-explorer" icon_state = "satchel-explorer" /obj/item/weapon/storage/backpack/explorer name = "explorer backpack" desc = "A backpack for carrying a large number of supplies easily." - icon = 'icons/obj/storage_vr.dmi' + icon = 'icons/obj/clothing/backpack_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' item_state = "explorerpack" icon_state = "explorerpack" /obj/item/weapon/storage/backpack/satchel/roboticist name = "roboticist satchel" desc = "A satchel for carrying a large number of spare parts easily." - icon = 'icons/obj/storage_vr.dmi' + icon = 'icons/obj/clothing/backpack_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' item_state = "satchel-robo" icon_state = "satchel-robo" /obj/item/weapon/storage/backpack/roboticist name = "roboticist backpack" desc = "A backpack for carrying a large number of spare parts easily." - icon = 'icons/obj/storage_vr.dmi' + icon = 'icons/obj/clothing/backpack_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' item_state = "backpack-robo" icon_state = "backpack-robo" /obj/item/weapon/storage/backpack/vietnam name = "vietnam backpack" desc = "There are tangos in the trees! We need napalm right now! Why is my gun jammed?" - icon = 'icons/obj/storage_vr.dmi' + icon = 'icons/obj/clothing/backpack_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' item_state = "nambackpack" icon_state = "nambackpack" /obj/item/weapon/storage/backpack/russian name = "russian backpack" desc = "Useful for carrying large quantities of vodka." - icon = 'icons/obj/storage_vr.dmi' + icon = 'icons/obj/clothing/backpack_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' item_state = "ru_rucksack" icon_state = "ru_rucksack" /obj/item/weapon/storage/backpack/korean name = "korean backpack" desc = "Insert witty description here." - icon = 'icons/obj/storage_vr.dmi' + icon = 'icons/obj/clothing/backpack_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' item_state = "kr_rucksack" icon_state = "kr_rucksack" diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index a838bf6c039..b9616b01b6d 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -102,7 +102,7 @@ /obj/item/weapon/tank/vox/Initialize() . = ..() - air_contents.adjust_gas("phoron", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) + air_contents.adjust_gas("phoron", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) //VOREStation Edit /obj/item/weapon/tank/phoron/pressurized name = "fuel can" diff --git a/code/game/objects/items/weapons/tanks/tank_types_vr.dm b/code/game/objects/items/weapons/tanks/tank_types_vr.dm index 73d094d0f97..68c18aebd25 100644 --- a/code/game/objects/items/weapons/tanks/tank_types_vr.dm +++ b/code/game/objects/items/weapons/tanks/tank_types_vr.dm @@ -85,6 +85,7 @@ icon_override = 'icons/mob/belt_vr.dmi' icon_state = "emergency_phoron_vox" gauge_icon = "indicator_smalltank" + volume = 6 gauge_cap = 3 /obj/item/weapon/tank/nitrogen diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index b8fca34a879..fb74ae2e072 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm @@ -214,6 +214,23 @@ starts_with = list( /obj/item/clothing/suit/space/void/autolok, - /obj/item/weapon/tank/emergency/oxygen/double, + /obj/item/weapon/tank/emergency/oxygen/engi, + /obj/item/device/suit_cooling_unit/emergency + ) + +/obj/structure/closet/emergsuit_wall + name = "emergency suit storage" + desc = "It's wall-mounted storage unit for an emergency suit." + icon = 'icons/obj/closets/bases/wall.dmi' + closet_appearance = /decl/closet_appearance/wall/emergency + anchored = 1 + density = 0 + wall_mounted = 1 + store_mobs = 0 + + starts_with = list( + /obj/item/clothing/head/helmet/space/emergency, + /obj/item/clothing/suit/space/emergency, + /obj/item/weapon/tank/emergency/oxygen/engi, /obj/item/device/suit_cooling_unit/emergency ) diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm index 4a1c8ea0b8d..56ba9234915 100644 --- a/code/modules/clothing/spacesuits/void/void_vr.dm +++ b/code/modules/clothing/spacesuits/void/void_vr.dm @@ -140,7 +140,7 @@ icon_state = "autoloksuit" item_state = "autoloksuit" armor = list(melee = 15, bullet = 5, laser = 5,energy = 5, bomb = 5, bio = 100, rad = 80) - slowdown = 0 + slowdown = 0.5 siemens_coefficient = 1 species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX) //this thing can autoadapt icon = 'icons/obj/clothing/suits_vr.dmi' diff --git a/icons/obj/clothing/backpack_vr.dmi b/icons/obj/clothing/backpack_vr.dmi index ecab5d00db3..3a376ae8e59 100644 Binary files a/icons/obj/clothing/backpack_vr.dmi and b/icons/obj/clothing/backpack_vr.dmi differ diff --git a/icons/obj/storage_vr.dmi b/icons/obj/storage_vr.dmi index c3be0263e19..bf884c2dedc 100644 Binary files a/icons/obj/storage_vr.dmi and b/icons/obj/storage_vr.dmi differ diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index d0cd323292d..e9b0b658731 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -30200,7 +30200,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/upper) "iPK" = ( -/obj/structure/closet/walllocker/emerglocker{ +/obj/structure/closet/emergsuit_wall{ pixel_x = -32 }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, @@ -31583,9 +31583,6 @@ /turf/simulated/floor/plating, /area/shuttle/securiship/general) "qcm" = ( -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = 32 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -31594,6 +31591,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/closet/emergsuit_wall{ + pixel_x = 32 + }, /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/shuttle/excursion/cargo) "qgj" = ( diff --git a/vorestation.dme b/vorestation.dme index d8f2911a7d1..adece1b480c 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -429,6 +429,7 @@ #include "code\datums\underwear\undershirts.dm" #include "code\datums\underwear\underwear.dm" #include "code\datums\uplink\ammunition.dm" +#include "code\datums\uplink\ammunition_vr.dm" #include "code\datums\uplink\announcements.dm" #include "code\datums\uplink\armor.dm" #include "code\datums\uplink\backup.dm" @@ -1645,9 +1646,9 @@ #include "code\modules\ai\ai_holder_targeting_vr.dm" #include "code\modules\ai\interfaces.dm" #include "code\modules\ai\say_list.dm" -#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm" -#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai_vr.dm" -#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm" +#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm" +#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_vr.dm" +#include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm" #include "code\modules\alarm\alarm.dm" #include "code\modules\alarm\alarm_handler.dm" #include "code\modules\alarm\atmosphere_alarm.dm"