From 7584df22b8d637326495855e1bca6b9ee73362b6 Mon Sep 17 00:00:00 2001 From: Archie Date: Tue, 22 Jun 2021 03:03:27 -0300 Subject: [PATCH 1/6] RBMK Fixes --- code/modules/cargo/packs/engine.dm | 3 ++- hyperstation/code/modules/power/reactor/reactor_cargo.dm | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/cargo/packs/engine.dm b/code/modules/cargo/packs/engine.dm index af9669de..7a3e53dd 100644 --- a/code/modules/cargo/packs/engine.dm +++ b/code/modules/cargo/packs/engine.dm @@ -225,7 +225,8 @@ contains = list(/obj/item/survivalcapsule/reactor, /obj/machinery/computer/reactor/control_rods/cargo, /obj/machinery/computer/reactor/stats/cargo, - /obj/machinery/computer/reactor/fuel_rods/cargo) + /obj/machinery/computer/reactor/fuel_rods/cargo, + /obj/item/paper/fluff/rbmkcargo) crate_name = "Build Your Own Reactor Kit" crate_type = /obj/structure/closet/crate/secure/engineering dangerous = TRUE diff --git a/hyperstation/code/modules/power/reactor/reactor_cargo.dm b/hyperstation/code/modules/power/reactor/reactor_cargo.dm index 20a770d2..6abaa01a 100644 --- a/hyperstation/code/modules/power/reactor/reactor_cargo.dm +++ b/hyperstation/code/modules/power/reactor/reactor_cargo.dm @@ -9,12 +9,13 @@ if(istype(I)) to_chat(user, "You add the reactor's ID to \the [src]>") src.id = I.buffer + link_to_reactor() return TRUE /obj/machinery/atmospherics/components/trinary/nuclear_reactor/cargo // easier on the brain /obj/machinery/atmospherics/components/trinary/nuclear_reactor/cargo/New() - id = rand(1, 1000000) // cmon, what are the chances? + id = rand(1, 9999999) // cmon, what are the chances? // Cargo varients can be wrenched down and don't start linked to the default RMBK reactor @@ -29,3 +30,7 @@ /obj/machinery/computer/reactor/fuel_rods/cargo anchored = FALSE id = null + +/obj/item/paper/fluff/rbmkcargo + name = "Nuclear Reactor Instructions" + info = "Make sure a 5x5 area is completely clear of pipes, cables and machinery when using the beacon. Those will be provided automatically with the beacon's bluespace decompression. Use a multitool on the reactor then on the computers provided to link them together. Good luck!" From 3e08f0b634a75d1c438996bdc78940376add4d09 Mon Sep 17 00:00:00 2001 From: Archie Date: Tue, 22 Jun 2021 03:04:26 -0300 Subject: [PATCH 2/6] Good luck --- hyperstation/code/modules/power/reactor/reactor_cargo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyperstation/code/modules/power/reactor/reactor_cargo.dm b/hyperstation/code/modules/power/reactor/reactor_cargo.dm index 6abaa01a..0f3a354f 100644 --- a/hyperstation/code/modules/power/reactor/reactor_cargo.dm +++ b/hyperstation/code/modules/power/reactor/reactor_cargo.dm @@ -33,4 +33,4 @@ /obj/item/paper/fluff/rbmkcargo name = "Nuclear Reactor Instructions" - info = "Make sure a 5x5 area is completely clear of pipes, cables and machinery when using the beacon. Those will be provided automatically with the beacon's bluespace decompression. Use a multitool on the reactor then on the computers provided to link them together. Good luck!" + info = "Make sure a 5x5 area is completely clear of pipes, cables and machinery when using the beacon. Those will be provided automatically with the beacon's bluespace decompression. Use a multitool on the reactor then on the computers provided to link them together. Also make sure the reactor has a proper pipeline filled with cooling gas before inserting fuel rods. Good luck!" From f5110eb1f4c245cc55e420473d7d7db0cec29169 Mon Sep 17 00:00:00 2001 From: Archie Date: Tue, 22 Jun 2021 03:44:26 -0300 Subject: [PATCH 3/6] Graphical Issue --- _maps/templates/reactor_1.dmm | 42 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/_maps/templates/reactor_1.dmm b/_maps/templates/reactor_1.dmm index b0274d9c..536d0839 100644 --- a/_maps/templates/reactor_1.dmm +++ b/_maps/templates/reactor_1.dmm @@ -1,10 +1,10 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /obj/effect/turf_decal/stripes/red/corner{ - dir = 4 + dir = 8 }, /turf/open/floor/engine, -/area/space) +/area/engine/engineering/reactor_core) "b" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 4 @@ -15,44 +15,44 @@ pixel_y = 10 }, /turf/open/floor/engine, -/area/space) +/area/engine/engineering/reactor_core) "c" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 4 }, /turf/open/floor/engine, -/area/space) +/area/engine/engineering/reactor_core) "d" = ( /obj/structure/cable/yellow, /obj/machinery/atmospherics/components/trinary/nuclear_reactor/cargo, /turf/open/floor/engine, -/area/space) +/area/engine/engineering/reactor_core) "e" = ( /obj/effect/turf_decal/stripes/red/corner{ - dir = 1 + dir = 4 }, /turf/open/floor/engine, -/area/space) +/area/engine/engineering/reactor_core) "f" = ( /obj/machinery/atmospherics/pipe/simple/cyan{ dir = 4 }, /turf/open/floor/engine, -/area/space) +/area/engine/engineering/reactor_core) "g" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/purple, /turf/open/floor/engine, -/area/space) +/area/engine/engineering/reactor_core) "h" = ( /turf/open/floor/engine, -/area/space) +/area/engine/engineering/reactor_core) "s" = ( /obj/effect/turf_decal/stripes/red/corner, /turf/open/floor/engine, -/area/space) +/area/engine/engineering/reactor_core) "t" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 8 @@ -63,54 +63,54 @@ pixel_y = 10 }, /turf/open/floor/engine, -/area/space) +/area/engine/engineering/reactor_core) "B" = ( /obj/effect/turf_decal/stripes/red/corner{ - dir = 8 + dir = 1 }, /turf/open/floor/engine, -/area/space) +/area/engine/engineering/reactor_core) "G" = ( /obj/machinery/atmospherics/pipe/simple/cyan{ dir = 4 }, /turf/open/floor/plating, -/area/space) +/area/engine/engineering/reactor_core) "M" = ( /obj/effect/turf_decal/stripes/red/line, /turf/open/floor/engine, -/area/space) +/area/engine/engineering/reactor_core) "O" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers{ dir = 4 }, /turf/open/floor/plating, -/area/space) +/area/engine/engineering/reactor_core) "P" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 8 }, /turf/open/floor/engine, -/area/space) +/area/engine/engineering/reactor_core) "V" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 1 }, /turf/open/floor/engine, -/area/space) +/area/engine/engineering/reactor_core) "Y" = ( /obj/structure/cable/yellow{ icon_state = "0-2" }, /obj/machinery/atmospherics/pipe/simple/purple, /turf/open/floor/plating, -/area/space) +/area/engine/engineering/reactor_core) "Z" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers{ dir = 4 }, /turf/open/floor/engine, -/area/space) +/area/engine/engineering/reactor_core) (1,1,1) = {" s From 29855b171c7dba8428d1945befc893cadae3e243 Mon Sep 17 00:00:00 2001 From: Archie Date: Tue, 22 Jun 2021 04:21:43 -0300 Subject: [PATCH 4/6] Some changes --- hyperstation/code/modules/power/reactor/rbmk.dm | 6 ++++++ hyperstation/code/modules/power/reactor/reactor_cargo.dm | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hyperstation/code/modules/power/reactor/rbmk.dm b/hyperstation/code/modules/power/reactor/rbmk.dm index 6ab02719..dbecd310 100644 --- a/hyperstation/code/modules/power/reactor/rbmk.dm +++ b/hyperstation/code/modules/power/reactor/rbmk.dm @@ -581,6 +581,12 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful . = ..() addtimer(CALLBACK(src, .proc/link_to_reactor), 10 SECONDS) +/obj/machinery/computer/reactor/wrench_act(mob/living/user, obj/item/I) + to_chat(user, "You start [anchored ? "un" : ""]securing [name]...") + if(I.use_tool(src, user, 40, volume=75)) + to_chat(user, "You [anchored ? "un" : ""]secure [name].") + setAnchored(!anchored) + /obj/machinery/computer/reactor/proc/link_to_reactor() for(var/obj/machinery/atmospherics/components/trinary/nuclear_reactor/asdf in GLOB.machines) if(asdf.id && asdf.id == id) diff --git a/hyperstation/code/modules/power/reactor/reactor_cargo.dm b/hyperstation/code/modules/power/reactor/reactor_cargo.dm index 0f3a354f..5548e88f 100644 --- a/hyperstation/code/modules/power/reactor/reactor_cargo.dm +++ b/hyperstation/code/modules/power/reactor/reactor_cargo.dm @@ -15,9 +15,10 @@ /obj/machinery/atmospherics/components/trinary/nuclear_reactor/cargo // easier on the brain /obj/machinery/atmospherics/components/trinary/nuclear_reactor/cargo/New() - id = rand(1, 9999999) // cmon, what are the chances? + . = ..() + id = rand(1, 9999999) // cmon, what are the chances? The chances are... Very low friend... But maybe we can make this a bit better. -// Cargo varients can be wrenched down and don't start linked to the default RMBK reactor +// Cargo variants can be wrenched down and don't start linked to the default RMBK reactor /obj/machinery/computer/reactor/control_rods/cargo anchored = FALSE From 6fd16a596fe8560f9ef96344d155d52e5e417ae5 Mon Sep 17 00:00:00 2001 From: Archie Date: Tue, 22 Jun 2021 04:35:45 -0300 Subject: [PATCH 5/6] Return --- hyperstation/code/modules/power/reactor/rbmk.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/hyperstation/code/modules/power/reactor/rbmk.dm b/hyperstation/code/modules/power/reactor/rbmk.dm index dbecd310..2381c070 100644 --- a/hyperstation/code/modules/power/reactor/rbmk.dm +++ b/hyperstation/code/modules/power/reactor/rbmk.dm @@ -586,6 +586,7 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful if(I.use_tool(src, user, 40, volume=75)) to_chat(user, "You [anchored ? "un" : ""]secure [name].") setAnchored(!anchored) + return TRUE /obj/machinery/computer/reactor/proc/link_to_reactor() for(var/obj/machinery/atmospherics/components/trinary/nuclear_reactor/asdf in GLOB.machines) From bfa3ac9bf3c9c05fb400502b62bfce53ab6d81ec Mon Sep 17 00:00:00 2001 From: Archie Date: Tue, 22 Jun 2021 04:36:09 -0300 Subject: [PATCH 6/6] nope --- hyperstation/code/modules/power/reactor/rbmk.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hyperstation/code/modules/power/reactor/rbmk.dm b/hyperstation/code/modules/power/reactor/rbmk.dm index 2381c070..948a6598 100644 --- a/hyperstation/code/modules/power/reactor/rbmk.dm +++ b/hyperstation/code/modules/power/reactor/rbmk.dm @@ -586,7 +586,8 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful if(I.use_tool(src, user, 40, volume=75)) to_chat(user, "You [anchored ? "un" : ""]secure [name].") setAnchored(!anchored) - return TRUE + return TRUE + return FALSE /obj/machinery/computer/reactor/proc/link_to_reactor() for(var/obj/machinery/atmospherics/components/trinary/nuclear_reactor/asdf in GLOB.machines)