mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-17 01:54:25 +01:00
* 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
@@ -110,7 +110,7 @@
|
||||
to_chat(user, span_warning("[B.name] full. Empty or process contents to continue."))
|
||||
return
|
||||
if(B.ore_storage)
|
||||
if(B.current_capacity >= B.max_ore_storage)
|
||||
if(B.ore_bag.current_capacity >= B.ore_bag.max_storage_space)
|
||||
to_chat(user, span_warning("Ore storage full. Deposit ore contents to a box continue."))
|
||||
return
|
||||
if(isbelly(output_atom))
|
||||
|
||||
@@ -88,165 +88,6 @@
|
||||
can_hold = list() // any
|
||||
cant_hold = list(/obj/item/disk/nuclear)
|
||||
|
||||
// -----------------------------
|
||||
// Mining Satchel
|
||||
// -----------------------------
|
||||
/*
|
||||
* Mechoid - Orebags are the most common quick-gathering thing, and also have tons of lag associated with it.
|
||||
* Their checks are going to be hyper-simplified due to this, and their INCREDIBLY singular target contents.
|
||||
*/
|
||||
/obj/item/storage/bag/ore
|
||||
name = "mining satchel"
|
||||
desc = "This little bugger can be used to store and transport ores."
|
||||
icon = 'icons/obj/mining.dmi'
|
||||
icon_state = "satchel"
|
||||
slot_flags = SLOT_BELT | SLOT_POCKET
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
max_storage_space = ITEMSIZE_COST_NORMAL * 25
|
||||
max_w_class = ITEMSIZE_NORMAL
|
||||
allow_quick_empty = FALSE
|
||||
can_hold = list(/obj/item/ore)
|
||||
var/current_capacity = 0
|
||||
var/max_pickup = 100 //How much ore can be picked up in one go. There to prevent someone from walking on a turf with 10000 ore and making the server cry.
|
||||
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)
|
||||
var/last_update = 0
|
||||
|
||||
/obj/item/storage/bag/ore/holding
|
||||
name = "mining satchel of holding"
|
||||
desc = "Like a mining satchel, but when you put your hand in, you're pretty sure you can feel time itself."
|
||||
icon_state = "satchel_bspace"
|
||||
max_storage_space = ITEMSIZE_COST_NORMAL * 15000 // This should never, ever, ever be reached.
|
||||
|
||||
/obj/item/storage/bag/ore/attackby(obj/item/W as obj, mob/user as mob)
|
||||
if(current_capacity >= max_storage_space)
|
||||
to_chat(user, span_notice("\the [src] is too full to possibly fit anything else inside of it."))
|
||||
return
|
||||
|
||||
if (istype(W, /obj/item/ore) && !istype(W, /obj/item/ore/slag))
|
||||
var/obj/item/ore/ore = W
|
||||
stored_ore[ore.material]++
|
||||
current_capacity++
|
||||
user.remove_from_mob(W)
|
||||
qdel(ore)
|
||||
|
||||
/obj/item/storage/bag/ore/remove_from_storage(obj/item/W as obj, atom/new_location)
|
||||
if(!istype(W)) return 0
|
||||
|
||||
if(new_location)
|
||||
if(ismob(loc))
|
||||
W.dropped(usr)
|
||||
if(ismob(new_location))
|
||||
W.hud_layerise()
|
||||
else
|
||||
W.reset_plane_and_layer()
|
||||
W.forceMove(new_location)
|
||||
else
|
||||
W.forceMove(get_turf(src))
|
||||
|
||||
W.on_exit_storage(src)
|
||||
update_icon()
|
||||
return 1
|
||||
|
||||
/obj/item/storage/bag/ore/gather_all(turf/T as turf, mob/user as mob, var/silent = 0)
|
||||
var/success = 0
|
||||
var/failure = 0
|
||||
var/current_pickup = 0
|
||||
var/max_pickup_reached = 0
|
||||
for(var/obj/item/ore/O in T) //Only ever grabs ores. Doesn't do any extraneous checks, as all ore is the same size. Tons of checks means it causes hanging for up to three seconds.
|
||||
if(current_capacity >= max_storage_space)
|
||||
failure = 1
|
||||
break
|
||||
if(current_pickup >= max_pickup)
|
||||
max_pickup_reached = 1
|
||||
break
|
||||
if(istype(O, /obj/item/ore/slag))
|
||||
continue
|
||||
var/obj/item/ore/ore = O
|
||||
stored_ore[ore.material]++
|
||||
current_capacity++
|
||||
current_pickup++
|
||||
qdel(ore)
|
||||
success = 1
|
||||
if(!silent) //Let's do a single check and then do more instead of a bunch at once.
|
||||
if(success && !failure && !max_pickup_reached) //Picked stuff up, did not reach capacity, did not reach max_pickup.
|
||||
to_chat(user, span_notice("You put everything in [src]."))
|
||||
else if(success && failure) //Picked stuff up to capacity.
|
||||
to_chat(user, span_notice("You fill the [src]."))
|
||||
else if(success && max_pickup_reached) //Picked stuff up to the max_pickup
|
||||
to_chat(user, span_notice("You fill the [src] with as much as you can grab in one go."))
|
||||
else //Failed. The bag is full.
|
||||
to_chat(user, span_notice("You fail to pick anything up with \the [src]."))
|
||||
if(istype(user.pulling, /obj/structure/ore_box)) //Bit of a crappy way to do this, as it doubles spam for the user, but it works. //Then let me fix it. ~CL.
|
||||
var/obj/structure/ore_box/OB = user.pulling
|
||||
for(var/ore in stored_ore)
|
||||
if(stored_ore[ore] > 0)
|
||||
var/ore_amount = stored_ore[ore] // How many ores does the satchel have?
|
||||
OB.stored_ore[ore] += ore_amount // Add the ore to the box
|
||||
stored_ore[ore] = 0 // Set the value of the ore in the satchel to 0.
|
||||
current_capacity = 0 // Set the amount of ore in the satchel to 0.
|
||||
current_pickup = 0
|
||||
|
||||
/obj/item/storage/bag/ore/equipped(mob/user)
|
||||
..()
|
||||
user.AddComponent(/datum/component/recursive_move)
|
||||
RegisterSignal(user, COMSIG_MOVABLE_ATTEMPTED_MOVE, /obj/item/storage/bag/ore/proc/autoload, override = TRUE)
|
||||
|
||||
/obj/item/storage/bag/ore/dropped(mob/user)
|
||||
..()
|
||||
UnregisterSignal(user, COMSIG_MOVABLE_ATTEMPTED_MOVE)
|
||||
|
||||
/obj/item/storage/bag/ore/proc/autoload(mob/user)
|
||||
SIGNAL_HANDLER
|
||||
var/obj/item/ore/O = locate() in get_turf(src)
|
||||
if(O)
|
||||
gather_all(get_turf(src), user)
|
||||
|
||||
/obj/item/storage/bag/ore/proc/rangedload(atom/A, mob/user)
|
||||
var/obj/item/ore/O = locate() in get_turf(A)
|
||||
if(O)
|
||||
gather_all(get_turf(A), user)
|
||||
|
||||
/obj/item/storage/bag/ore/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
if(!Adjacent(user)) //Can only check the contents of ore bags if you can physically reach them.
|
||||
return .
|
||||
|
||||
if(isliving(user))
|
||||
add_fingerprint(user)
|
||||
|
||||
. += span_notice("It holds:")
|
||||
var/has_ore = 0
|
||||
for(var/ore in stored_ore)
|
||||
if(stored_ore[ore] > 0)
|
||||
. += span_notice("- [stored_ore[ore]] [ore]")
|
||||
has_ore = 1
|
||||
if(!has_ore)
|
||||
. += "Nothing."
|
||||
|
||||
/obj/item/storage/bag/ore/open(mob/user as mob) //No opening it for the weird UI of having shit-tons of ore inside it.
|
||||
user.examinate(src)
|
||||
|
||||
// -----------------------------
|
||||
// Plant bag
|
||||
// -----------------------------
|
||||
|
||||
@@ -737,7 +737,7 @@
|
||||
/obj/item/melee,
|
||||
/obj/item/kinetic_crusher,
|
||||
/obj/item/mining_scanner,
|
||||
/obj/item/storage/bag/ore,
|
||||
/obj/item/ore_bag,
|
||||
/obj/item/storage/sample_container
|
||||
)
|
||||
//Pretty much, if it's in the mining vendor, they should be able to put it on the belt.
|
||||
|
||||
@@ -0,0 +1,179 @@
|
||||
// -----------------------------
|
||||
// Mining Satchel
|
||||
// -----------------------------
|
||||
/*
|
||||
* Mechoid - Orebags are the most common quick-gathering thing, and also have tons of lag associated with it.
|
||||
* Their checks are going to be hyper-simplified due to this, and their INCREDIBLY singular target contents.
|
||||
*/
|
||||
/obj/item/ore_bag
|
||||
name = "mining satchel"
|
||||
desc = "This little bugger can be used to store and transport ores."
|
||||
icon = 'icons/obj/mining.dmi'
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_storage.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_storage.dmi',
|
||||
)
|
||||
icon_state = "satchel"
|
||||
slot_flags = SLOT_BELT | SLOT_POCKET
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
var/current_capacity = 0
|
||||
var/max_storage_space = 100
|
||||
var/max_pickup = 100 //How much ore can be picked up in one go. There to prevent someone from walking on a turf with 10000 ore and making the server cry.
|
||||
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)
|
||||
var/last_update = 0
|
||||
drop_sound = 'sound/items/drop/backpack.ogg'
|
||||
pickup_sound = 'sound/items/pickup/backpack.ogg'
|
||||
|
||||
/obj/item/ore_bag/holding
|
||||
name = "mining satchel of holding"
|
||||
desc = "Like a mining satchel, but when you put your hand in, you're pretty sure you can feel time itself."
|
||||
icon_state = "satchel_bspace"
|
||||
max_storage_space = ITEMSIZE_COST_NORMAL * 15000 // This should never, ever, ever be reached.
|
||||
|
||||
/obj/item/ore_bag/sleeper
|
||||
name = "processing chamber"
|
||||
desc = "A mining satchel built into a sleeper. VORE!!!"
|
||||
icon_state = "satchel_bspace"
|
||||
max_storage_space = 500
|
||||
//item_flags = ABSTRACT //Enable once we have abstract PR merged.
|
||||
|
||||
/obj/item/ore_bag/attackby(obj/item/W, mob/user)
|
||||
if(current_capacity >= max_storage_space)
|
||||
to_chat(user, span_notice("\the [src] is too full to possibly fit anything else inside of it."))
|
||||
return
|
||||
|
||||
if (istype(W, /obj/item/ore) && !istype(W, /obj/item/ore/slag) && !istype(W, /obj/item/ore/archeology_debris))
|
||||
var/obj/item/ore/ore = W
|
||||
stored_ore[ore.material]++
|
||||
current_capacity++
|
||||
user.remove_from_mob(W)
|
||||
qdel(ore)
|
||||
|
||||
/obj/item/ore_bag/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
|
||||
//If we attack a turf, we try to scoop up all the ore from the turf first.
|
||||
if(isturf(target) && user.Adjacent(target))
|
||||
gather_all(target, user)
|
||||
return
|
||||
|
||||
//If we attack an ore, see if it's on a turf. If so, scoop up everything on the turf. If not, scoop up just that ore.
|
||||
else if(istype(target, /obj/item/ore) && user.Adjacent(target))
|
||||
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)
|
||||
gather_all(target.loc, user)
|
||||
return
|
||||
|
||||
/obj/item/ore_bag/proc/remove_from_storage(obj/item/W, atom/new_location)
|
||||
if(!istype(W)) return 0
|
||||
|
||||
if(new_location)
|
||||
if(ismob(loc))
|
||||
W.dropped(usr)
|
||||
if(ismob(new_location))
|
||||
W.hud_layerise()
|
||||
else
|
||||
W.reset_plane_and_layer()
|
||||
W.forceMove(new_location)
|
||||
else
|
||||
W.forceMove(get_turf(src))
|
||||
|
||||
W.on_exit_storage(src)
|
||||
update_icon()
|
||||
return 1
|
||||
|
||||
/obj/item/ore_bag/proc/gather_all(turf/T, mob/user, var/silent = 0)
|
||||
var/success = 0
|
||||
var/failure = 0
|
||||
var/current_pickup = 0
|
||||
var/max_pickup_reached = 0
|
||||
for(var/obj/item/ore/O in T) //Only ever grabs ores. Doesn't do any extraneous checks, as all ore is the same size. Tons of checks means it causes hanging for up to three seconds.
|
||||
if(current_capacity >= max_storage_space)
|
||||
failure = 1
|
||||
break
|
||||
if(current_pickup >= max_pickup)
|
||||
max_pickup_reached = 1
|
||||
break
|
||||
if(istype(O, /obj/item/ore/slag) || istype(O, /obj/item/ore/archeology_debris))
|
||||
continue
|
||||
var/obj/item/ore/ore = O
|
||||
stored_ore[ore.material]++
|
||||
current_capacity++
|
||||
current_pickup++
|
||||
qdel(ore)
|
||||
success = 1
|
||||
if(!silent) //Let's do a single check and then do more instead of a bunch at once.
|
||||
if(success && !failure && !max_pickup_reached) //Picked stuff up, did not reach capacity, did not reach max_pickup.
|
||||
to_chat(user, span_notice("You put everything in [src]."))
|
||||
else if(success && failure) //Picked stuff up to capacity.
|
||||
to_chat(user, span_notice("You fill the [src]."))
|
||||
else if(success && max_pickup_reached) //Picked stuff up to the max_pickup
|
||||
to_chat(user, span_notice("You fill the [src] with as much as you can grab in one go."))
|
||||
else //Failed. The bag is full.
|
||||
to_chat(user, span_notice("You fail to pick anything up with \the [src]."))
|
||||
if(istype(user.pulling, /obj/structure/ore_box)) //Bit of a crappy way to do this, as it doubles spam for the user, but it works. //Then let me fix it. ~CL.
|
||||
var/obj/structure/ore_box/OB = user.pulling
|
||||
for(var/ore in stored_ore)
|
||||
if(stored_ore[ore] > 0)
|
||||
var/ore_amount = stored_ore[ore] // How many ores does the satchel have?
|
||||
OB.stored_ore[ore] += ore_amount // Add the ore to the box
|
||||
stored_ore[ore] = 0 // Set the value of the ore in the satchel to 0.
|
||||
current_capacity = 0 // Set the amount of ore in the satchel to 0.
|
||||
current_pickup = 0
|
||||
return success
|
||||
|
||||
/obj/item/ore_bag/equipped(mob/user)
|
||||
..()
|
||||
user.AddComponent(/datum/component/recursive_move)
|
||||
RegisterSignal(user, COMSIG_MOVABLE_ATTEMPTED_MOVE, /obj/item/ore_bag/proc/autoload)
|
||||
|
||||
/obj/item/ore_bag/dropped(mob/user)
|
||||
..()
|
||||
UnregisterSignal(user, COMSIG_MOVABLE_ATTEMPTED_MOVE)
|
||||
|
||||
/obj/item/ore_bag/proc/autoload(mob/user)
|
||||
SIGNAL_HANDLER
|
||||
var/obj/item/ore/O = locate() in get_turf(user)
|
||||
if(O)
|
||||
gather_all(get_turf(user), user)
|
||||
|
||||
/obj/item/ore_bag/proc/rangedload(atom/A, mob/user)
|
||||
var/obj/item/ore/O = locate() in get_turf(A)
|
||||
if(O)
|
||||
gather_all(get_turf(A), user)
|
||||
|
||||
/obj/item/ore_bag/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
if(!Adjacent(user)) //Can only check the contents of ore bags if you can physically reach them.
|
||||
return .
|
||||
|
||||
if(isliving(user))
|
||||
add_fingerprint(user)
|
||||
|
||||
. += span_notice("It holds:")
|
||||
var/has_ore = 0
|
||||
for(var/ore in stored_ore)
|
||||
if(stored_ore[ore] > 0)
|
||||
. += span_notice("- [stored_ore[ore]] [ore]")
|
||||
has_ore = 1
|
||||
if(!has_ore)
|
||||
. += "Nothing."
|
||||
Reference in New Issue
Block a user