Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

assorted fission reactor typofixes #37438

Merged
merged 9 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions code/datums/supply_packs/engineering.dm
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@
containername = "Fission reactor starter kit"
group = "Engineering"
access = list(access_engine_major)
containsdesc = "Everything you need to build a very basic fission reactor. Comes with a pre-filled (albeit small) fuel rod."
containsdesc = "Everything you need to build a very basic fission reactor. Comes with a pre-filled (albeit small) fuel reservoir."

/datum/supply_packs/fissionreactor_expansion
contains = list(
Expand All @@ -475,16 +475,16 @@
contains = list(
/obj/item/weapon/fuelrod/large
)
name = "High-capacity fuel rod"
name = "High-capacity fuel reservoir"
cost = 100 //It's a one time purchance, really. somewhat costy, but not that much for a department. watch for meltdowns.
containertype = /obj/structure/closet/crate/secure/large/reinforced/shard/empty
containername = "Large fuel rod"
containername = "Large fuel reservoir"
group = "Engineering"
access = list(access_engine_major)
containsdesc = "An extra-large fuel rod, for extra power or for more complex fuel mixes. Use with extreme caution and control rods inserted."
containsdesc = "An extra-large fuel reservoir, for extra power or for more complex fuel mixes. Use with extreme caution and control rods inserted."







2 changes: 1 addition & 1 deletion code/game/objects/items/stacks/stack_recipes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ var/list/datum/stack_recipe/plasteel_recipes = list (
new/datum/stack_recipe("Reinforced machine frame", /obj/machinery/constructable_frame/machine_frame/reinforced, 5, time = 60, one_per_turf = 1 ),
null,
new/datum/stack_recipe("Reactor casing frame", /obj/structure/girder/reactor, 4, time = 50, one_per_turf = 1 ),
new/datum/stack_recipe("Reactor fuel rod", /obj/item/weapon/fuelrod, 2, time = 25),
new/datum/stack_recipe("Reactor fuel reservoir", /obj/item/weapon/fuelrod, 2, time = 25),
)

/* ====================================================================
Expand Down
190 changes: 95 additions & 95 deletions code/game/objects/items/weapons/manuals.dm

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions code/modules/fissionreactor/fuelmaker.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
in this file:
the machine which makes fuel rods have things in them.
the machine which makes fuel reservoirs have things in them.
*/

//because radon is a gas, we need to interface with gasses. yeah, this kind of sucks, but what are you gonna do? (inb4 make better code lol)
Expand Down Expand Up @@ -33,11 +33,11 @@ the machine which makes fuel rods have things in them.
/obj/machinery/atmospherics/unary/fissionfuelmaker/attackby(var/obj/item/I,var/mob/user)
if(istype(I,/obj/item/weapon/fuelrod))
if(heldrod)
to_chat(user,"There's already a fuel rod inserted into \the [src].")
to_chat(user,"There's already a fuel reservoir inserted into \the [src].")
else
if(!user.drop_item(I))
return
to_chat(user,"You insert the fuel rod into \the [src].")
to_chat(user,"You insert the fuel reservoir into \the [src].")
I.forceMove(src)
heldrod=I
heldrod.fueldata.fuel=heldrod.fueldata.get_products() //process the fuel turning
Expand All @@ -48,7 +48,7 @@ the machine which makes fuel rods have things in them.
update_icon()
return
if(iscrowbar(I) && heldrod)
user.visible_message("<span class='notice'>[user] starts prying the fuel rod out of \the [src].</span>", "<span class='notice'>You start prying the fuel rod out of \the [src].</span>")
user.visible_message("<span class='notice'>[user] starts prying the fuel reservoir out of \the [src].</span>", "<span class='notice'>You start prying the fuel reservoir out of \the [src].</span>")
playsound(src,'sound/items/crowbar.ogg',50)
if(do_after(user, src,20))
heldrod.forceMove(loc)
Expand Down Expand Up @@ -134,7 +134,7 @@ the machine which makes fuel rods have things in them.
switch(href_list["action"])
if("eject_fuel")
if(!heldrod)
to_chat(hclient.client,"There's no fuel rod to eject.")
to_chat(hclient.client,"There's no fuel reservoir to eject.")
else
heldrod.forceMove(src.loc)
heldrod.update_icon()
Expand Down Expand Up @@ -168,7 +168,7 @@ the machine which makes fuel rods have things in them.

/obj/machinery/atmospherics/unary/fissionfuelmaker/proc/transfer_from_fuelrod(var/reagent_id,var/amount)
if(!heldrod)
return "no fuel rod"
return "no fuel reservoir"
if(reagent_id==RADON || reagent_id=="RADON")
if(air_contents)
var/actually_taken=heldrod.fueldata.take_shit_from(reagent_id,amount ,heldrod.fueldata.fuel)
Expand All @@ -190,7 +190,7 @@ the machine which makes fuel rods have things in them.

/obj/machinery/atmospherics/unary/fissionfuelmaker/proc/transfer_to_fuelrod(var/reagent_id,var/amount)
if(!heldrod)
return "no fuel rod"
return "no fuel reservoir"
if(reagent_id==RADON || reagent_id=="RADON")
if(air_contents)
var/avalible_gas=air_contents.gas[GAS_RADON] || 0
Expand Down Expand Up @@ -293,7 +293,7 @@ the machine which makes fuel rods have things in them.
</div>"}


html+={"<hr> <table style='width:100%;'><tr><td> Fuel Rod: [ heldrod ? "[heldrod.name] \[[current_rodamt]/[heldrod.units_of_storage]\]" : "none" ] <a href='?src=\ref[interface];action=eject_fuel'>Eject</a></td> <td style='text-align:right;'>Transfer To Container</td> </tr>"}
html+={"<hr> <table style='width:100%;'><tr><td> Fuel Reservoir: [ heldrod ? "[heldrod.name] \[[current_rodamt]/[heldrod.units_of_storage]\]" : "none" ] <a href='?src=\ref[interface];action=eject_fuel'>Eject</a></td> <td style='text-align:right;'>Transfer To Container</td> </tr>"}

if(heldrod)
for(var/datum/reagent/R in heldrod.fueldata.fuel.reagent_list)
Expand All @@ -302,7 +302,7 @@ the machine which makes fuel rods have things in them.


html+={"</table><hr><table style='width:100%;'><tr><td>
Container: [container ? container : "none"][container ? " \[[container.reagents.total_volume]/[container.volume]\]" : ""] <a href='?src=\ref[interface];action=eject_cont'>Eject</a></td><td style='text-align:right;'> Transfer To Fuel Rod</td> </tr>"}
Container: [container ? container : "none"][container ? " \[[container.reagents.total_volume]/[container.volume]\]" : ""] <a href='?src=\ref[interface];action=eject_cont'>Eject</a></td><td style='text-align:right;'> Transfer To Fuel Reservoir</td> </tr>"}

if(container)
for(var/datum/reagent/R in container.reagents.reagent_list)
Expand Down Expand Up @@ -344,9 +344,9 @@ Container: [container ? container : "none"][container ? " \[[container.reagents.
if(hatchopen)
to_chat(usr,"It looks like you could pry out the electronics.")
if(heldrod)
to_chat(usr,"There is a fuel rod inserted into it.")
to_chat(usr,"There is a fuel reservoir inserted into it.")
else
to_chat(usr,"The fuel rod receptacle is empty.")
to_chat(usr,"The fuel reservoir receptacle is empty.")



Expand Down
14 changes: 7 additions & 7 deletions code/modules/fissionreactor/items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ includes:


/obj/item/weapon/fuelrod
name="fuel rod"
desc="holds various reagents for use in nuclear reactions."
name="fuel reservoir"
desc="Holds various reagents for use in nuclear reactions."
icon='icons/obj/fissionreactor/items.dmi'
icon_state="i_fuelrod_empty"
var/datum/fission_fuel/fueldata=null
Expand All @@ -31,8 +31,8 @@ includes:


/obj/item/weapon/fuelrod/small
name="small fuel rod"
desc="a smaller fuel rod, for lower-power applications."
name="small fuel reservoir"
desc="A small container for lower-power applications."
icon_state="i_fuelrod_s_empty"
units_of_storage=30

Expand All @@ -45,9 +45,9 @@ includes:
icon_state="i_fuelrod_s[fueldata.life>0 ? "" : "_depleted"]"

/obj/item/weapon/fuelrod/large
name="large fuel rod"
name="large fuel reservoir"
icon_state="i_fuelrod_l_empty"
desc="a very large fuel rod, for high-power or complex mixes. use with caution."
desc="A very large container, for high-power or complex mixes. Use with caution."
units_of_storage=210

/obj/item/weapon/fuelrod/large/update_icon()
Expand All @@ -56,4 +56,4 @@ includes:
if(!fueldata)
return
if(fueldata.fuel.total_volume>0)
icon_state="i_fuelrod_l[fueldata.life>0 ? "" : "_depleted"]"
icon_state="i_fuelrod_l[fueldata.life>0 ? "" : "_depleted"]"
6 changes: 3 additions & 3 deletions code/modules/fissionreactor/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ boxes used for cargo orders to make my life easier.
new /obj/item/pipe(src,0) //1 pipe (optional)

/obj/item/weapon/storage/box/fissionsupply_fuelmaker
name="seperational isotopic combiner parts"
desc="Contains all the materials needed to assemble a seperational isotopic combiner."
name="separational isotopic combiner parts"
desc="Contains all the materials needed to assemble a separational isotopic combiner."

/obj/item/weapon/storage/box/fissionsupply_fuelmaker/New()
..()
Expand All @@ -71,4 +71,4 @@ boxes used for cargo orders to make my life easier.
fueldata.rederive_stats()
fueldata.life=1



28 changes: 14 additions & 14 deletions code/modules/fissionreactor/objects_external.dm
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,12 @@ included:
/obj/machinery/fissioncontroller/attackby(var/obj/I,var/mob/user)
if(istype(I,/obj/item/weapon/fuelrod))
if(currentfuelrod)
to_chat(user,"There's already a fuel rod inserted into \the [src].")
to_chat(user,"There's already a fuel reservoir inserted into \the [src].")
else
var/obj/item/weapon/fuelrod/newrod=I
if(!user.drop_item(newrod))
return
to_chat(user,"You insert the fuel rod into \the [src].")
to_chat(user,"You insert the fuel reservoir into \the [src].")
if(powered() && !(stat&BROKEN))
playsound(src,'sound/machines/fission/rc_fuelnone.ogg',50)
newrod.loc=null
Expand All @@ -219,9 +219,9 @@ included:
if(iscrowbar(I) && currentfuelrod)
if(associated_reactor?.considered_on())
if(user.a_intent==I_HELP) //spreading rads is in fact not very helpful
to_chat(user,"<span class='notice'>You're not sure it's safe to remove the fuel rod.</span>")
to_chat(user,"<span class='notice'>You're not sure it's safe to remove the fuel reservoir.</span>")
return
user.visible_message("<span class='warning'>[user] starts prying the fuel rod out of \the [src], even though the reactor is active!</span>", "<span class='warning'>You start prying the fuel rod out of \the [src], even though the reactor is active!</span>")
user.visible_message("<span class='warning'>[user] starts prying the fuel reservoir out of \the [src], even though the reactor is active!</span>", "<span class='warning'>You start prying the fuel reservoir out of \the [src], even though the reactor is active!</span>")
playsound(src,'sound/items/crowbar.ogg',50)
if(do_after(user, src,30))
currentfuelrod.forceMove(loc)
Expand All @@ -235,7 +235,7 @@ included:

return

user.visible_message("<span class='notice'>[user] starts prying the fuel rod out of \the [src].</span>", "<span class='notice'>You start prying the fuel rod out of \the [src].</span>")
user.visible_message("<span class='notice'>[user] starts prying the fuel reservoir out of \the [src].</span>", "<span class='notice'>You start prying the fuel reservoir out of \the [src].</span>")
playsound(src,'sound/items/crowbar.ogg',50)
if(do_after(user, src,20) && currentfuelrod)
currentfuelrod.forceMove(loc)
Expand Down Expand Up @@ -370,13 +370,13 @@ included:
var/reactor_tempdisplay="[floor(associated_reactor.temperature)]K"
var/reactor_highesttempdisplay="[floor(highesttemp)]K"
if(tempdisplaymode==1) //C
coolant_tempdisplay="[floor(associated_reactor.coolant.temperature-273.15)]°C"
reactor_tempdisplay="[floor(associated_reactor.temperature-273.15)]°C"
reactor_highesttempdisplay="[floor(highesttemp-273.15)]°C"
coolant_tempdisplay="[floor(associated_reactor.coolant.temperature-273.15)]°C"
reactor_tempdisplay="[floor(associated_reactor.temperature-273.15)]°C"
reactor_highesttempdisplay="[floor(highesttemp-273.15)]°C"
else if(tempdisplaymode==2) //F (because this is really old, outdated tech (fission is soooo last millenium))
coolant_tempdisplay="[floor(1.8*associated_reactor.coolant.temperature-459.67)]°F"
reactor_tempdisplay="[floor(1.8*associated_reactor.temperature-459.67)]°F"
reactor_highesttempdisplay="[floor(1.8*highesttemp-459.67)]°F"
coolant_tempdisplay="[floor(1.8*associated_reactor.coolant.temperature-459.67)]°F"
reactor_tempdisplay="[floor(1.8*associated_reactor.temperature-459.67)]°F"
reactor_highesttempdisplay="[floor(1.8*highesttemp-459.67)]°F"
else if(tempdisplaymode==3) //R (because muh absolute scale)
coolant_tempdisplay="[floor(1.8*associated_reactor.coolant.temperature)]R"
reactor_tempdisplay="[floor(1.8*associated_reactor.temperature)]R"
Expand Down Expand Up @@ -530,7 +530,7 @@ included:
to_chat(usr, "<span class='warning'>The readouts indicate that the reactor is overheated, and that you should cool it down.</span>")

if(!associated_reactor.fuel)
to_chat(usr, "The readouts indicate there's no fuel rod inserted.")
to_chat(usr, "The readouts indicate there's no fuel reservoir inserted.")
else
if(associated_reactor.fuel.life <=0)
to_chat(usr, "The readouts indicate that the fuel is depleted.")
Expand Down Expand Up @@ -652,7 +652,7 @@ included:
to_chat(hclient.client, "There's no fuel to eject!")
return
if(associated_reactor.considered_on())
to_chat(hclient.client, "The reactor safety locks prevent the fuel rod from being ejected!")
to_chat(hclient.client, "The reactor safety locks prevent the fuel reservoir from being ejected!")
return
currentfuelrod.forceMove(src.loc)
currentfuelrod=null
Expand Down Expand Up @@ -1010,4 +1010,4 @@ included:
var/obj/machinery/computer/fissioncontroller/RC = B
var/obj/item/weapon/circuitboard/fission_reactor/C = circuit
RC.can_autoscram = !C.safety_disabled
*/
*/
8 changes: 4 additions & 4 deletions code/modules/fissionreactor/objects_internal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,12 @@ included:
/obj/machinery/fissionreactor/fissionreactor_fuelrod/examine()
..()
if(associated_reactor)
to_chat(usr,"The lights indicate that there are [overlays.len] adjacent fuel rod assemblies")
to_chat(usr,"The lights indicate that there are [overlays.len] adjacent fuel rod assemblies.")
if(icon_state=="fuelrod_active")
to_chat(usr,"The center emits a blue glow.")
to_chat(usr,"The center is emitting a blue glow.")

to_chat(usr,"The structure is held together firmly, it'll have to be cut in order to part it.")
to_chat(usr,"There is a maitinance hatch at the top, it is [hatchopen?"open":"screwed shut"].")
to_chat(usr,"There is a maintenance hatch at the top, it is [hatchopen?"open":"screwed shut"].")

/obj/machinery/fissionreactor/fissionreactor_fuelrod/update_icon()
icon_state="fuelrod_off"
Expand Down Expand Up @@ -365,4 +365,4 @@ included:
/obj/item/stack/rods = 2,
)



4 changes: 2 additions & 2 deletions code/modules/research/designs/boards/computer_engie.dm
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
build_path = /obj/item/weapon/circuitboard/fission_reactor

/datum/design/fission_fuel_maker
name = "Circuit Design (Isotopic Seperational Combiner)"
name = "Circuit Design (Isotopic Separational Combiner)"
desc = "Allows for the construction of circuit boards used to seperate and combine different isotopes of materials"
id = "fission_control"
req_tech = list(Tc_PROGRAMMING = 4, Tc_ENGINEERING = 4)
Expand All @@ -205,4 +205,4 @@
category = "Misc"
build_path = /obj/item/weapon/circuitboard/fission_fuelmaker



Loading