cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] more 516 compat (#9904)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-01-18 10:55:11 -07:00
committed by GitHub
parent f6f4d0c8a5
commit 65efaca3b9
9 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/computer/arcade.dm
View File

@@ -449,7 +449,7 @@
dat += "<br><center><h3>Experience the journey of your ancestors!</h3></center><br><br>" dat += "<br><center><h3>Experience the journey of your ancestors!</h3></center><br><br>"
dat += "<center><b><a href='byond://?src=\ref[src];newgame=1'>New Game</a></b></center>" dat += "<center><b><a href='byond://?src=\ref[src];newgame=1'>New Game</a></b></center>"
dat += "<P ALIGN=Right><a href='byond://?src=\ref[src];close=1'>Close</a></P>" dat += "<P ALIGN=Right><a href='byond://?src=\ref[src];close=1'>Close</a></P>"
user << browse(dat,"window=arcade") user << browse("<html>[dat]</html>","window=arcade")
return return
/obj/machinery/computer/arcade/orion_trail/Topic(href, href_list) /obj/machinery/computer/arcade/orion_trail/Topic(href, href_list)

2
code/game/objects/structures/under_wardrobe.dm
View File

@@ -24,7 +24,7 @@
dat += " <a href='byond://?src=\ref[src];remove_underwear=[UWC.name]'>(Remove)</a><br>" dat += " <a href='byond://?src=\ref[src];remove_underwear=[UWC.name]'>(Remove)</a><br>"
dat = jointext(dat,null) dat = jointext(dat,null)
H << browse(dat, "window=wardrobe;size=400x200") H << browse("<html>[dat]</html>", "window=wardrobe;size=400x200")
/obj/structure/undies_wardrobe/proc/get_metadata(var/mob/living/carbon/human/H, var/underwear_category, var/datum/gear_tweak/gt) /obj/structure/undies_wardrobe/proc/get_metadata(var/mob/living/carbon/human/H, var/underwear_category, var/datum/gear_tweak/gt)
var/metadata = H.all_underwear_metadata[underwear_category] var/metadata = H.all_underwear_metadata[underwear_category]

4
code/modules/admin/admin.dm
View File

@@ -542,7 +542,7 @@ var/global/floorIsLava = 0
if(!check_rights(0)) return if(!check_rights(0)) return
var/dat = {" var/dat = {"
<center><B>Game Panel</B></center><hr>\n <html><center><B>Game Panel</B></center><hr>\n
<A href='byond://?src=\ref[src];[HrefToken()];c_mode=1'>Change Game Mode</A><br> <A href='byond://?src=\ref[src];[HrefToken()];c_mode=1'>Change Game Mode</A><br>
"} "}
if(master_mode == "secret") if(master_mode == "secret")
@@ -556,7 +556,7 @@ var/global/floorIsLava = 0
<A href='byond://?src=\ref[src];[HrefToken()];create_mob=1'>Create Mob</A><br> <A href='byond://?src=\ref[src];[HrefToken()];create_mob=1'>Create Mob</A><br>
<br><A href='byond://?src=\ref[src];[HrefToken()];vsc=airflow'>Edit Airflow Settings</A><br> <br><A href='byond://?src=\ref[src];[HrefToken()];vsc=airflow'>Edit Airflow Settings</A><br>
<A href='byond://?src=\ref[src];[HrefToken()];vsc=phoron'>Edit Phoron Settings</A><br> <A href='byond://?src=\ref[src];[HrefToken()];vsc=phoron'>Edit Phoron Settings</A><br>
<A href='byond://?src=\ref[src];[HrefToken()];vsc=default'>Choose a default ZAS setting</A><br> <A href='byond://?src=\ref[src];[HrefToken()];vsc=default'>Choose a default ZAS setting</A><br></html>
"} "}
usr << browse(dat, "window=admin2;size=210x280") usr << browse(dat, "window=admin2;size=210x280")

2
code/modules/library/lib_items.dm
View File

@@ -209,7 +209,7 @@ Book Cart End
/// Proc that handles sending the book information to the user, as well as some housekeeping stuff. /// Proc that handles sending the book information to the user, as well as some housekeeping stuff.
/obj/item/book/proc/display_content(mob/living/user) /obj/item/book/proc/display_content(mob/living/user)
user << browse("<TT><I>Penned by [author].</I></TT> <BR>" + "[dat]", "window=book") user << browse(replacetext(dat, "<html>", "<html><TT><I>Penned by [author].</I></TT> <BR>"), "window=book")
/obj/item/book/attackby(obj/item/W as obj, mob/user as mob) /obj/item/book/attackby(obj/item/W as obj, mob/user as mob)
if(carved) if(carved)

2
code/modules/mob/living/carbon/human/human_attackhand.dm
View File

@@ -477,7 +477,7 @@
else else
dat += span_bold("Primarily [u_attack.attack_name]") + " - <a href='byond://?src=\ref[src];default_attk=\ref[u_attack]'>set default</a><br/><br/><br/>" dat += span_bold("Primarily [u_attack.attack_name]") + " - <a href='byond://?src=\ref[src];default_attk=\ref[u_attack]'>set default</a><br/><br/><br/>"
src << browse(dat, "window=checkattack") src << browse("<html>[dat]</html>", "window=checkattack")
/mob/living/carbon/human/Topic(href, href_list) /mob/living/carbon/human/Topic(href, href_list)
if(href_list["default_attk"]) if(href_list["default_attk"])

2
tgui/packages/tgui-panel/settings/middleware.ts
View File

@@ -13,6 +13,7 @@ import {
removeHighlightSetting, removeHighlightSetting,
updateHighlightSetting, updateHighlightSetting,
updateSettings, updateSettings,
updateToggle,
} from './actions'; } from './actions';
import { FONTS_DISABLED } from './constants'; import { FONTS_DISABLED } from './constants';
import { selectSettings } from './selectors'; import { selectSettings } from './selectors';
@@ -91,6 +92,7 @@ export function settingsMiddleware(store) {
} }
if ( if (
type !== updateSettings.type && type !== updateSettings.type &&
type !== updateToggle.type &&
type !== loadSettings.type && type !== loadSettings.type &&
type !== addHighlightSetting.type && type !== addHighlightSetting.type &&
type !== removeHighlightSetting.type && type !== removeHighlightSetting.type &&

8
tgui/packages/tgui/interfaces/VorePanelExport/VorePanelExportDownload.tsx
View File

@@ -42,12 +42,12 @@ export const downloadPrefs = (extension: string) => {
'</p><div class="accordion" id="accordionBellies">', '</p><div class="accordion" id="accordionBellies">',
], ],
{ {
type: 'text/html;charset=utf8', type: 'text/html',
}, },
); );
bellies.forEach((belly, i) => { bellies.forEach((belly, i) => {
blob = new Blob([blob, generateBellyString(belly, i)], { blob = new Blob([blob, generateBellyString(belly, i)], {
type: 'text/html;charset=utf8', type: 'text/html',
}); });
}); });
blob = new Blob( blob = new Blob(
@@ -57,7 +57,7 @@ export const downloadPrefs = (extension: string) => {
'<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>',
'</div></main></body></html>', '</div></main></body></html>',
], ],
{ type: 'text/html;charset=utf8' }, { type: 'text/html' },
); );
} }
@@ -65,5 +65,5 @@ export const downloadPrefs = (extension: string) => {
blob = new Blob([JSON.stringify(bellies)], { type: 'application/json' }); blob = new Blob([JSON.stringify(bellies)], { type: 'application/json' });
} }
(window.navigator as any).msSaveOrOpenBlob(blob, filename); Byond.saveBlob(blob, filename, extension);
}; };

11
tgui/packages/tgui/interfaces/chompstation/VorePanelExport/VorePanelExportDownload.tsx
View File

@@ -1,4 +1,5 @@
import { useBackend } from '../../../backend'; import { useBackend } from 'tgui/backend';
import { Data } from './types'; import { Data } from './types';
import { generateBellyString } from './VorePanelExportBellyString'; import { generateBellyString } from './VorePanelExportBellyString';
import { getCurrentTimestamp } from './VorePanelExportTimestamp'; import { getCurrentTimestamp } from './VorePanelExportTimestamp';
@@ -42,12 +43,12 @@ export const downloadPrefs = (extension: string) => {
'</p><div class="accordion" id="accordionBellies">', '</p><div class="accordion" id="accordionBellies">',
], ],
{ {
type: 'text/html;charset=utf8', type: 'text/html',
}, },
); );
bellies.forEach((belly, i) => { bellies.forEach((belly, i) => {
blob = new Blob([blob, generateBellyString(belly, i)], { blob = new Blob([blob, generateBellyString(belly, i)], {
type: 'text/html;charset=utf8', type: 'text/html',
}); });
}); });
blob = new Blob( blob = new Blob(
@@ -57,7 +58,7 @@ export const downloadPrefs = (extension: string) => {
'<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>',
'</div></main></body></html>', '</div></main></body></html>',
], ],
{ type: 'text/html;charset=utf8' }, { type: 'text/html' },
); );
} }
@@ -65,5 +66,5 @@ export const downloadPrefs = (extension: string) => {
blob = new Blob([JSON.stringify(bellies)], { type: 'application/json' }); blob = new Blob([JSON.stringify(bellies)], { type: 'application/json' });
} }
(window.navigator as any).msSaveOrOpenBlob(blob, filename); Byond.saveBlob(blob, filename, extension);
}; };

14
tgui/public/tgui.html
View File

@@ -666,13 +666,13 @@
<!-- Fatal error container --> <!-- Fatal error container -->
<div id="FatalError" class="FatalError"> <div id="FatalError" class="FatalError">
<div class="FatalError__logo"> <div class="FatalError__logo">
ooooo ooo . .oooooo. .oooooo..o ooooo ooo . .oooooo. .oooooo..o
`888b. `8' .o8 d8P' `Y8b d8P' `Y8 `888b. `8' .o8 d8P' `Y8b d8P' `Y8
8 `88b. 8 .o888oo 888 888 Y88bo. 8 `88b. 8 .o888oo 888 888 Y88bo.
8 `88b. 8 888 888 888 `"Y8888o. 8 `88b. 8 888 888 888 `"Y8888o.
8 `88b.8 888 888 888 `"Y88b 8 `88b.8 888 888 888 `"Y88b
8 `888 888 . `88b d88' oo .d8P 8 `888 888 . `88b d88' oo .d8P
o8o `8 "888" `Y8bood8P' 8""88888P' o8o `8 "888" `Y8bood8P' 8""88888P'
</div> </div>
<marquee class="FatalError__header"> <marquee class="FatalError__header">
A fatal exception has occurred at 002B:C562F1B7 in TGUI. A fatal exception has occurred at 002B:C562F1B7 in TGUI.