Skip to content

Commit

Permalink
Removes ORM from non-mining/salvage ships. (#3235)
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
Removes the ORM from Beluga, Box, Schmiedeberg, Colossus, Skipper and
Kansatsu.

Aspawn ships, Hyena and Gecko still have it, because:
- Hyena is a mining/salvage ship, so it needs it.
- Gecko is a salvage ship, so it needs it.
- I've been told not to touch aspawn ships.

<!-- 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
They have no reason to have an ORM! They are not mining/salvage-centered
ships, so they can totally go to the outpost to refine their ore!
(it's a Dwayne buff in disguise :3)
<!-- 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:
del: Beluga-class, Box-class, Schmiedeberg-class, Colossus-class,
Skipper-class and Kansatsu-class lost their Ore Redemption Machines.
/: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. -->
  • Loading branch information
Sadhorizon authored Nov 3, 2024
1 parent 4690d39 commit 39a673e
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 28 deletions.
8 changes: 1 addition & 7 deletions _maps/shuttles/independent/independent_beluga.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@
/obj/effect/turf_decal/industrial/traffic/corner{
dir = 8
},
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/light/directional/east,
/obj/machinery/button/shieldwallgen{
dir = 1;
Expand All @@ -257,12 +256,7 @@
pixel_y = -23;
dir = 1
},
/obj/machinery/mineral/ore_redemption{
dir = 8;
input_dir = 8;
output_dir = 8
},
/turf/open/floor/plasteel/tech,
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
"cW" = (
/obj/effect/turf_decal/industrial/outline/yellow,
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/independent/independent_box.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1269,7 +1269,6 @@
/obj/structure/rack,
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/item/storage/box/lights/bulbs,
/obj/item/circuitboard/machine/ore_redemption,
/obj/item/pickaxe/emergency,
/obj/item/storage/box/lights/mixed,
/obj/item/stack/sheet/mineral/plasma/twenty,
Expand Down
6 changes: 1 addition & 5 deletions _maps/shuttles/independent/independent_schmiedeberg.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,6 @@
dir = 1
},
/area/ship/engineering)
"de" = (
/obj/machinery/mineral/ore_redemption,
/turf/open/floor/plating,
/area/ship/security)
"dr" = (
/obj/effect/turf_decal/siding/blue{
dir = 1
Expand Down Expand Up @@ -3634,7 +3630,7 @@ hN
OO
GY
rH
de
OO
OK
Td
wh
Expand Down
10 changes: 4 additions & 6 deletions _maps/shuttles/inteq/inteq_colossus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3365,8 +3365,7 @@
/area/ship/maintenance/port)
"Lx" = (
/obj/structure/closet/crate,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"Lz" = (
Expand Down Expand Up @@ -3554,11 +3553,10 @@
/turf/open/floor/plasteel/tech,
/area/ship/crew/cryo)
"NX" = (
/obj/machinery/mineral/ore_redemption{
dir = 1;
output_dir = 1
},
/obj/effect/turf_decal/borderfloorblack,
/obj/structure/rack,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/metal/fifty,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"Oa" = (
Expand Down
13 changes: 4 additions & 9 deletions _maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1100,9 +1100,6 @@
/turf/open/floor/plating,
/area/ship/engineering)
"zO" = (
/obj/effect/turf_decal/arrows{
dir = 4
},
/obj/effect/turf_decal/industrial/warning/corner{
dir = 8
},
Expand Down Expand Up @@ -1593,13 +1590,11 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/cargo)
"Pk" = (
/obj/machinery/mineral/ore_redemption{
dir = 8;
input_dir = 8;
output_dir = null
},
/obj/effect/turf_decal/box,
/obj/machinery/airalarm/directional/east,
/obj/structure/table,
/obj/item/storage/toolbox/ammo{
pixel_y = 4
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/cargo)
"Qa" = (
Expand Down

0 comments on commit 39a673e

Please sign in to comment.