cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 15:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1315 from ArchieBeepBoop/rbmkfixes

Browse Source 
Fixes some issues with the cargo RBMK / Gas nuclear reactors
This commit is contained in:
Dahlular
2021-06-22 22:37:48 -06:00
committed by GitHub
parent 2f70e930ed bfa3ac9bf3
commit 358b3cf0c0
4 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
_maps/templates/reactor_1.dmm
View File

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

3
code/modules/cargo/packs/engine.dm
View File

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

8
hyperstation/code/modules/power/reactor/rbmk.dm
View File

@@ -581,6 +581,14 @@ 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, "<span class='notice'>You start [anchored ? "un" : ""]securing [name]...</span>")
if(I.use_tool(src, user, 40, volume=75))
to_chat(user, "<span class='notice'>You [anchored ? "un" : ""]secure [name].</span>")
setAnchored(!anchored)
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)
if(asdf.id && asdf.id == id)

10
hyperstation/code/modules/power/reactor/reactor_cargo.dm
View File

@@ -9,14 +9,16 @@
if(istype(I))
to_chat(user, "<span class='notice'>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? 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
@@ -29,3 +31,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. Also make sure the reactor has a proper pipeline filled with cooling gas before inserting fuel rods. Good luck!"