Skip to content

Commit 8cda905

Browse files
authored
assorted fission reactor typofixes (#37438)
* typofix 1 * typofix 2 * typofix 3 + text tweak * name tweak * . * . * . * . * tweaks/typofix for the reactor manual
1 parent e1b565e commit 8cda905

File tree

9 files changed

+142
-142
lines changed

9 files changed

+142
-142
lines changed

code/datums/supply_packs/engineering.dm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@
448448
containername = "Fission reactor starter kit"
449449
group = "Engineering"
450450
access = list(access_engine_major)
451-
containsdesc = "Everything you need to build a very basic fission reactor. Comes with a pre-filled (albeit small) fuel rod."
451+
containsdesc = "Everything you need to build a very basic fission reactor. Comes with a pre-filled (albeit small) fuel reservoir."
452452

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

486486

487487

488488

489489

490-
490+

code/game/objects/items/stacks/stack_recipes.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ var/list/datum/stack_recipe/plasteel_recipes = list (
450450
new/datum/stack_recipe("Reinforced machine frame", /obj/machinery/constructable_frame/machine_frame/reinforced, 5, time = 60, one_per_turf = 1 ),
451451
null,
452452
new/datum/stack_recipe("Reactor casing frame", /obj/structure/girder/reactor, 4, time = 50, one_per_turf = 1 ),
453-
new/datum/stack_recipe("Reactor fuel rod", /obj/item/weapon/fuelrod, 2, time = 25),
453+
new/datum/stack_recipe("Reactor fuel reservoir", /obj/item/weapon/fuelrod, 2, time = 25),
454454
)
455455

456456
/* ====================================================================

code/game/objects/items/weapons/manuals.dm

Lines changed: 95 additions & 95 deletions
Large diffs are not rendered by default.

code/modules/fissionreactor/fuelmaker.dm

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
in this file:
3-
the machine which makes fuel rods have things in them.
3+
the machine which makes fuel reservoirs have things in them.
44
*/
55

66
//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)
@@ -33,11 +33,11 @@ the machine which makes fuel rods have things in them.
3333
/obj/machinery/atmospherics/unary/fissionfuelmaker/attackby(var/obj/item/I,var/mob/user)
3434
if(istype(I,/obj/item/weapon/fuelrod))
3535
if(heldrod)
36-
to_chat(user,"There's already a fuel rod inserted into \the [src].")
36+
to_chat(user,"There's already a fuel reservoir inserted into \the [src].")
3737
else
3838
if(!user.drop_item(I))
3939
return
40-
to_chat(user,"You insert the fuel rod into \the [src].")
40+
to_chat(user,"You insert the fuel reservoir into \the [src].")
4141
I.forceMove(src)
4242
heldrod=I
4343
heldrod.fueldata.fuel=heldrod.fueldata.get_products() //process the fuel turning
@@ -48,7 +48,7 @@ the machine which makes fuel rods have things in them.
4848
update_icon()
4949
return
5050
if(iscrowbar(I) && heldrod)
51-
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>")
51+
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>")
5252
playsound(src,'sound/items/crowbar.ogg',50)
5353
if(do_after(user, src,20))
5454
heldrod.forceMove(loc)
@@ -134,7 +134,7 @@ the machine which makes fuel rods have things in them.
134134
switch(href_list["action"])
135135
if("eject_fuel")
136136
if(!heldrod)
137-
to_chat(hclient.client,"There's no fuel rod to eject.")
137+
to_chat(hclient.client,"There's no fuel reservoir to eject.")
138138
else
139139
heldrod.forceMove(src.loc)
140140
heldrod.update_icon()
@@ -168,7 +168,7 @@ the machine which makes fuel rods have things in them.
168168

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

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

295295

296-
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>"}
296+
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>"}
297297

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

303303

304304
html+={"</table><hr><table style='width:100%;'><tr><td>
305-
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>"}
305+
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>"}
306306

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

351351

352352

code/modules/fissionreactor/items.dm

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ includes:
88

99

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

3232

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

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

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

5353
/obj/item/weapon/fuelrod/large/update_icon()
@@ -56,4 +56,4 @@ includes:
5656
if(!fueldata)
5757
return
5858
if(fueldata.fuel.total_volume>0)
59-
icon_state="i_fuelrod_l[fueldata.life>0 ? "" : "_depleted"]"
59+
icon_state="i_fuelrod_l[fueldata.life>0 ? "" : "_depleted"]"

code/modules/fissionreactor/misc.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ boxes used for cargo orders to make my life easier.
4646
new /obj/item/pipe(src,0) //1 pipe (optional)
4747

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

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

74-
74+

code/modules/fissionreactor/objects_external.dm

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,12 @@ included:
203203
/obj/machinery/fissioncontroller/attackby(var/obj/I,var/mob/user)
204204
if(istype(I,/obj/item/weapon/fuelrod))
205205
if(currentfuelrod)
206-
to_chat(user,"There's already a fuel rod inserted into \the [src].")
206+
to_chat(user,"There's already a fuel reservoir inserted into \the [src].")
207207
else
208208
var/obj/item/weapon/fuelrod/newrod=I
209209
if(!user.drop_item(newrod))
210210
return
211-
to_chat(user,"You insert the fuel rod into \the [src].")
211+
to_chat(user,"You insert the fuel reservoir into \the [src].")
212212
if(powered() && !(stat&BROKEN))
213213
playsound(src,'sound/machines/fission/rc_fuelnone.ogg',50)
214214
newrod.loc=null
@@ -219,9 +219,9 @@ included:
219219
if(iscrowbar(I) && currentfuelrod)
220220
if(associated_reactor?.considered_on())
221221
if(user.a_intent==I_HELP) //spreading rads is in fact not very helpful
222-
to_chat(user,"<span class='notice'>You're not sure it's safe to remove the fuel rod.</span>")
222+
to_chat(user,"<span class='notice'>You're not sure it's safe to remove the fuel reservoir.</span>")
223223
return
224-
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>")
224+
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>")
225225
playsound(src,'sound/items/crowbar.ogg',50)
226226
if(do_after(user, src,30))
227227
currentfuelrod.forceMove(loc)
@@ -235,7 +235,7 @@ included:
235235

236236
return
237237

238-
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>")
238+
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>")
239239
playsound(src,'sound/items/crowbar.ogg',50)
240240
if(do_after(user, src,20) && currentfuelrod)
241241
currentfuelrod.forceMove(loc)
@@ -370,13 +370,13 @@ included:
370370
var/reactor_tempdisplay="[floor(associated_reactor.temperature)]K"
371371
var/reactor_highesttempdisplay="[floor(highesttemp)]K"
372372
if(tempdisplaymode==1) //C
373-
coolant_tempdisplay="[floor(associated_reactor.coolant.temperature-273.15)]°C"
374-
reactor_tempdisplay="[floor(associated_reactor.temperature-273.15)]°C"
375-
reactor_highesttempdisplay="[floor(highesttemp-273.15)]°C"
373+
coolant_tempdisplay="[floor(associated_reactor.coolant.temperature-273.15)]°C"
374+
reactor_tempdisplay="[floor(associated_reactor.temperature-273.15)]°C"
375+
reactor_highesttempdisplay="[floor(highesttemp-273.15)]°C"
376376
else if(tempdisplaymode==2) //F (because this is really old, outdated tech (fission is soooo last millenium))
377-
coolant_tempdisplay="[floor(1.8*associated_reactor.coolant.temperature-459.67)]°F"
378-
reactor_tempdisplay="[floor(1.8*associated_reactor.temperature-459.67)]°F"
379-
reactor_highesttempdisplay="[floor(1.8*highesttemp-459.67)]°F"
377+
coolant_tempdisplay="[floor(1.8*associated_reactor.coolant.temperature-459.67)]°F"
378+
reactor_tempdisplay="[floor(1.8*associated_reactor.temperature-459.67)]°F"
379+
reactor_highesttempdisplay="[floor(1.8*highesttemp-459.67)]°F"
380380
else if(tempdisplaymode==3) //R (because muh absolute scale)
381381
coolant_tempdisplay="[floor(1.8*associated_reactor.coolant.temperature)]R"
382382
reactor_tempdisplay="[floor(1.8*associated_reactor.temperature)]R"
@@ -530,7 +530,7 @@ included:
530530
to_chat(usr, "<span class='warning'>The readouts indicate that the reactor is overheated, and that you should cool it down.</span>")
531531

532532
if(!associated_reactor.fuel)
533-
to_chat(usr, "The readouts indicate there's no fuel rod inserted.")
533+
to_chat(usr, "The readouts indicate there's no fuel reservoir inserted.")
534534
else
535535
if(associated_reactor.fuel.life <=0)
536536
to_chat(usr, "The readouts indicate that the fuel is depleted.")
@@ -652,7 +652,7 @@ included:
652652
to_chat(hclient.client, "There's no fuel to eject!")
653653
return
654654
if(associated_reactor.considered_on())
655-
to_chat(hclient.client, "The reactor safety locks prevent the fuel rod from being ejected!")
655+
to_chat(hclient.client, "The reactor safety locks prevent the fuel reservoir from being ejected!")
656656
return
657657
currentfuelrod.forceMove(src.loc)
658658
currentfuelrod=null
@@ -1010,4 +1010,4 @@ included:
10101010
var/obj/machinery/computer/fissioncontroller/RC = B
10111011
var/obj/item/weapon/circuitboard/fission_reactor/C = circuit
10121012
RC.can_autoscram = !C.safety_disabled
1013-
*/
1013+
*/

code/modules/fissionreactor/objects_internal.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,12 @@ included:
153153
/obj/machinery/fissionreactor/fissionreactor_fuelrod/examine()
154154
..()
155155
if(associated_reactor)
156-
to_chat(usr,"The lights indicate that there are [overlays.len] adjacent fuel rod assemblies")
156+
to_chat(usr,"The lights indicate that there are [overlays.len] adjacent fuel rod assemblies.")
157157
if(icon_state=="fuelrod_active")
158-
to_chat(usr,"The center emits a blue glow.")
158+
to_chat(usr,"The center is emitting a blue glow.")
159159

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

163163
/obj/machinery/fissionreactor/fissionreactor_fuelrod/update_icon()
164164
icon_state="fuelrod_off"
@@ -365,4 +365,4 @@ included:
365365
/obj/item/stack/rods = 2,
366366
)
367367

368-
368+

code/modules/research/designs/boards/computer_engie.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
build_path = /obj/item/weapon/circuitboard/fission_reactor
197197

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

208-
208+

0 commit comments

Comments
 (0)