cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 20:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8274 from Novacat/nova-basicfixes

Browse Source 
Vox Phoron and Adminbus Backpacks
This commit is contained in:
Novacat
2020-06-14 15:48:40 -04:00
committed by GitHub
parent 6c899ae143 ff0716f501
commit 4e889046e9
12 changed files with 119 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/uplink/ammunition_vr.dm
+20
View File
@@ -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
code/datums/uplink/medical_vr.dm
+39 -19
View File
@@ -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
code/datums/uplink/tools_vr.dm
+20
View File
@@ -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
code/game/objects/items/weapons/storage/backpack_vr.dm
+11 -11
View File
@@ -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"
code/game/objects/items/weapons/tanks/tank_types.dm
+1 -1
View File
@@ -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"
code/game/objects/items/weapons/tanks/tank_types_vr.dm
+1
View File
@@ -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
code/game/objects/structures/crates_lockers/closets/misc_vr.dm
+18 -1
View File
@@ -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
)
code/modules/clothing/spacesuits/void/void_vr.dm
+1 -1
View File
@@ -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'
icons/obj/clothing/backpack_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

icons/obj/storage_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 22 KiB

maps/tether/tether-07-station3.dmm
+4 -4
View File
@@ -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" = (
vorestation.dme
+4 -3
View File
@@ -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"