Skip to content

Commit

Permalink
N+S Mine Change (shiptest-ss13#3959)
Browse files Browse the repository at this point in the history
## About The Pull Request
N+S Mine ruin now has a vein filled with hydrogen ice in place of
minerals

Mining scanners now tell you they detect ore rather than
/obj/item/stack/ore


## Changelog

:cl:
add: N+S Mine ruin now has ice for mining
fix: Mining Scanner feedback better
/:cl:
  • Loading branch information
Erikafox authored Jan 8, 2025
1 parent 9bb9661 commit b9cc7f5
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 19 deletions.
20 changes: 11 additions & 9 deletions _maps/RandomRuins/RockRuins/rockplanet_mining_installation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,11 @@
/turf/open/floor/mineral/titanium/tiled/rockplanet,
/area/overmap_encounter/planetoid/cave/explored)
"bx" = (
/obj/structure/vein/classtwo,
/obj/effect/turf_decal/box,
/obj/effect/decal/cleanable/dirt,
/obj/structure/vein/classtwo{
mining_charges = 60
},
/turf/open/floor/plating/asteroid/rockplanet/wet/cracked,
/area/ruin/rockplanet/mining_base/rig_two)
"bC" = (
Expand Down Expand Up @@ -3697,7 +3699,8 @@
/turf/open/floor/plating/asteroid/rockplanet/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
"tP" = (
/obj/machinery/mineral/processing_unit,
/obj/structure/catwalk/over/plated_catwalk,
/obj/structure/railing,
/turf/open/floor/plating,
/area/ruin/rockplanet/mining_base/refinery)
"tQ" = (
Expand Down Expand Up @@ -4091,7 +4094,6 @@
/area/overmap_encounter/planetoid/rockplanet/explored)
"wz" = (
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/structure/closet/crate,
/turf/open/floor/plating,
/area/ruin/rockplanet/mining_base/refinery)
"wC" = (
Expand Down Expand Up @@ -5416,6 +5418,7 @@
/obj/structure/platform/corner{
dir = 1
},
/obj/structure/closet/crate,
/turf/open/floor/plating,
/area/ruin/rockplanet/mining_base/refinery)
"CZ" = (
Expand Down Expand Up @@ -9303,9 +9306,6 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/effect/turf_decal/industrial/radiation{
dir = 1
},
/turf/open/floor/concrete/slab_4,
/area/ruin/rockplanet/mining_base/engineering)
"Yk" = (
Expand Down Expand Up @@ -9619,7 +9619,9 @@
/obj/structure/vein/classthree{
mining_charges = 80;
max_mobs = 18;
spawn_distance_max = 7
spawn_distance_max = 7;
ore_list = list(/obj/item/stack/ore/ice = 10);
vein_contents = list(/obj/item/stack/ore/ice)
},
/obj/effect/turf_decal/box,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -12074,11 +12076,11 @@ at
Eq
xj
ew
MM
tP
wI
wz
xc
tP
xc
xc
xc
hu
Expand Down
20 changes: 10 additions & 10 deletions code/modules/mining/equipment/mineral_scanner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -219,24 +219,24 @@
return located_vein

//For scanning ore veins of their contents
/obj/item/pinpointer/mineral/afterattack(obj/structure/vein/O, mob/user, proximity)
/obj/item/pinpointer/mineral/afterattack(obj/structure/vein/our_vein, mob/user, proximity)
. = ..()
if(!proximity || !istype(O,/obj/structure/vein))
if(!proximity || !istype(our_vein,/obj/structure/vein))
return
playsound(src, 'sound/effects/fastbeep.ogg', 10)
if(user.a_intent == INTENT_HARM)
if(O.detectable == TRUE)
if(our_vein.detectable == TRUE)
to_chat(user,span_notice("You blacklist the vein from the scanner's telemetry, and will no longer be detected as a site of interest to the scanner."))
O.detectable = FALSE
our_vein.detectable = FALSE
return
else
to_chat(user,span_notice("You mark vein into the scanner's telemetry, allowing it be located by underground scans."))
O.detectable = TRUE
our_vein.detectable = TRUE
return

if(O.vein_contents.len > 0)
to_chat(user, "<span class='notice'>Class [O.vein_class] ore vein with [O.mining_charges] possible ore lodes found.</span>")
for(var/re in O.vein_contents)
to_chat(user, "<span class='notice'>\tExtractable amounts of [re].</span>")
if(our_vein.vein_contents.len > 0)
to_chat(user, "<span class='notice'>Class [our_vein.vein_class] ore vein with [our_vein.mining_charges] possible ore lodes found.</span>")
for(var/our_ore in our_vein.vein_contents)
to_chat(user, "<span class='notice'>\tExtractable amounts of [our_ore?:name].</span>")
else
to_chat(user, "<span class='notice'>No notable mineral deposits found in [O].</span>")
to_chat(user, "<span class='notice'>No notable mineral deposits found in [our_vein].</span>")

0 comments on commit b9cc7f5

Please sign in to comment.