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.

Sign up for GitHub

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

Jump to bottom

Reduces automatic research chemical contents property string #5738

Merged
merged 7 commits into from
Feb 26, 2024
Merged

Reduces automatic research chemical contents property string #5738

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4f76e5a
Adds fill level sprite states to bone-gel
Feb 6, 2024
f06c056
fixes yandere block
Megaddd Feb 6, 2024
5ba99ee
move var to var block and comment
Megaddd Feb 6, 2024
8d33c77
obfuscate research chem suffix
Feb 17, 2024
a39c6ee
Merge branch 'cmss13-devs:master' into master
Megaddd Feb 17, 2024
b3657a4
preserve properties on paper, shrink suffix more
Feb 19, 2024
5f698e1
Merge branch 'master' of https://github.com/Megaddd/cmss13_bonegel_sp…
Feb 19, 2024
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
11 changes: 6 additions & 5 deletions code/modules/reagents/chemistry_machinery/chem_simulator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,7 @@
relate(C)
if(!C.original_id)
C.original_id = target.data.id
C.id = encode_reagent(C)
C.name = C.id
encode_reagent(C)
if(C.id in simulations)
//We've already simulated this before, so we don't need to continue
C = GLOB.chemical_reagents_list[C.id]
Expand Down Expand Up @@ -577,8 +576,8 @@
var/obj/item/paper/research_report/report = new /obj/item/paper/research_report/(loc)
var/datum/reagent/D = GLOB.chemical_reagents_list[id]
var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper)
report.name = "Simulation result for [D.name]"
report.info += "<center><img src = [asset.get_url_mappings()["wylogo.png"]]><HR><I><B>Official Company Document</B><BR>Simulated Synthesis Report</I><HR><H2>Result for [D.name]</H2></center>"
report.name = "Simulation result for [D.id]"
report.info += "<center><img src = [asset.get_url_mappings()["wylogo.png"]]><HR><I><B>Official Company Document</B><BR>Simulated Synthesis Report</I><HR><H2>Result for [D.id]</H2></center>"
report.generate(D)
report.info += "<BR><HR><font size = \"1\"><I>This report was automatically printed by the Synthesis Simulator.<BR>The [MAIN_SHIP_NAME], [time2text(world.timeofday, "MM/DD")]/[GLOB.game_year], [worldtime2text()]</I></font><BR>\n<span class=\"paper_field\"></span>"
playsound(loc, 'sound/machines/twobeep.ogg', 15, 1)
Expand All @@ -590,7 +589,9 @@
var/suffix = " "
for(var/datum/chem_property/P in C.properties)
suffix += P.code+"[P.level]"
return O.name + suffix
C.id = O.name + " " + copytext(md5(suffix),1,3) + suffix //Show random suffix AND real properties on research paper
C.name = O.name + " " + copytext(md5(suffix),1,3) //Show ONLY random suffix on health analyzers
return

/obj/structure/machinery/chem_simulator/proc/complexity_to_string_list()
var/list/L = list()
Expand Down
Loading