Skip to content

Commit

Permalink
New power for lavaland base, and some mining locker cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
TheLordME committed Sep 23, 2024
1 parent 102cb6f commit c0f485b
Show file tree
Hide file tree
Showing 8 changed files with 437 additions and 765 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,12 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/miner,
/obj/item/clothing/shoes/boots/winter/mining,
/obj/item/reagent_containers/portable_fuelcan/miniature,
/obj/item/stack/marker_beacon/thirty)
/obj/item/stack/marker_beacon/thirty,
/obj/item/gun/energy/kinetic_accelerator)

/obj/structure/closet/secure_closet/miner/Initialize(mapload)
if(prob(50))
starts_with += /obj/item/storage/backpack/industrial
else
starts_with += /obj/item/storage/backpack/satchel/eng
return ..()

/obj/structure/closet/secure_closet/miner/Initialize(mapload)
starts_with += /obj/item/gps/mining
return ..()
9 changes: 9 additions & 0 deletions code/modules/power/geothermal_power.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@
var/active_for = -1
var/power_total = 0

/obj/machinery/power/geothermal_controller/prepared/Initialize(mapload)
. = ..()
scanner = new()
return INITIALIZE_HINT_LATELOAD

/obj/machinery/power/geothermal_controller/prepared/LateInitialize()
. = ..()
scan_for_collectors(scanner?.range)

/obj/machinery/power/geothermal_controller/examine(mob/user, dist)
. = ..()
if(isrobot(user) && !scanner)
Expand Down
14 changes: 2 additions & 12 deletions maps/rift/levels/rift-02-underground2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7327,14 +7327,12 @@
/area/crew_quarters/heads/chief)
"Ap" = (
/obj/item/clothing/mask/breath,
/obj/item/mining_scanner,
/obj/item/tank/oxygen,
/obj/machinery/air_alarm{
pixel_y = 22
},
/obj/structure/table/rack/shelf,
/obj/item/clothing/mask/gas,
/obj/item/storage/bag/ore,
/turf/simulated/floor/tiled/techmaint,
/area/quartermaster/belterdock/gear)
"Aq" = (
Expand Down Expand Up @@ -8813,7 +8811,6 @@
/area/crew_quarters/heads/chief)
"Gw" = (
/obj/structure/closet/secure_closet/miner,
/obj/item/gun/energy/kinetic_accelerator,
/turf/simulated/floor/tiled/techmaint,
/area/quartermaster/belterdock/gear)
"Gx" = (
Expand Down Expand Up @@ -9237,9 +9234,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/obj/machinery/camera/network/engineering{
dir = 2
},
/obj/machinery/camera/network/engineering,
/obj/effect/floor_decal/borderfloor{
dir = 1
},
Expand Down Expand Up @@ -9858,11 +9853,9 @@
/area/engineering/atmos/hallway)
"KI" = (
/obj/item/clothing/mask/breath,
/obj/item/mining_scanner,
/obj/item/tank/oxygen,
/obj/structure/table/rack/shelf,
/obj/item/clothing/mask/gas,
/obj/item/storage/bag/ore,
/turf/simulated/floor/tiled/techmaint,
/area/quartermaster/belterdock/gear)
"KJ" = (
Expand Down Expand Up @@ -12164,7 +12157,6 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor/glass{
dir = 2;
req_one_access = list(18,47)
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
Expand Down Expand Up @@ -12203,9 +12195,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/camera/network/engineering{
dir = 2
},
/obj/machinery/camera/network/engineering,
/obj/structure/disposalpipe/segment{
dir = 4
},
Expand Down
2 changes: 0 additions & 2 deletions maps/rift/levels/rift-09-west_caves.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1261,7 +1261,6 @@
/obj/machinery/light{
dir = 4
},
/obj/item/gun/energy/kinetic_accelerator,
/turf/simulated/floor/tiled/steel_grid,
/area/outpost/mining_main/outpost/storage)
"oM" = (
Expand Down Expand Up @@ -3319,7 +3318,6 @@
"MR" = (
/obj/structure/closet/secure_closet/miner,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/item/gun/energy/kinetic_accelerator,
/turf/simulated/floor/tiled/steel_grid,
/area/outpost/mining_main/outpost/storage)
"Nc" = (
Expand Down
Loading

0 comments on commit c0f485b

Please sign in to comment.