Skip to content

Commit

Permalink
Fix even more paper logos (#3793)
Browse files Browse the repository at this point in the history
# About the pull request

This PR is a followup to #3780 applying the changes to even more papers.

# Explain why it's good for the game

Fixes more broken images e.g. 

![wylogo](https://github.com/cmss13-devs/cmss13/assets/76988376/f1eec408-547b-4a5f-9eb8-d38f1bf232e0)

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>

# Changelog
:cl: Drathek
fix: Fixed more broken logos (primarily WY research papers)
/:cl:
  • Loading branch information
Drulikar committed Jul 5, 2023
1 parent 8dbd0ef commit feb16cf
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
3 changes: 2 additions & 1 deletion code/game/machinery/computer/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -469,9 +469,10 @@
if(!record) return
playsound(src.loc, 'sound/machines/fax.ogg', 15, 1)
sleep(40)
var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper)
var/obj/item/paper/P = new /obj/item/paper( src.loc )
P.name = text("Scan: [], []",record.fields["name"],worldtime2text())
P.info += text("<center><img src = wylogo.png><HR><I><B>Official Weyland-Yutani Document</B><BR>Scan Record</I><HR><H2>[]</H2>\n</center>",record.fields["name"])
P.info += text("<center><img src = [asset.get_url_mappings()["wylogo.png"]]><HR><I><B>Official Weyland-Yutani Document</B><BR>Scan Record</I><HR><H2>[]</H2>\n</center>",record.fields["name"])
for(var/datum/data/record/R as anything in GLOB.data_core.medical)
if (R.fields["name"] == record.fields["name"])
if(R.fields["last_scan_time"] && R.fields["last_scan_result"])
Expand Down
3 changes: 2 additions & 1 deletion code/modules/paperwork/paper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,8 @@
if(!random_chem)
random_chem = pick(chemical_gen_classes_list["T1"])
C = chemical_reagents_list["[random_chem]"]
var/txt = "<center><img src = wylogo.png><HR><I><B>Official Weyland-Yutani Document</B><BR>Experiment Notes</I><HR><H2>"
var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper)
var/txt = "<center><img src = [asset.get_url_mappings()["wylogo.png"]]><HR><I><B>Official Weyland-Yutani Document</B><BR>Experiment Notes</I><HR><H2>"
switch(note_type)
if("synthesis")
var/datum/chemical_reaction/G = chemical_reactions_list[C.id]
Expand Down
3 changes: 2 additions & 1 deletion code/modules/reagents/chemistry_machinery/chem_simulator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -576,8 +576,9 @@
sleep(10)
var/obj/item/paper/research_report/report = new /obj/item/paper/research_report/(loc)
var/datum/reagent/D = 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 = wylogo.png><HR><I><B>Official Company Document</B><BR>Simulated Synthesis Report</I><HR><H2>Result for [D.name]</H2></center>"
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.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")]/[game_year], [worldtime2text()]</I></font><BR>\n<span class=\"paper_field\"></span>"
playsound(loc, 'sound/machines/twobeep.ogg', 15, 1)
Expand Down
7 changes: 4 additions & 3 deletions code/modules/reagents/chemistry_machinery/reagent_analyzer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,9 @@

chemical_data.complete_chemical(S)
else
var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper)
report.name = "Analysis of ERROR"
report.info += "<center><img src = wylogo.png><HR><I><B>Official Weyland-Yutani Document</B><BR>Reagent Analysis Print</I><HR><H2>Analysis ERROR</H2></center>"
report.info += "<center><img src = [asset.get_url_mappings()["wylogo.png"]]><HR><I><B>Official Weyland-Yutani Document</B><BR>Reagent Analysis Print</I><HR><H2>Analysis ERROR</H2></center>"
report.info += "<B>Result:</B><BR>Analysis failed for sample #[sample_number].<BR><BR>\n"
report.info += "<B>Reason for error:</B><BR><I>[reason]</I><BR>\n"
report.info += "<BR><HR><font size = \"1\"><I>This report was automatically printed by the A-XRF Scanner.<BR>The [MAIN_SHIP_NAME], [time2text(world.timeofday, "MM/DD")]/[game_year], [worldtime2text()]</I></font><BR>\n<span class=\"paper_field\"></span>"
Expand All @@ -115,8 +116,8 @@
report = new /obj/item/paper/research_report(loc)

report.name = "Analysis of [name]"

report.info += "<center><img src = wylogo.png><HR><I><B>Official Weyland-Yutani Document</B><BR>Automated A-XRF Report</I><HR><H2>Analysis of [name]</H2></center>"
var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper)
report.info += "<center><img src = [asset.get_url_mappings()["wylogo.png"]]><HR><I><B>Official Weyland-Yutani Document</B><BR>Automated A-XRF Report</I><HR><H2>Analysis of [name]</H2></center>"
if(sample_number)
report.info += "<B>Results for sample:</B> #[sample_number]<BR>\n"
report.generate(src, admin_spawned)

0 comments on commit feb16cf

Please sign in to comment.