forked from Bubberstation/Bubberstation
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds Cargo shelves from Shiptest, makes Skyrat modular shelves builda…
…ble (Bubberstation#992) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Source Inspiration: shiptest-ss13/Shiptest#2374 <!-- Please make sure to actually test your PRs. If you have not tested your PR mention it. --> This PR add ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> This makes it so that cargo techs can neatly stack crates on a shelf for convenience. How neat! ## Proof Of Testing <!-- Compile and run your code locally. Make sure it works. This is the place to show off your changes! We are not responsible for testing your features. --> https://cdn.discordapp.com/attachments/1059199070855495753/1195241690450120734/2024-01-11_23-39-46.mp4?ex=65b34691&is=65a0d191&hm=9314c27ee40abaf5ef185408c7ebd3d8336a8fc091a2b94524ec23252d4fe67f& ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: ReturnToZender, GenericDM (Original Version) add: Cargo shelves are now craftable using metal! They store up to 3 crates per shelf. fix: Skyrat modular shelves (such as gun racks and tall shelves) are now buildable using metal. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> <!-- By opening a pull request. You have read and understood the repository rules located on the main README.md on this project. --> --------- Co-authored-by: Waterpig <[email protected]> Co-authored-by: pixelkitty286 <[email protected]> Co-authored-by: BurgerLUA <[email protected]> Co-authored-by: Cursor <[email protected]> Co-authored-by: nevimer <[email protected]> Co-authored-by: projectkepler-RU <[email protected]> Co-authored-by: The Sharkening <[email protected]> Co-authored-by: Tom <[email protected]> Co-authored-by: xXPawnStarrXx <[email protected]> Co-authored-by: Bubberbot <[email protected]> Co-authored-by: Nitha <[email protected]> Co-authored-by: Swift <[email protected]>
- Loading branch information
13 people
authored
Feb 7, 2024
1 parent
164ad98
commit 1c64d51
Showing
4 changed files
with
245 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,236 @@ | ||
| #define DEFAULT_SHELF_CAPACITY 3 // Default capacity of the shelf | ||
| #define DEFAULT_SHELF_USE_DELAY 1 SECONDS // Default interaction delay of the shelf | ||
| #define DEFAULT_SHELF_VERTICAL_OFFSET 10 // Vertical pixel offset of shelving-related things. Set to 10 by default due to this leaving more of the crate on-screen to be clicked. | ||
|
|
||
| /obj/structure/cargo_shelf //Crate shelf port from Shiptest: https://github.com/shiptest-ss13/Shiptest/pull/2374 | ||
| name = "Cargo shelf" | ||
| desc = "It's a shelf! For storing crates!" | ||
| icon = 'modular_zubbers/icons/obj/structures.dmi' | ||
| icon_state = "shelf_base" | ||
| density = TRUE | ||
| anchored = TRUE | ||
| max_integrity = 50 // Not hard to break | ||
|
|
||
| var/capacity = DEFAULT_SHELF_CAPACITY | ||
| var/use_delay = DEFAULT_SHELF_USE_DELAY | ||
| var/list/shelf_contents | ||
|
|
||
| /obj/structure/cargo_shelf/debug | ||
| capacity = 12 | ||
|
|
||
| /obj/structure/cargo_shelf/Initialize() | ||
| . = ..() | ||
| shelf_contents = new/list(capacity) // Initialize our shelf's contents list, this will be used later. | ||
| var/stack_layer // This is used to generate the sprite layering of the shelf pieces. | ||
| var/stack_offset // This is used to generate the vertical offset of the shelf pieces. | ||
| for(var/i in 1 to (capacity - 1)) | ||
| if(i >= 3) // If we're at or above three, we'll be on the way to going off the tile we're on. This allows mobs to be below the shelf when this happens. | ||
| stack_layer = ABOVE_MOB_LAYER + (0.02 * i) - 0.01 | ||
| else | ||
| stack_layer = BELOW_OBJ_LAYER + (0.02 * i) - 0.01 // Make each shelf piece render above the last, but below the crate that should be on it. | ||
| stack_offset = DEFAULT_SHELF_VERTICAL_OFFSET * i // Make each shelf piece physically above the last. | ||
| overlays += image(icon = 'modular_zubbers/icons/obj/structures.dmi', icon_state = "shelf_stack", layer = stack_layer, pixel_y = stack_offset) | ||
| return | ||
|
|
||
| /obj/structure/cargo_shelf/Destroy() | ||
| QDEL_LIST(shelf_contents) | ||
| return ..() | ||
|
|
||
| /obj/structure/cargo_shelf/examine(mob/user) | ||
| . = ..() | ||
| . += span_notice("There are some <b>bolts</b> holding [src] together.") | ||
| if(shelf_contents.Find(null)) // If there's an empty space in the shelf, let the examiner know. | ||
| . += span_notice("You could <b>drag and drop</b> a crate into [src].") | ||
| if(contents.len) // If there are any crates in the shelf, let the examiner know. | ||
| . += span_notice("You could <b>drag and drop</b> a crate out of [src].") | ||
| . += span_notice("[src] contains:") | ||
| for(var/obj/structure/closet/crate/crate in shelf_contents) | ||
| . += " [icon2html(crate, user)] [crate]" | ||
|
|
||
| /obj/structure/cargo_shelf/attackby(obj/item/item, mob/living/user, params) | ||
| if (item.tool_behaviour == TOOL_WRENCH && !(flags_1 & NO_DECONSTRUCTION)) | ||
| item.play_tool_sound(src) | ||
| if(do_after(user, 3 SECONDS, target = src)) | ||
| deconstruct(TRUE) | ||
| return TRUE | ||
| return ..() | ||
|
|
||
| /obj/structure/cargo_shelf/relay_container_resist_act(mob/living/user, obj/structure/closet/crate) | ||
| to_chat(user, span_notice("You begin attempting to knock [crate] out of [src]")) | ||
| if(do_after(user, 30 SECONDS, target = crate)) | ||
| if(!user || user.stat != CONSCIOUS || user.loc != crate || crate.loc != src) | ||
| return // If the user is in a strange condition, return early. | ||
| visible_message(span_warning("[crate] falls off of [src]!"), | ||
| span_notice("You manage to knock [crate] free of [src]"), | ||
| span_notice("You hear a thud.")) | ||
| crate.forceMove(drop_location()) // Drop the crate onto the shelf, | ||
| step_rand(crate, 1) // Then try to push it somewhere. | ||
| crate.layer = initial(crate.layer) // Reset the crate back to having the default layer, otherwise we might get strange interactions. | ||
| crate.pixel_y = initial(crate.pixel_y) // Reset the crate back to having no offset, otherwise it will be floating. | ||
| shelf_contents[shelf_contents.Find(crate)] = null // Remove the reference to the crate from the list. | ||
| handle_visuals() | ||
|
|
||
| /obj/structure/cargo_shelf/proc/handle_visuals() | ||
| vis_contents = contents // It really do be that shrimple. | ||
| return | ||
|
|
||
| /obj/structure/cargo_shelf/proc/load(obj/structure/closet/crate/crate, mob/user) | ||
| var/next_free = shelf_contents.Find(null) // Find the first empty slot in the shelf. | ||
| if(!next_free) // If we don't find an empty slot, return early. | ||
| balloon_alert(user, "shelf full!") | ||
| return FALSE | ||
| if(do_after(user, use_delay, target = crate)) | ||
| if(shelf_contents[next_free] != null) | ||
| return FALSE // Something has been added to the shelf while we were waiting, abort! | ||
| if(crate.opened) // If the crate is open, try to close it. | ||
| if(!crate.close()) | ||
| return FALSE // If we fail to close it, don't load it into the shelf. | ||
| shelf_contents[next_free] = crate // Insert a reference to the crate into the free slot. | ||
| crate.forceMove(src) // Insert the crate into the shelf. | ||
| crate.pixel_y = DEFAULT_SHELF_VERTICAL_OFFSET * (next_free - 1) // Adjust the vertical offset of the crate to look like it's on the shelf. | ||
| if(next_free >= 3) // If we're at or above three, we'll be on the way to going off the tile we're on. This allows mobs to be below the crate when this happens. | ||
| crate.layer = ABOVE_MOB_LAYER + 0.02 * (next_free - 1) | ||
| else | ||
| crate.layer = BELOW_OBJ_LAYER + 0.02 * (next_free - 1) // Adjust the layer of the crate to look like it's in the shelf. | ||
| handle_visuals() | ||
| return TRUE | ||
| return FALSE // If the do_after() is interrupted, return FALSE! | ||
|
|
||
| /obj/structure/cargo_shelf/proc/unload(obj/structure/closet/crate/crate, mob/user, turf/unload_turf) | ||
| if(!unload_turf) | ||
| unload_turf = get_turf(user) // If a turf somehow isn't passed into the proc, put it at the user's feet. | ||
| if(!unload_turf.Enter(crate)) // If moving the crate from the shelf to the desired turf would bump, don't do it! Thanks Kapu1178 for the help here. - Generic DM | ||
| unload_turf.balloon_alert(user, "no room!") | ||
| return FALSE | ||
| if(do_after(user, use_delay, target = crate)) | ||
| if(!shelf_contents.Find(crate)) | ||
| return FALSE // If something has happened to the crate while we were waiting, abort! | ||
| crate.layer = initial(crate.layer) // Reset the crate back to having the default layer, otherwise we might get strange interactions. | ||
| crate.pixel_y = initial(crate.pixel_y) // Reset the crate back to having no offset, otherwise it will be floating. | ||
| crate.forceMove(unload_turf) | ||
| shelf_contents[shelf_contents.Find(crate)] = null // We do this instead of removing it from the list to preserve the order of the shelf. | ||
| handle_visuals() | ||
| return TRUE | ||
| return FALSE // If the do_after() is interrupted, return FALSE! | ||
|
|
||
| /obj/structure/cargo_shelf/deconstruct(disassembled = TRUE) | ||
| var/turf/dump_turf = drop_location() | ||
| for(var/obj/structure/closet/crate/crate in shelf_contents) | ||
| crate.layer = initial(crate.layer) // Reset the crates back to default visual state | ||
| crate.pixel_y = initial(crate.pixel_y) | ||
| crate.forceMove(dump_turf) | ||
| step(crate, pick(GLOB.alldirs)) // Shuffle the crates around as though they've fallen down. | ||
| crate.SpinAnimation(rand(4,7), 1) // Spin the crates around a little as they fall. Randomness is applied so it doesn't look weird. | ||
| switch(pick(1, 1, 1, 1, 2, 2, 3)) // Randomly pick whether to do nothing, open the crate, or break it open. | ||
| if(1) // Believe it or not, this does nothing. | ||
| if(2) // Open the crate! | ||
| if(crate.open()) // Break some open, cause a little chaos. | ||
| crate.visible_message(span_warning("[crate]'s lid falls open!")) | ||
| else // If we somehow fail to open the crate, just break it instead! | ||
| crate.visible_message(span_warning("[crate] falls apart!")) | ||
| crate.deconstruct() | ||
| if(3) // Break that crate! | ||
| crate.visible_message(span_warning("[crate] falls apart!")) | ||
| crate.deconstruct() | ||
| shelf_contents[shelf_contents.Find(crate)] = null | ||
| if(!(flags_1 & NO_DECONSTRUCTION)) | ||
| density = FALSE | ||
| var/obj/item/rack_parts/cargo_shelf/newparts = new(loc) | ||
| transfer_fingerprints_to(newparts) | ||
| return ..() | ||
|
|
||
| /obj/structure/closet/crate/MouseDrop(atom/drop_atom, src_location, over_location) | ||
| . = ..() | ||
| var/mob/living/user = usr | ||
| if(!isliving(user)) | ||
| return // Ghosts busted. | ||
| if(!isturf(user.loc) || user.incapacitated() || user.body_position == LYING_DOWN) | ||
| return // If the user is in a weird state, don't bother trying. | ||
| if(get_dist(drop_atom, src) != 1 || get_dist(drop_atom, user) != 1) | ||
| return // Check whether the crate is exactly 1 tile from the shelf and the user. | ||
| if(istype(drop_atom, /turf/open) && istype(loc, /obj/structure/cargo_shelf) && user.Adjacent(drop_atom)) | ||
| var/obj/structure/cargo_shelf/shelf = loc | ||
| return shelf.unload(src, user, drop_atom) // If we're being dropped onto a turf, and we're inside of a crate shelf, unload. | ||
| if(istype(drop_atom, /obj/structure/cargo_shelf) && isturf(loc) && user.Adjacent(src)) | ||
| var/obj/structure/cargo_shelf/shelf = drop_atom | ||
| return shelf.load(src, user) // If we're being dropped onto a crate shelf, and we're in a turf, load. | ||
|
|
||
| /obj/item/rack_parts/cargo_shelf | ||
| name = "Cargo shelf parts" | ||
| icon = 'modular_zubbers/icons/obj/structures.dmi' | ||
| icon_state = "rack_parts" | ||
| desc = "Parts of a cargo shelf, for storing crates." | ||
|
|
||
| /obj/item/rack_parts/cargo_shelf/attack_self(mob/user) | ||
| if(building) | ||
| return | ||
| building = TRUE | ||
| to_chat(user, span_notice("You start constructing a cargo shelf...")) | ||
| if(do_after(user, 50, target = user, progress=TRUE)) | ||
| if(!user.temporarilyRemoveItemFromInventory(src)) | ||
| return | ||
| var/obj/structure/cargo_shelf/R = new /obj/structure/cargo_shelf(get_turf(src)) | ||
| user.visible_message("<span class='notice'>[user] assembles \a [R].\ | ||
| </span>", span_notice("You assemble \a [R].")) | ||
| R.add_fingerprint(user) | ||
| qdel(src) | ||
| building = FALSE | ||
|
|
||
| /obj/structure/cargo_shelf/deconstruct(disassembled = TRUE) | ||
| if(!(obj_flags & NO_DECONSTRUCTION)) | ||
| set_density(FALSE) | ||
| var/obj/item/rack_parts/cargo_shelf/newparts = new(loc) | ||
| transfer_fingerprints_to(newparts) | ||
| qdel(src) | ||
|
|
||
| /obj/item/rack_parts/gun | ||
| name = "gun rack parts" | ||
| desc = "Parts of a gun rack." | ||
|
|
||
| /obj/item/rack_parts/gun/attack_self(mob/user) | ||
| if(building) | ||
| return | ||
| building = TRUE | ||
| to_chat(user, span_notice("You start constructing a gun rack...")) | ||
| if(do_after(user, 50, target = user, progress=TRUE)) | ||
| if(!user.temporarilyRemoveItemFromInventory(src)) | ||
| return | ||
| var/obj/structure/rack/gunrack/R = new /obj/structure/rack/gunrack(get_turf(src)) | ||
| user.visible_message("<span class='notice'>[user] assembles \a [R].\ | ||
| </span>", span_notice("You assemble \a [R].")) | ||
| R.add_fingerprint(user) | ||
| qdel(src) | ||
| building = FALSE | ||
|
|
||
| /obj/structure/rack/gunrack/deconstruct(disassembled = TRUE) | ||
| if(!(obj_flags & NO_DECONSTRUCTION)) | ||
| set_density(FALSE) | ||
| var/obj/item/rack_parts/gun/newparts = new(loc) | ||
| transfer_fingerprints_to(newparts) | ||
| qdel(src) | ||
|
|
||
| /obj/item/rack_parts/shelf | ||
| name = "shelf parts" | ||
| desc = "Parts of a standard shelf." | ||
|
|
||
| /obj/item/rack_parts/shelf/attack_self(mob/user) | ||
| if(building) | ||
| return | ||
| building = TRUE | ||
| to_chat(user, span_notice("You start constructing a standard shelf...")) | ||
| if(do_after(user, 50, target = user, progress=TRUE)) | ||
| if(!user.temporarilyRemoveItemFromInventory(src)) | ||
| return | ||
| var/obj/structure/rack/shelf/R = new /obj/structure/rack/shelf(get_turf(src)) | ||
| user.visible_message("<span class='notice'>[user] assembles \a [R].\ | ||
| </span>", span_notice("You assemble \a [R].")) | ||
| R.add_fingerprint(user) | ||
| qdel(src) | ||
| building = FALSE | ||
|
|
||
| /obj/structure/rack/shelf/deconstruct(disassembled = TRUE) | ||
| if(!(obj_flags & NO_DECONSTRUCTION)) | ||
| set_density(FALSE) | ||
| var/obj/item/rack_parts/shelf/newparts = new(loc) | ||
| transfer_fingerprints_to(newparts) | ||
| qdel(src) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters