cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 11:05:50 +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/mob/living/silicon/robot/dogborg/dog_sleeper.dm
+15 -5
View File
@@ -43,8 +43,7 @@
var/medsensor = TRUE //Does belly sprite come with patient ok/dead light?
var/obj/item/healthanalyzer/med_analyzer = null
var/ore_storage = FALSE
var/max_ore_storage = 500
var/current_capacity = 0
var/obj/item/ore_bag/sleeper/ore_bag //Used by supply compactor
flags = NOBLUDGEON
/obj/item/dogborg/sleeper/Initialize(mapload)
@@ -58,11 +57,17 @@
config_flags = EXPERIMENT_CONFIG_ALWAYS_ACTIVE|EXPERIMENT_CONFIG_SILENT_FAIL,\
experiment_signals = destructive_signals, \
)
if(ore_storage)
ore_bag = new(null) //We don't need it inside, just need a reference to it.
. = ..()
med_analyzer = new /obj/item/healthanalyzer
/obj/item/dogborg/sleeper/Destroy()
go_out()
if(ore_bag)
QDEL_NULL(ore_bag)
if(med_analyzer)
QDEL_NULL(med_analyzer)
. = ..()
/obj/item/dogborg/sleeper/Exit(atom/movable/O)
@@ -75,11 +80,11 @@
var/datum/gas_mixture/belly_air/air = new(1000)
return air
/obj/item/dogborg/sleeper/afterattack(var/atom/movable/target, mob/living/silicon/user, proximity)
/obj/item/dogborg/sleeper/afterattack(var/atom/movable/target, mob/living/silicon/user, proximity_flag, click_parameters)
hound = loc
if(!istype(target))
return
if(!proximity)
if(!proximity_flag)
return
if(target.anchored)
return
@@ -156,7 +161,7 @@
return
user.visible_message(span_warning("[hound.name] is ingesting [H.name] into their [src.name]."), span_notice("You start ingesting [H] into your [src]..."))
if(!patient && !H.buckled && do_after (user, 50, H))
if(!proximity)
if(!proximity_flag)
return //If they moved away, you can't eat them.
if(patient)
return //If you try to eat two people at once, you can only eat one.
@@ -291,6 +296,11 @@
)
var/datum/component/experiment_handler/handler = get_experiment_handler()
var/current_capacity = 0
var/max_ore_storage = 0
if(ore_storage)
current_capacity = ore_bag.current_capacity
max_ore_storage = ore_bag.max_storage_space
var/list/data = list(
"our_patient" = patient_data,
"eject_port" = eject_port,
code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_types.dm
+17 -40
View File
@@ -50,49 +50,26 @@
injection_chems = list(REAGENT_ID_GLUCOSE,REAGENT_ID_INAPROVALINE,REAGENT_ID_TRICORDRAZINE)
max_item_count = 20
ore_storage = TRUE
var/list/stored_ore = list(
ORE_SAND = 0,
ORE_HEMATITE = 0,
ORE_CARBON = 0,
ORE_COPPER = 0,
ORE_TIN = 0,
ORE_VOPAL = 0,
ORE_PAINITE = 0,
ORE_QUARTZ = 0,
ORE_BAUXITE = 0,
ORE_PHORON = 0,
ORE_SILVER = 0,
ORE_GOLD = 0,
ORE_MARBLE = 0,
ORE_URANIUM = 0,
ORE_DIAMOND = 0,
ORE_PLATINUM = 0,
ORE_LEAD = 0,
ORE_MHYDROGEN = 0,
ORE_VERDANTIUM = 0,
ORE_RUTILE = 0)
medsensor = FALSE
/obj/item/dogborg/sleeper/compactor/supply/Entered(atom/movable/thing, atom/OldLoc)
. = ..()
if(istype(thing, /obj/item/ore))
var/obj/item/ore/ore = thing
stored_ore[ore.material]++
current_capacity++
qdel(ore)
/obj/structure/ore_box/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/dogborg/sleeper/compactor/supply))
var/obj/item/dogborg/sleeper/compactor/supply/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?
stored_ore[ore] += ore_amount // Add the ore to the machine.
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."))
/obj/item/dogborg/sleeper/compactor/supply/afterattack(atom/movable/target, mob/living/silicon/user, proximity_flag, click_parameters)
if(!proximity_flag)
return
..()
if(isturf(target))
if(ore_bag.gather_all(target, user, TRUE))
user.visible_message(span_warning("[hound.name]'s [src.name] groans lightly as ore slips inside."), span_notice("Your [src.name] groans lightly as ore slips inside."))
playsound(src, gulpsound, vol = 60, vary = 1, falloff = 0.1, preference = /datum/preference/toggle/eating_noises)
return
if(istype(target, /obj/item/ore) && !istype(target, /obj/item/ore/slag) && !istype(target, /obj/item/ore/archeology_debris))
var/turf_check = isturf(target.loc) //get_turf intentionally not used here due to clicking ore in a backpack or other weirdness.
if(turf_check)
if(ore_bag.gather_all(target.loc, user, TRUE))
user.visible_message(span_warning("[hound.name]'s [src.name] groans lightly as ore slips inside."), span_notice("Your [src.name] groans lightly as ore slips inside."))
playsound(src, gulpsound, vol = 60, vary = 1, falloff = 0.1, preference = /datum/preference/toggle/eating_noises)
return
. = ..()
/obj/item/dogborg/sleeper/compactor/brewer
name = "Brew Belly"
code/modules/mob/living/silicon/robot/inventory.dm
+7
View File
@@ -378,6 +378,13 @@
if(tracker.tracking)
tracker.tracking = FALSE
tracker.toggle_tracking()
if(istype(O, /obj/item/dogborg/sleeper)) //gross
var/obj/item/dogborg/sleeper/our_compactor = O
if(our_compactor.ore_storage)
if(O in get_all_held_items())
our_compactor.ore_bag.equipped(src)
else
our_compactor.ore_bag.dropped(src)
if(sight_mode & BORGANOMALOUS)
var/obj/item/dogborg/pounce/pounce = has_upgrade_module(/obj/item/dogborg/pounce)
if(pounce)
code/modules/mob/living/silicon/robot/robot_modules/station.dm
+1 -2
View File
@@ -744,7 +744,6 @@
src.modules += new /obj/item/borg/sight/material(src)
src.modules += new /obj/item/tool/wrench/cyborg(src)
src.modules += new /obj/item/tool/screwdriver/cyborg(src)
src.modules += new /obj/item/storage/bag/ore(src)
src.modules += new /obj/item/pickaxe/borgdrill(src)
src.modules += new /obj/item/storage/bag/sheetsnatcher/borg(src)
src.modules += new /obj/item/gripper/miner(src)
@@ -933,7 +932,7 @@
..()
src.modules += new /obj/item/borg/sight/material(src)
src.modules += new /obj/item/pickaxe/borgdrill(src)
src.modules += new /obj/item/storage/bag/ore(src)
src.modules += new /obj/item/ore_bag(src)
src.modules += new /obj/item/storage/bag/sheetsnatcher/borg(src)
src.emag += new /obj/item/pickaxe/diamonddrill(src)
code/modules/mob/living/silicon/robot/robot_movement.dm
-13
View File
@@ -46,19 +46,6 @@
if(!module)
return
//Borgs and drones can use their mining bags ~automagically~ if they're deployed in a slot. Only mining bags, as they're optimized for mass use.
if(istype(module_state_1, /obj/item/storage/bag/ore) || istype(module_state_2, /obj/item/storage/bag/ore) || istype(module_state_3, /obj/item/storage/bag/ore))
var/obj/item/storage/bag/ore/B = null
if(istype(module_state_1, /obj/item/storage/bag/ore)) //First orebag has priority, if they for some reason have multiple.
B = module_state_1
else if(istype(module_state_2, /obj/item/storage/bag/ore))
B = module_state_2
else if(istype(module_state_3, /obj/item/storage/bag/ore))
B = module_state_3
var/turf/tile = loc
if(isturf(tile))
B.gather_all(tile, src, 1) //Shhh, unless the bag fills, don't spam the borg's chat with stuff that's going on every time they move!
if(scrubbing && isturf(loc))
var/turf/tile = loc
tile.wash(CLEAN_SCRUB)
code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm
+2 -2
View File
@@ -62,7 +62,7 @@
var/datum/effect/effect/system/ion_trail_follow/ion_trail = null
var/obj/item/shield_projector/shields = null
var/obj/item/storage/bag/ore/my_storage = null
var/obj/item/ore_bag/my_storage = null
var/last_search = 0
var/search_cooldown = 5 SECONDS
@@ -74,7 +74,7 @@
ion_trail.set_up(src)
ion_trail.start()
my_storage = new /obj/item/storage/bag/ore(src)
my_storage = new /obj/item/ore_bag(src)
shields = new /obj/item/shield_projector/rectangle/automatic/drone(src)
return ..()