cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-22 05:25:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '179a607a90ad7ec62bdaff4e6fe72af60ee56442' of https://github.com/tgstation/tgstation into upstream-24-10b

Browse Source
This commit is contained in:
Majkl-J
2024-10-23 23:27:16 -07:00
parent c90e3e69b9 179a607a90
commit e59d8ba64b
4642 changed files with 25352 additions and 14167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/asset_cache/assets/rtd.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "rtd"
/datum/asset/spritesheet/rtd/create_spritesheets()
//some tiles may share the same icon but have diffrent properties to animate that icon
//some tiles may share the same icon but have different properties to animate that icon
//so we keep track of what icons we registered
var/list/registered = list()
code/modules/asset_cache/transports/asset_transport.dm
+1 -1
View File
@@ -125,7 +125,7 @@
if (unreceived.len)
if (unreceived.len >= ASSET_CACHE_TELL_CLIENT_AMOUNT)
to_chat(client, "<span class='infoplain'>Sending Resources...</span>")
to_chat(client, span_infoplain("Sending Resources..."))
for (var/asset_name in unreceived)
var/new_asset_name = asset_name