cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 02:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12579 from GhostActual/tg-port-5

Browse Source 
The Grand /TG Port - Part 5
This commit is contained in:
Casey
2022-04-02 23:30:27 -04:00
committed by GitHub
parent 73589bb510 801533a69f
commit 5d9f0462c1
20 changed files with 162 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
code/game/objects/items/weapons/storage/belt_vr.dm
View File

@@ -2,7 +2,7 @@
sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/belt/mob_teshari.dmi',
SPECIES_WEREBEAST = 'icons/inventory/belt/mob_vr_werebeast.dmi')
/obj/item/weapon/storage/belt/explorer
name = "explorer's belt"
desc = "A versatile belt with several pouches. It can hold a very wide variety of items, but less items overall than a dedicated belt. Still, it's useful for any explorer who wants to be prepared for anything they might find."
@@ -51,7 +51,7 @@
/obj/item/device/mapping_unit,
/obj/item/weapon/kinetic_crusher
)
/obj/item/weapon/storage/belt/explorer/pathfinder
name = "pathfinder's belt"
desc = "A deluxe belt with many pouches. It can hold a very wide variety of items, but less items overall than a dedicated belt. Still, it's useful for any explorer who wants to be prepared for anything they might find."
@@ -60,3 +60,46 @@
item_state = "explorer_belt"
storage_slots = 7 //two more, bringing it on par with normal belts
max_storage_space = ITEMSIZE_COST_NORMAL * 7
/obj/item/weapon/storage/belt/miner
name = "mining belt"
desc = "A versatile and durable looking belt with several pouches and straps. It can hold a very wide variety of items that any typical miner might need out in the deep."
icon = 'icons/inventory/belt/item_vr.dmi'
icon_state = "mining"
item_state = "mining"
storage_slots = 6
max_w_class = ITEMSIZE_LARGE
max_storage_space = ITEMSIZE_COST_NORMAL * 6
can_hold = list(
/obj/item/weapon/storage/box/samplebags,
/obj/item/device/core_sampler,
/obj/item/device/beacon_locator,
/obj/item/device/radio/beacon,
/obj/item/device/measuring_tape,
/obj/item/device/flashlight,
/obj/item/weapon/cell/device,
/obj/item/weapon/pickaxe,
/obj/item/weapon/shovel,
/obj/item/device/depth_scanner,
/obj/item/device/camera,
/obj/item/weapon/paper,
/obj/item/weapon/photo,
/obj/item/weapon/folder,
/obj/item/weapon/pen,
/obj/item/weapon/folder,
/obj/item/weapon/clipboard,
/obj/item/weapon/anodevice,
/obj/item/clothing/glasses,
/obj/item/weapon/tool/wrench,
/obj/item/weapon/storage/excavation,
/obj/item/weapon/anobattery,
/obj/item/device/ano_scanner,
/obj/item/weapon/pickaxe/hand,
/obj/item/device/xenoarch_multi_tool,
/obj/item/weapon/pickaxe/excavationdrill,
/obj/item/device/geiger,
/obj/item/device/gps,
/obj/item/stack/marker_beacon,
/obj/item/stack/flag,
/obj/item/weapon/melee
)

1
code/game/objects/random/maintenance.dm
View File

@@ -287,6 +287,7 @@ something, make sure it's not in one of the other lists.*/
return pick(prob(320);/obj/random/maintenance/clean,
prob(3);/obj/item/device/flashlight/lantern,
prob(4);/obj/item/weapon/pickaxe,
prob(3);/obj/item/weapon/pickaxe/drill,
prob(5);/obj/item/weapon/storage/backpack/industrial,
prob(5);/obj/item/weapon/storage/backpack/satchel/norm,
prob(3);/obj/item/weapon/storage/backpack/dufflebag,

13
code/game/objects/random/mapping.dm
View File

@@ -207,6 +207,12 @@
/obj/item/weapon/flame/lighter/zippo,
/obj/structure/closet/crate/hydroponics
),
prob(5);list(
/obj/item/weapon/pickaxe,
/obj/item/clothing/under/rank/miner,
/obj/item/clothing/head/hardhat,
/obj/structure/closet/crate/engineering
),
prob(5);list(
/obj/item/weapon/pickaxe/drill,
/obj/item/clothing/suit/space/void/mining,
@@ -214,7 +220,7 @@
/obj/structure/closet/crate/engineering
),
prob(5);list(
/obj/item/weapon/pickaxe/drill,
/obj/item/weapon/pickaxe/advdrill,
/obj/item/clothing/suit/space/void/mining/alt,
/obj/item/clothing/head/helmet/space/void/mining/alt,
/obj/structure/closet/crate/engineering
@@ -249,7 +255,7 @@
/obj/structure/closet/crate/engineering
),
prob(5);list(
/obj/item/weapon/pickaxe/drill,
/obj/item/weapon/pickaxe,
/obj/item/clothing/glasses/material,
/obj/structure/ore_box,
/obj/structure/closet/crate
@@ -368,7 +374,7 @@
/obj/structure/closet/crate/engineering
),
prob(2);list(
/obj/item/weapon/pickaxe/drill,
/obj/item/weapon/pickaxe/advdrill,
/obj/item/weapon/storage/bag/ore,
/obj/item/clothing/glasses/material,
/obj/structure/closet/crate/engineering
@@ -1485,6 +1491,7 @@
return pick(
prob(10);list(/obj/item/weapon/pickaxe/silver),
prob(8);list(/obj/item/weapon/pickaxe/drill),
prob(6);list(/obj/item/weapon/pickaxe/advdrill),
prob(6);list(/obj/item/weapon/pickaxe/jackhammer),
prob(5);list(/obj/item/weapon/pickaxe/gold),
prob(4);list(/obj/item/weapon/pickaxe/plasmacutter),

3
code/game/objects/structures/crates_lockers/closets/gimmick.dm
View File

@@ -12,6 +12,9 @@
desc = "It looks alien!"
closet_appearance = /decl/closet_appearance/alien
open_sound = 'sound/machines/click.ogg'
close_sound = 'sound/machines/click.ogg'
/obj/structure/closet/gimmick
name = "administrative supply closet"
desc = "It's a storage unit for things that have no right being here."

3
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
View File

@@ -71,9 +71,10 @@
/obj/item/clothing/shoes/black,
/obj/item/device/analyzer,
/obj/item/weapon/storage/bag/ore,
/obj/item/weapon/storage/belt/miner,
/obj/item/device/flashlight/lantern,
/obj/item/weapon/shovel,
/obj/item/weapon/pickaxe,
/obj/item/weapon/pickaxe/drill,
/obj/item/clothing/glasses/material,
/obj/item/clothing/suit/storage/hooded/wintercoat/miner,
/obj/item/clothing/shoes/boots/winter/mining,