cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-07-20 20:52:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed assorted ore bag/box bugs and perf issues

Browse Source 
mining satchels automatically collect ore if held in the hands, belt, or suit slot.

pulling an ore box with a satchel collects ore into the ore box instead of the satchel, and empties the satchel if appropriate.

hostile mining drones collect into ore boxes just like people would. Their collection checking view size is smaller.

mining satchels and ore boxes only update their contents hints if examined after it changes, rather than up to once a second regardless of changes.

various doubled messages removed.

removed various dm-land loops in favor of contents addition where it makes sense.
This commit is contained in:
spookerton
2022-11-16 17:20:20 +00:00
parent b44de129a3
commit 2a2cd5124e
5 changed files with 235 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm
+41 -19
View File
@@ -106,26 +106,48 @@
return has_tool
/mob/living/simple_mob/mechanical/mining_drone/handle_special()
if(my_storage && (get_AI_stance() in list(STANCE_APPROACH, STANCE_IDLE, STANCE_FOLLOW)) && !is_AI_busy() && isturf(loc) && (world.time > last_search + search_cooldown) && (my_storage.contents.len < my_storage.max_storage_space))
last_search = world.time
if (!isturf(loc))
return
if (!my_storage)
return
if (ai_holder?.busy)
return
if (world.time < last_search + search_cooldown)
return
switch (get_AI_stance())
if (STANCE_APPROACH, STANCE_IDLE, STANCE_FOLLOW)
. = . //noop
else
return
var/max_space = my_storage.max_storage_space
var/obj/structure/ore_box/box = locate() in view(3, src)
if (istype(box))
if (length(my_storage.contents))
Beam(box, icon_state = "holo_beam", time = 1 SECONDS)
box.contents += my_storage.contents
my_storage.stored_ore_dirty = TRUE
box.stored_ore_dirty = TRUE
else if (length(my_storage.contents) >= max_space)
audible_message(SPAN_NOTICE("\The [src] emits a shrill beep; it's full!"))
return
for (var/turf/simulated/floor/floor in view(4, src))
if (length(my_storage.contents) >= max_space)
audible_message(SPAN_NOTICE("\The [src] emits a shrill beep; it's full!"))
return
if (prob(50))
continue
if (!(locate(/obj/item/ore) in floor))
continue
Beam(floor, icon_state = "holo_beam", time = 0.5 SECONDS)
if (box)
for (var/obj/item/ore/ore in floor)
box.contents += ore
box.stored_ore_dirty = TRUE
Beam(box, icon_state = "holo_beam", time = 0.5 SECONDS)
else
my_storage.gather_all(floor, src)
my_storage.stored_ore_dirty = TRUE
for(var/turf/T in view(world.view,src))
if(my_storage.contents.len >= my_storage.max_storage_space)
break
if((locate(/obj/item/ore) in T) && prob(40))
src.Beam(T, icon_state = "holo_beam", time = 0.5 SECONDS)
my_storage.rangedload(T, src)
if(my_storage.contents.len >= my_storage.max_storage_space)
visible_message("<span class='notice'>\The [src] emits a shrill beep, indicating its storage is full.</span>")
var/obj/structure/ore_box/OB = locate() in view(2, src)
if(istype(OB) && my_storage && my_storage.contents.len)
src.Beam(OB, icon_state = "rped_upgrade", time = 1 SECONDS)
for(var/obj/item/I in my_storage)
my_storage.remove_from_storage(I, OB)
/decl/mob_organ_names/miningdrone
hit_zones = list("chassis", "comms array", "sensor suite", "left excavator module", "right excavator module", "maneuvering thruster")