Skip to content

Commit

Permalink
Unloading machines no longer pick up ice (shiptest-ss13#4317)
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

Fixes shiptest-ss13#4154
Fixes shiptest-ss13#4155

See title, unloading machines don't automatically move ice onto the
furnace belt. Should reduce mishaps, especially with ore boxes. However,
if ice ends up on the belt regardless, it will still be melted by the
furnace.

Also slight movement of the electrolyzer on the indie outpost, as well
as making both levers one-way and decal'd.


![image](https://github.com/user-attachments/assets/299e2db1-d353-42da-9246-b6f7beff9a4b)

<!-- 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

Makes less mistakes of accidentally melting the ice that your
well-insured deckhands have died mining for.

<!-- 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:
fix: unloading machines no longer pick up ice
/: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
@Ical92
Ical92 authored Mar 5, 2025
1 parent 20d9fa5 commit 150b39b
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 42 deletions.
60 changes: 20 additions & 40 deletions _maps/outpost/indie_space.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,6 @@
},
/obj/machinery/elevator_call_button{
dir = 4;
pixel_y = 0;
pixel_x = -22
},
/obj/effect/turf_decal/siding/thinplating/dark{
Expand Down Expand Up @@ -2982,7 +2981,6 @@
},
/obj/structure/sign/directions/supply{
dir = 1;
pixel_y = 0;
pixel_x = 28
},
/obj/structure/sign/directions/security{
Expand Down Expand Up @@ -3307,15 +3305,17 @@
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"qc" = (
/obj/machinery/conveyor_switch{
id = "outpost2";
layer = 3.11;
pixel_y = 9;
pixel_x = -2
},
/obj/structure/railing/thin{
dir = 9
},
/obj/effect/turf_decal/industrial/shutoff{
dir = 4
},
/obj/machinery/conveyor_switch/oneway{
pixel_y = 8;
layer = 3.09;
id = "outpost2"
},
/turf/open/floor/plasteel/patterned,
/area/outpost/cargo)
"qe" = (
Expand Down Expand Up @@ -3700,7 +3700,6 @@
dir = 4
},
/obj/structure/sign/poster/random{
pixel_y = 0;
pixel_x = -28
},
/turf/open/floor/wood,
Expand Down Expand Up @@ -3803,7 +3802,6 @@
/obj/structure/noticeboard{
name = "refinery notice board";
dir = 8;
pixel_y = 0;
pixel_x = 26
},
/obj/effect/turf_decal/corner/opaque/white{
Expand Down Expand Up @@ -4439,7 +4437,6 @@
/area/outpost/cargo)
"wa" = (
/obj/structure/sign/painting/library{
pixel_y = 0;
pixel_x = -26
},
/obj/effect/decal/cleanable/wrapping,
Expand Down Expand Up @@ -4519,7 +4516,6 @@
"ws" = (
/obj/structure/sink{
dir = 8;
pixel_y = 0;
pixel_x = 14
},
/obj/structure/mirror{
Expand Down Expand Up @@ -4934,7 +4930,6 @@
/area/outpost/crew/bar)
"yH" = (
/obj/structure/railing/wood{
dir = 2;
color = "#792f27"
},
/turf/open/floor/plasteel/stairs/wood{
Expand Down Expand Up @@ -5457,9 +5452,7 @@
/turf/open/floor/carpet/green,
/area/outpost/crew/bar)
"Bg" = (
/obj/structure/closet/crate/bin{
pixel_y = 0
},
/obj/structure/closet/crate/bin,
/obj/machinery/light/small/directional/east,
/obj/effect/decal/cleanable/insectguts,
/obj/item/reagent_containers/syringe{
Expand Down Expand Up @@ -6314,7 +6307,6 @@
"FK" = (
/obj/structure/toilet{
dir = 4;
pixel_y = 0;
pixel_x = -6
},
/obj/structure/mirror{
Expand Down Expand Up @@ -6359,7 +6351,6 @@
"FY" = (
/obj/effect/decal/cleanable/crayon{
icon_state = "electricdanger";
pixel_y = 0;
pixel_x = 30
},
/obj/effect/turf_decal/steeldecal/steel_decals10,
Expand Down Expand Up @@ -6475,12 +6466,10 @@
/obj/effect/decal/cleanable/cobweb,
/obj/effect/decal/cleanable/crayon{
icon_state = "f";
pixel_y = 0;
pixel_x = -19
},
/obj/effect/decal/cleanable/crayon{
icon_state = "f";
pixel_y = 0;
pixel_x = -19
},
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -6751,7 +6740,6 @@
},
/obj/effect/decal/cleanable/crayon{
icon_state = "f";
pixel_y = 0;
pixel_x = -19
},
/obj/effect/decal/cleanable/crayon{
Expand Down Expand Up @@ -7461,8 +7449,7 @@
},
/obj/structure/sign/directions/medical{
pixel_y = -12;
pixel_x = -28;
dir = 2
pixel_x = -28
},
/obj/structure/cable/yellow{
icon_state = "1-2"
Expand Down Expand Up @@ -7530,7 +7517,6 @@
dir = 4
},
/obj/effect/decal/cleanable/crayon{
icon_state = "firedanger";
pixel_y = -28
},
/turf/open/floor/plating,
Expand Down Expand Up @@ -7754,7 +7740,6 @@
/obj/structure/table,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/kitchen/fork{
pixel_y = 0;
pixel_x = -7
},
/obj/item/kitchen/fork{
Expand Down Expand Up @@ -9215,7 +9200,6 @@
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/structure/sign/directions/medical{
pixel_x = 28;
dir = 2;
pixel_y = -10
},
/obj/structure/cable/yellow{
Expand Down Expand Up @@ -9246,17 +9230,6 @@
},
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"UR" = (
/obj/structure/table/reinforced,
/obj/machinery/conveyor_switch{
id = "outpost1";
layer = 3.11;
pixel_y = 4;
pixel_x = 5
},
/obj/structure/railing/thin,
/turf/open/floor/plasteel/patterned,
/area/outpost/cargo)
"UT" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
Expand Down Expand Up @@ -9665,6 +9638,14 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
},
/obj/effect/turf_decal/industrial/shutoff{
dir = 4
},
/obj/machinery/conveyor_switch/oneway{
pixel_y = 8;
layer = 3.09;
id = "outpost1"
},
/turf/open/floor/plasteel/patterned,
/area/outpost/cargo)
"WX" = (
Expand Down Expand Up @@ -10206,8 +10187,7 @@
pixel_y = 32
},
/obj/structure/sign/directions/medical{
pixel_y = 38;
dir = 2
pixel_y = 38
},
/obj/structure/sign/directions/service{
pixel_y = 20;
Expand Down Expand Up @@ -19166,7 +19146,7 @@ Va
QJ
CV
CV
UR
kp
SK
pc
Uw
Expand Down
6 changes: 4 additions & 2 deletions code/modules/mining/machine_unloading.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
if(istype(target, /obj/structure/ore_box))
var/obj/structure/ore_box/box = target
for(var/obj/item/stack/ore/O in box)
unload_mineral(O)
if(!istype(O, /obj/item/stack/ore/ice)) // Doesn't automatically unload ice, other machines will still process (or melt) the ice normally.
unload_mineral(O)
else if(istype(target, /obj/item/stack/ore))
var/obj/item/stack/ore/O = target
unload_mineral(O)
if(!istype(O, /obj/item/stack/ore/ice))
unload_mineral(O)

0 comments on commit 150b39b

Please sign in to comment.