Skip to content

Commit

Permalink
Crates load onto shelves when mapped (shiptest-ss13#3970)
Browse files Browse the repository at this point in the history 
<!-- 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
Crates mapped on top of shelves now are loaded onto the shelf
automatically, additionally, adds a new mapping helper to load crates
onto nearby shelves.


![image](https://github.com/user-attachments/assets/84e3d443-e48a-45cb-8650-688be8b6661d)
(Example on the Talos-class, loading crates onto shelves and nearby
crates loaded using the mapping helper)
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Players wont need to load crates onto shelves at the start of each
round, and mappers can be more creative with their use of shelves.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Outpost staff have hired professional crate shelvers
/: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. -->

---------

Signed-off-by: Ical <[email protected]>
  • Loading branch information
@Ical92
Ical92 authored Jan 7, 2025
1 parent 1e878db commit 71ce1f6
Show file tree
Hide file tree
Showing 12 changed files with 364 additions and 533 deletions.
68 changes: 18 additions & 50 deletions _maps/shuttles/independent/independent_shetland.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,7 @@
/turf/open/floor/plating,
/area/ship/hallway/aft)
"bc" = (
/obj/machinery/power/shuttle/engine/electric{
dir = 4
},
/obj/machinery/power/shuttle/engine/electric,
/obj/structure/cable{
icon_state = "0-4"
},
Expand Down Expand Up @@ -161,9 +159,7 @@
/area/ship/hallway/fore)
"by" = (
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable{
icon_state = "0-1"
},
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
Expand Down Expand Up @@ -402,9 +398,7 @@
/turf/closed/wall/r_wall,
/area/ship/maintenance/port)
"dq" = (
/obj/machinery/power/shuttle/engine/fueled/plasma{
dir = 4
},
/obj/machinery/power/shuttle/engine/fueled/plasma,
/turf/open/floor/engine/hull,
/area/ship/maintenance/port)
"dB" = (
Expand Down Expand Up @@ -450,9 +444,7 @@
"ea" = (
/obj/structure/closet/emcloset,
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable{
icon_state = "0-1"
},
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/corner/opaque/black/half,
/turf/open/floor/plasteel,
Expand Down Expand Up @@ -554,9 +546,7 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/engine)
"eV" = (
/obj/machinery/power/shuttle/engine/electric{
dir = 4
},
/obj/machinery/power/shuttle/engine/electric,
/obj/structure/cable{
icon_state = "0-4"
},
Expand Down Expand Up @@ -841,9 +831,7 @@
/turf/open/floor/plating,
/area/ship/medical)
"gS" = (
/obj/machinery/power/shuttle/engine/fueled/plasma{
dir = 4
},
/obj/machinery/power/shuttle/engine/fueled/plasma,
/turf/open/floor/engine/hull,
/area/ship/maintenance/starboard)
"gV" = (
Expand Down Expand Up @@ -1213,9 +1201,7 @@
id = "shetland_cargo";
locked = 1
},
/obj/structure/cable{
icon_state = "0-1"
},
/obj/structure/cable,
/turf/open/floor/plasteel/patterned/ridged,
/area/ship/cargo)
"jY" = (
Expand Down Expand Up @@ -2785,9 +2771,7 @@
/turf/open/floor/plating,
/area/ship/hallway/central)
"wT" = (
/obj/machinery/power/smes/shuttle/precharged{
dir = 4
},
/obj/machinery/power/smes/shuttle/precharged,
/obj/structure/cable{
icon_state = "0-8"
},
Expand Down Expand Up @@ -3093,8 +3077,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/random{
pixel_x = -32;
pixel_y = 0
pixel_x = -32
},
/turf/open/floor/plasteel/grimy,
/area/ship/security)
Expand Down Expand Up @@ -3386,7 +3369,6 @@
"BL" = (
/obj/machinery/door/airlock/external,
/obj/docking_port/mobile{
can_move_docking_ports = 1;
dir = 2;
launch_status = 0;
port_direction = 8;
Expand Down Expand Up @@ -4236,7 +4218,6 @@
name = "Nugget"
},
/obj/structure/bed/dogbed{
anchored = 1;
can_be_unanchored = 1
},
/turf/open/floor/carpet/blue,
Expand Down Expand Up @@ -4443,8 +4424,7 @@
/obj/effect/spawner/random/bedsheet,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/random{
pixel_x = -32;
pixel_y = 0
pixel_x = -32
},
/turf/open/floor/plasteel/grimy,
/area/ship/crew/dorm)
Expand Down Expand Up @@ -4497,9 +4477,7 @@
/turf/open/floor/plasteel/grimy,
/area/ship/crew/dorm)
"Lu" = (
/obj/machinery/power/smes/shuttle/precharged{
dir = 4
},
/obj/machinery/power/smes/shuttle/precharged,
/obj/structure/cable{
icon_state = "0-8"
},
Expand Down Expand Up @@ -5078,9 +5056,7 @@
/turf/open/floor/plasteel,
/area/ship/medical)
"PP" = (
/obj/machinery/atmospherics/components/unary/shuttle/heater{
dir = 4
},
/obj/machinery/atmospherics/components/unary/shuttle/heater,
/obj/machinery/door/poddoor{
dir = 4;
id = "shetportthrusters"
Expand Down Expand Up @@ -5250,9 +5226,7 @@
/turf/open/floor/plasteel,
/area/ship/hallway/fore)
"QV" = (
/obj/machinery/atmospherics/components/unary/shuttle/heater{
dir = 4
},
/obj/machinery/atmospherics/components/unary/shuttle/heater,
/obj/machinery/door/poddoor{
dir = 4;
id = "shetstarboardengine"
Expand Down Expand Up @@ -5537,6 +5511,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
/obj/effect/mapping_helpers/crate_shelve,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/cargo)
"Tk" = (
Expand Down Expand Up @@ -5861,9 +5836,7 @@
id = "shetland_cargo";
locked = 1
},
/obj/structure/cable{
icon_state = "0-1"
},
/obj/structure/cable,
/turf/open/floor/plasteel/patterned/ridged,
/area/ship/cargo)
"Ws" = (
Expand Down Expand Up @@ -6104,9 +6077,7 @@
/area/ship/crew/dorm)
"YA" = (
/obj/machinery/power/smes/engineering,
/obj/structure/cable{
icon_state = "0-1"
},
/obj/structure/cable,
/turf/open/floor/plating,
/area/ship/engineering/electrical)
"YN" = (
Expand Down Expand Up @@ -6223,8 +6194,7 @@
},
/obj/structure/curtain,
/obj/structure/sign/poster/random{
pixel_x = -32;
pixel_y = 0
pixel_x = -32
},
/turf/open/floor/plasteel/white,
/area/ship/medical)
Expand Down Expand Up @@ -6264,9 +6234,7 @@
/turf/open/floor/plasteel/patterned,
/area/ship/crew/cryo)
"ZT" = (
/obj/structure/cable{
icon_state = "0-1"
},
/obj/structure/cable,
/obj/structure/cable{
icon_state = "8-9"
},
Expand Down
Loading

0 comments on commit 71ce1f6

Please sign in to comment.