cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-14 08:35:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ore Bag Fixes [Requires #19383 merged first] (#19385)

Browse Source 
* map stuff first

get this out of my changes

* Update vorestation.dme

* rest of it

* Better Bags

* Update ore_bag.dm

* Gets rid of bag override

* edits

* Less Jank

* aaa

* this doesnt work

* LOL WHY

* The future is NOW old man

* bye bye

* no hard refs~

* Update dog_sleeper.dm

* Update dog_sleeper.dm
This commit is contained in:
Cameron Lennox
2026-04-11 16:19:03 -04:00
committed by GitHub
parent 74791038ca
commit b4c3594844
33 changed files with 271 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/mine_turfs.dm
+2 -9
View File
@@ -402,13 +402,6 @@ GLOBAL_LIST_EMPTY(mining_overlay_cache)
to_chat(user, span_notice("You dug a hole."))
GetDrilled()
else if(istype(W,/obj/item/storage/bag/ore))
var/obj/item/storage/bag/ore/S = W
if(S.collection_mode)
for(var/obj/item/ore/O in contents)
O.attackby(W,user)
return
else if(istype(W,/obj/item/storage/bag/fossils))
var/obj/item/storage/bag/fossils/S = W
if(S.collection_mode)
@@ -497,7 +490,7 @@ GLOBAL_LIST_EMPTY(mining_overlay_cache)
next_rock += S.excavation_amount
while(next_rock > 50)
next_rock -= 50
var/obj/item/ore/O = new(src)
var/obj/item/ore/archeology_debris/O = new(src)
geologic_data.UpdateNearbyArtifactInfo(src)
O.geologic_data = geologic_data
@@ -547,7 +540,7 @@ GLOBAL_LIST_EMPTY(mining_overlay_cache)
next_rock += P.excavation_amount
while(next_rock > 50)
next_rock -= 50
var/obj/item/ore/O = new(src)
var/obj/item/ore/archeology_debris/O = new(src)
geologic_data.UpdateNearbyArtifactInfo(src)
O.geologic_data = geologic_data
return
code/modules/mining/ore.dm
+4
View File
@@ -7,6 +7,10 @@
var/datum/geosample/geologic_data
var/material
/obj/item/ore/archeology_debris
name = "rocky debris"
desc = "Leftover rocky debris from digging."
/obj/item/ore/uranium
name = "pitchblende"
icon_state = "ore_uranium"
code/modules/mining/ore_box.dm
+10 -5
View File
@@ -33,16 +33,20 @@
. = ..()
AddElement(/datum/element/climbable)
/obj/structure/ore_box/attackby(obj/item/W as obj, mob/user as mob)
if (istype(W, /obj/item/ore))
/obj/structure/ore_box/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/ore))
var/obj/item/ore/ore = W
stored_ore[ore.material]++
user.remove_from_mob(W)
qdel(ore)
return
else if (istype(W, /obj/item/storage/bag/ore))
var/obj/item/storage/bag/ore/S = W
S.hide_from(user)
if(istype(W, /obj/item/dogborg/sleeper/compactor/supply))
var/obj/item/dogborg/sleeper/compactor/supply/borg_sleeper = W
W = borg_sleeper.ore_bag
if(istype(W, /obj/item/ore_bag))
var/obj/item/ore_bag/S = W
for(var/ore in S.stored_ore)
if(S.stored_ore[ore] > 0)
var/ore_amount = S.stored_ore[ore] // How many ores does the satchel have?
@@ -50,6 +54,7 @@
S.stored_ore[ore] = 0 // Set the value of the ore in the satchel to 0.
S.current_capacity = 0 // Set the amount of ore in the satchel to 0.
to_chat(user, span_notice("You empty the satchel into the box."))
return
return
code/modules/mining/ore_redemption_machine/equipment_vendor.dm
+1 -1
View File
@@ -69,7 +69,7 @@
EQUIPMENT("Jump Boots", /obj/item/clothing/shoes/bhop, 2500),
EQUIPMENT("Mini-Translocator", /obj/item/perfect_tele/one_beacon, 1200),
EQUIPMENT("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 750),
EQUIPMENT("Mining Satchel of Holding", /obj/item/storage/bag/ore/holding, 1500),
EQUIPMENT("Mining Satchel of Holding", /obj/item/ore_bag/holding, 1500),
EQUIPMENT("Industrial Equipment - Sheet-Snatcher", /obj/item/storage/bag/sheetsnatcher, 500),
EQUIPMENT("Sheet Snatcher of Holding", /obj/item/storage/bag/sheetsnatcher/holding, 1000),
EQUIPMENT("Advanced Ore Scanner", /obj/item/mining_scanner/advanced, 500),