Skip to content

Commit d663dfc

Browse files
[READY FOR TM] R&D Rework Part 2 - Death to the experimentor (ParadiseSS13#27472)
* PT1 - Death to experimentor * I cant fail CI this fast come on * PT2 - DA -> SA * CRLF to LF * Strange icons in the SA now * Lets give this a go * AGH * Dirt * WORK * Oops - cere was missing the RD locker * Map fixes * Adds delivery chute back * Warrior review * Also removes magnetics --------- Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
1 parent 543fc9b commit d663dfc

File tree

27 files changed

+3442
-3344
lines changed

27 files changed

+3442
-3344
lines changed

_maps/map_files/stations/boxstation.dmm

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

_maps/map_files/stations/cerestation.dmm

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

_maps/map_files/stations/deltastation.dmm

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

_maps/map_files/stations/emeraldstation.dmm

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

_maps/map_files/stations/metastation.dmm

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

code/game/area/ss13_areas/science_areas.dm

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,6 @@
1414
name = "\improper Robotics Showroom"
1515
icon_state = "showroom"
1616

17-
// Experimentor
18-
19-
/area/station/science/explab
20-
name = "\improper E.X.P.E.R.I-MENTOR Lab"
21-
icon_state = "scilab"
22-
request_console_flags = RC_SUPPLY
23-
request_console_name = "Science"
24-
25-
/area/station/science/explab/chamber
26-
name = "\improper E.X.P.E.R.I-MENTOR Chamber"
27-
icon_state = "scitest"
28-
2917
/area/station/science/research
3018
name = "Research Division"
3119
icon_state = "sci"
@@ -34,6 +22,10 @@
3422
name = "Research Division Lobby"
3523
icon_state = "sci"
3624

25+
/area/station/science/testrange
26+
name = "Research Test Range"
27+
icon_state = "sci"
28+
3729
/area/station/science/break_room
3830
name = "\improper Science Break Room"
3931
icon_state = "scibreak"

code/game/machinery/computer/buildandrepair.dm

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -363,11 +363,7 @@
363363
icon_state = "science"
364364
build_path = /obj/machinery/computer/rdconsole/core
365365
req_access = list(ACCESS_TOX) // This is for adjusting the type of computer we're building
366-
var/list/access_types = list("R&D Core", "E.X.P.E.R.I-MENTOR", "Public")
367-
368-
/obj/item/circuitboard/rdconsole/experiment
369-
board_name = "RD Console - E.X.P.E.R.I-MENTOR"
370-
build_path = /obj/machinery/computer/rdconsole/experiment
366+
var/list/access_types = list("R&D Core", "Public")
371367

372368
/obj/item/circuitboard/rdconsole/public
373369
board_name = "RD Console - Public"
@@ -540,9 +536,6 @@
540536
if("R&D Core")
541537
board_name = "RD Console"
542538
build_path = /obj/machinery/computer/rdconsole/core
543-
if("E.X.P.E.R.I-MENTOR")
544-
board_name = "RD Console - E.X.P.E.R.I-MENTOR"
545-
build_path = /obj/machinery/computer/rdconsole/experiment
546539
if("Public")
547540
board_name = "RD Console - Public"
548541
build_path = /obj/machinery/computer/rdconsole/public

code/game/machinery/machine_frame.dm

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -716,22 +716,10 @@ to destroy them and players will be able to make replacements.
716716
/obj/item/stock_parts/manipulator = 2,
717717
/obj/item/stock_parts/matter_bin = 1)
718718

719-
//Almost the same recipe as destructive analyzer to give people choices.
720-
/obj/item/circuitboard/experimentor
721-
board_name = "E.X.P.E.R.I-MENTOR"
719+
/obj/item/circuitboard/scientific_analyzer // fucking US spelling
720+
board_name = "Scientific Analyzer"
722721
icon_state = "science"
723-
build_path = /obj/machinery/r_n_d/experimentor
724-
board_type = "machine"
725-
origin_tech = "magnets=1;engineering=1;programming=1;biotech=1;bluespace=2"
726-
req_components = list(
727-
/obj/item/stock_parts/scanning_module = 1,
728-
/obj/item/stock_parts/manipulator = 2,
729-
/obj/item/stock_parts/micro_laser = 2)
730-
731-
/obj/item/circuitboard/destructive_analyzer
732-
board_name = "Destructive Analyzer"
733-
icon_state = "science"
734-
build_path = /obj/machinery/r_n_d/destructive_analyzer
722+
build_path = /obj/machinery/r_n_d/scientific_analyzer
735723
board_type = "machine"
736724
origin_tech = "magnets=2;engineering=2;programming=2"
737725
req_components = list(

code/game/objects/effects/spawners/lootdrop.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
/obj/item/autosurgeon/organ = 50,
118118
/obj/item/mod/construction/plating/research = 25,
119119

120-
// Research / Experimentor
120+
// Research
121121
/obj/item/paper/researchnotes = 125, // papers that give random R&D levels
122122
/obj/item/storage/box/telescience = 25, // Code green or blue. Probably not antags. People haven't touched it in ages. Let us see what happens.
123123

code/game/objects/effects/spawners/random/misc_spawners.dm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
/obj/item/book/manual/wiki/chef_recipes,
5252
/obj/item/book/manual/wiki/engineering_construction,
5353
/obj/item/book/manual/wiki/engineering_guide,
54-
/obj/item/book/manual/wiki/experimentor,
5554
/obj/item/book/manual/wiki/faxes,
5655
/obj/item/book/manual/wiki/hacking,
5756
/obj/item/book/manual/wiki/hydroponics,

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -666,19 +666,19 @@
666666
<h1>Science For Dummies</h1>
667667
So you want to further SCIENCE? Good man/woman/thing! However, SCIENCE is a complicated process even though it's quite easy. For the most part, it's a three step process:
668668
<ol>
669-
<li> 1) Deconstruct items in the Destructive Analyzer to advance technology or improve the design.</li>
669+
<li> 1) Deconstruct items in the Scientific Analyzer to advance technology or improve the design.</li>
670670
<li> 2) Build unlocked designs in the Protolathe and Circuit Imprinter</li>
671671
<li> 3) Repeat!</li>
672672
</ol>
673673

674-
Those are the basic steps to furthing science. What do you do science with, however? Well, you have four major tools: R&D Console, the Destructive Analyzer, the Protolathe, and the Circuit Imprinter.
674+
Those are the basic steps to furthing science. What do you do science with, however? Well, you have four major tools: R&D Console, the Scientific Analyzer, the Protolathe, and the Circuit Imprinter.
675675

676676
<h2>The R&D Console</h2>
677-
The R&D console is the cornerstone of any research lab. It is the central system from which the Destructive Analyzer, Protolathe, and Circuit Imprinter (your R&D systems) are controled. More on those systems in their own sections. On its own, the R&D console acts as a database for all your technological gains and new devices you discover. So long as the R&D console remains intact, you'll retain all that SCIENCE you've discovered. Protect it though, because if it gets damaged, you'll lose your data! In addition to this important purpose, the R&D console has a disk menu that lets you transfer data from the database onto disk or from the disk into the database. It also has a settings menu that lets you re-sync with nearby R&D devices (if they've become disconnected), lock the console from the unworthy, upload the data to all other R&D consoles in the network (all R&D consoles are networked by default), connect/disconnect from the network, and purge all data from the database.
677+
The R&D console is the cornerstone of any research lab. It is the central system from which the Scientific Analyzer, Protolathe, and Circuit Imprinter (your R&D systems) are controled. More on those systems in their own sections. On its own, the R&D console acts as a database for all your technological gains and new devices you discover. So long as the R&D console remains intact, you'll retain all that SCIENCE you've discovered. Protect it though, because if it gets damaged, you'll lose your data! In addition to this important purpose, the R&D console has a disk menu that lets you transfer data from the database onto disk or from the disk into the database. It also has a settings menu that lets you re-sync with nearby R&D devices (if they've become disconnected), lock the console from the unworthy, upload the data to all other R&D consoles in the network (all R&D consoles are networked by default), connect/disconnect from the network, and purge all data from the database.
678678
<b>NOTE:</b> The technology list screen, circuit imprinter, and protolathe menus are accessible by non-scientists. This is intended to allow 'public' systems for the plebians to utilize some new devices.
679679

680-
<h2>Destructive Analyzer</h2>
681-
This is the source of all technology. Whenever you put a handheld object in it, it analyzes it and determines what sort of technological advancements you can discover from it. If the technology of the object is equal or higher then your current knowledge, you can destroy the object to further those sciences. Some devices (notably, some devices made from the protolathe and circuit imprinter) aren't 100% reliable when you first discover them. If these devices break down, you can put them into the Destructive Analyzer and improve their reliability rather then futher science. If their reliability is high enough ,it'll also advance their related technologies.
680+
<h2>Scientific Analyzer</h2>
681+
This is the source of all technology. Whenever you put a handheld object in it, it analyzes it and determines what sort of technological advancements you can discover from it. If the technology of the object is equal or higher then your current knowledge, you can destroy the object to further those sciences. Some devices (notably, some devices made from the protolathe and circuit imprinter) aren't 100% reliable when you first discover them. If these devices break down, you can put them into the Scientific Analyzer and improve their reliability rather then futher science. If their reliability is high enough ,it'll also advance their related technologies.
682682

683683
<h2>Circuit Imprinter</h2>
684684
This machine, along with the Protolathe, is used to actually produce new devices. The Circuit Imprinter takes glass and various chemicals (depends on the design) to produce new circuit boards to build new machines or computers. It can even be used to print AI modules.
@@ -687,7 +687,7 @@
687687
This machine is an advanced form of the Autolathe that produce non-circuit designs. Unlike the Autolathe, it can use processed metal, glass, solid plasma, silver, gold, and diamonds along with a variety of chemicals to produce devices. The downside is that, again, not all devices you make are 100% reliable when you first discover them.
688688

689689
<h1>Reliability and You</h1>
690-
As it has been stated, many devices when they're first discovered do not have a 100% reliablity when you first discover them. Instead, the reliablity of the device is dependent upon a base reliability value, whatever improvements to the design you've discovered through the Destructive Analyzer, and any advancements you've made with the device's source technologies. To be able to improve the reliability of a device, you have to use the device until it breaks beyond repair. Once that happens, you can analyze it in a Destructive Analyzer. Once the device reachs a certain minimum reliability, you'll gain tech advancements from it.
690+
As it has been stated, many devices when they're first discovered do not have a 100% reliablity when you first discover them. Instead, the reliablity of the device is dependent upon a base reliability value, whatever improvements to the design you've discovered through the Scientific Analyzer, and any advancements you've made with the device's source technologies. To be able to improve the reliability of a device, you have to use the device until it breaks beyond repair. Once that happens, you can analyze it in a Scientific Analyzer. Once the device reachs a certain minimum reliability, you'll gain tech advancements from it.
691691

692692
<h1>Building a Better Machine</h1>
693693
Many machines produces from circuit boards and inserted into a machine frame require a variety of parts to construct. These are parts like capacitors, batteries, matter bins, and so forth. As your knowledge of science improves, more advanced versions are unlocked. If you use these parts when constructing something, its attributes may be improved. For example, if you use an advanced matter bin when constructing an autolathe (rather then a regular one), it'll hold more materials. Experiment around with stock parts of various qualities to see how they affect the end results! Be warned, however: Tier 3 and higher stock parts don't have 100% reliability and their low reliability may affect the reliability of the end machine.
@@ -867,14 +867,6 @@
867867
title = "Cyborgs for Dummies"
868868
wiki_article_title = "Guide_to_Robotics"
869869

870-
/obj/item/book/manual/wiki/experimentor
871-
name = "Mentoring your Experiments"
872-
desc = "A madman's ramblings on how to experiment with the E.X.P.E.R.I-MENTOR."
873-
icon_state = "rdbook"
874-
author = "Dr. H.P. Kritz"
875-
title = "Mentoring your Experiments"
876-
wiki_article_title = "Guide_to_the_E.X.P.E.R.I-MENTOR"
877-
878870
/obj/item/book/manual/wiki/chef_recipes
879871
name = "Chef Recipes"
880872
desc = "Knives, Ovens, and You: A guide to cooking."

code/game/objects/items/weapons/storage/boxes.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@
324324
new /obj/item/circuitboard/rdserver(src)
325325
new /obj/item/circuitboard/rdconsole(src)
326326
new /obj/item/circuitboard/protolathe(src)
327-
new /obj/item/circuitboard/destructive_analyzer(src)
327+
new /obj/item/circuitboard/scientific_analyzer(src)
328328
new /obj/item/circuitboard/circuit_imprinter(src)
329329
new /obj/item/stock_parts/manipulator(src)
330330
new /obj/item/stock_parts/manipulator(src)
@@ -1142,7 +1142,7 @@
11421142

11431143
/obj/item/storage/box/rndboards/populate_contents()
11441144
new /obj/item/circuitboard/protolathe(src)
1145-
new /obj/item/circuitboard/destructive_analyzer(src)
1145+
new /obj/item/circuitboard/scientific_analyzer(src)
11461146
new /obj/item/circuitboard/circuit_imprinter(src)
11471147
new /obj/item/circuitboard/rdconsole/public(src)
11481148
new /obj/item/circuitboard/rnd_network_controller(src)

code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
/obj/machinery/sleeper,
4141
/obj/machinery/bodyscanner,
4242
/obj/machinery/photocopier, // HI YES ONE FLAYER FAXED TO MY OFFICE PLEASE
43-
/obj/machinery/r_n_d/experimentor, // Like anyone is ever gonna teleport to this
4443
/obj/machinery/barsign
4544
))
4645

code/modules/awaymissions/mission_code/ruins/oldstation.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@
393393

394394
/obj/structure/closet/crate/secure/oldstation/research/populate_contents()
395395
new /obj/item/circuitboard/circuit_imprinter(src)
396-
new /obj/item/circuitboard/destructive_analyzer(src)
396+
new /obj/item/circuitboard/scientific_analyzer(src)
397397
new /obj/item/circuitboard/protolathe(src)
398398
new /obj/item/circuitboard/rdconsole/public(src)
399399
new /obj/item/circuitboard/rnd_network_controller(src)

code/modules/paperwork/paper.dm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,17 +1040,18 @@
10401040

10411041
/obj/item/paper/researchnotes
10421042
name = "paper - 'Research Notes'"
1043-
info = "<b>The notes appear gibberish to you. Perhaps a destructive analyzer in R&D could make sense of them.</b>"
1043+
info = "<b>The notes appear gibberish to you. Perhaps a scientific analyzer in R&D could make sense of them?</b>"
10441044
origin_tech = "combat=4;materials=4;engineering=4;biotech=4"
10451045

1046-
/obj/item/paper/researchnotes/New()
1047-
..()
1046+
/obj/item/paper/researchnotes/Initialize(mapload)
1047+
. = ..()
10481048
var/list/possible_techs = list("materials", "engineering", "plasmatech", "powerstorage", "bluespace", "biotech", "combat", "magnets", "programming", "syndicate")
10491049
var/mytech = pick(possible_techs)
10501050
var/mylevel = rand(7, 9)
10511051
origin_tech = "[mytech]=[mylevel]"
10521052
name = "research notes - [mytech] [mylevel]"
10531053

1054+
// I want this type dead
10541055
/obj/item/paper/instruction
10551056
name = "Instruction Notes"
10561057

code/modules/research/designs/machine_designs.dm

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -292,14 +292,14 @@
292292
build_path = /obj/item/circuitboard/cyborgrecharger
293293
category = list("Research Machinery")
294294

295-
/datum/design/destructive_analyzer
296-
name = "Machine Board (Destructive Analyzer)"
297-
desc = "The circuit board for a Destructive Analyzer."
298-
id = "destructive_analyzer"
295+
/datum/design/scientific_analyzer
296+
name = "Machine Board (Scientific Analyzer)"
297+
desc = "The circuit board for a Scientific Analyzer."
298+
id = "scientific_analyzer"
299299
req_tech = list("programming" = 2, "magnets" = 2, "engineering" = 2)
300300
build_type = IMPRINTER
301301
materials = list(MAT_GLASS = 1000)
302-
build_path = /obj/item/circuitboard/destructive_analyzer
302+
build_path = /obj/item/circuitboard/scientific_analyzer
303303
category = list("Research Machinery")
304304

305305
/datum/design/mechfab
@@ -322,16 +322,6 @@
322322
build_path = /obj/item/circuitboard/mech_recharger
323323
category = list("Research Machinery")
324324

325-
/datum/design/experimentor
326-
name = "Machine Design (E.X.P.E.R.I-MENTOR Board)"
327-
desc = "The circuit board for an E.X.P.E.R.I-MENTOR."
328-
id = "experimentor"
329-
req_tech = list("programming" = 2, "magnets" = 2, "engineering" = 2, "bluespace" = 2)
330-
build_type = IMPRINTER
331-
materials = list(MAT_GLASS = 1000)
332-
build_path = /obj/item/circuitboard/experimentor
333-
category = list("Research Machinery")
334-
335325
/datum/design/protolathe
336326
name = "Machine Board (Protolathe)"
337327
desc = "The circuit board for a Protolathe."

0 commit comments

Comments
 (0)