Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit f3ef7f8

Browse files
516 support (#22996)
* all the misc ports * caller * href * compile... NOW * fix a runtime that was bugging me on localhost * Update __byond_version_compat.dm * more 516 stuff * Update skin.dmf * more href * renderer * . * Revert "." This reverts commit 9ceeff9. * a * Fixes assets * v4 * cache * Update global.d.ts * Update check_grep.sh * grep caught this wahoo * ports swag ass fonts * a * Update chatmessage.dm * Fixes languages * wahoo! * Update statpanel.dm * lol * givin up * store * ports tgstation/tgstation#66309 * We don't have tracy * Update renderer.js * Update renderer.js * jsx * Update tgui.html * Update tgui.html * Fixes alerts and skillmenu * add devtools here * Bumps version & Fixes adding/removing verbs --------- Co-authored-by: Byemoh <[email protected]>
1 parent 2dbbe5e commit f3ef7f8

File tree

287 files changed

+6238
-4196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

287 files changed

+6238
-4196
lines changed

.github/workflows/autodoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414
with:
1515
ref: master
1616

.github/workflows/compile_changelogs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
python -m pip install pyyaml
2323
sudo apt-get install dos2unix
2424
- name: "Checkout"
25-
uses: actions/checkout@v1
25+
uses: actions/checkout@v4
2626
with:
2727
fetch-depth: 25
2828
- name: "Compile"

.github/workflows/turdis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Lints
1717
runs-on: ubuntu-20.04
1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
2020

2121
- name: Cache SpacemanDMM
2222
uses: actions/cache@v4
@@ -84,7 +84,7 @@ jobs:
8484
name: Compile All Maps
8585
runs-on: ubuntu-20.04
8686
steps:
87-
- uses: actions/checkout@v2
87+
- uses: actions/checkout@v4
8888

8989
- name: Install Dependencies
9090
run: |
@@ -118,7 +118,7 @@ jobs:
118118
outputs:
119119
maps: ${{ steps.map_finder.outputs.maps }}
120120
steps:
121-
- uses: actions/checkout@v2
121+
- uses: actions/checkout@v4
122122
- name: Find Maps
123123
id: map_finder
124124
run: |
@@ -145,7 +145,7 @@ jobs:
145145
group: ci-${{ github.ref }}-${{ matrix.map }}
146146
cancel-in-progress: true
147147
steps:
148-
- uses: actions/checkout@v2
148+
- uses: actions/checkout@v4
149149

150150
- name: Install Dependencies
151151
run: |

code/__DEFINES/MC.dm

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,6 @@
107107
/datum/controller/subsystem/timer/##X/fire() {..() /*just so it shows up on the profiler*/} \
108108
/datum/controller/subsystem/timer/##X
109109

110-
// #define MOVEMENT_SUBSYSTEM_DEF(X) GLOBAL_REAL(SS##X, /datum/controller/subsystem/movement/##X);
111-
// /datum/controller/subsystem/movement/##X/New(){
112-
// NEW_SS_GLOBAL(SS##X);
113-
// PreInit();
114-
// }
115-
// /datum/controller/subsystem/movement/##X/fire() {..() /*just so it shows up on the profiler*/}
116-
// /datum/controller/subsystem/movement/##X
117-
118110
#define PROCESSING_SUBSYSTEM_DEF(X) GLOBAL_REAL(SS##X, /datum/controller/subsystem/processing/##X);\
119111
/datum/controller/subsystem/processing/##X/New(){\
120112
NEW_SS_GLOBAL(SS##X);\

code/__DEFINES/_tick.dm

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
/// runs stoplag if tick_usage is above the limit
2323
#define CHECK_TICK ( TICK_CHECK ? stoplag() : 0 )
2424

25+
/// Checks if a sleeping proc is running before or after the master controller
26+
#define RUNNING_BEFORE_MASTER ( Master.last_run != null && Master.last_run != world.time )
27+
/// Returns true if a verb ought to yield to the MC (IE: queue up to be processed by a subsystem)
28+
#define VERB_SHOULD_YIELD ( TICK_CHECK || RUNNING_BEFORE_MASTER )
29+
2530
/// Returns true if tick usage is above 95, for high priority usage
2631
#define TICK_CHECK_HIGH_PRIORITY ( TICK_USAGE > 95 )
2732
/// runs stoplag if tick_usage is above 95, for high priority usage

code/__DEFINES/admin.dm

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,29 +43,29 @@
4343

4444
#define R_DEFAULT R_AUTOLOGIN
4545

46-
#define ADMIN_QUE(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminmoreinfo=[REF(user)]'>?</a>)"
47-
#define ADMIN_FLW(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminplayerobservefollow=[REF(user)]'>FLW</a>)"
48-
#define ADMIN_PP(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminplayeropts=[REF(user)]'>PP</a>)"
49-
#define ADMIN_VV(atom) "(<a href='?_src_=vars;[HrefToken(TRUE)];Vars=[REF(atom)]'>VV</a>)"
50-
#define ADMIN_SM(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];subtlemessage=[REF(user)]'>SM</a>)"
51-
#define ADMIN_TP(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];traitor=[REF(user)]'>TP</a>)"
52-
#define ADMIN_KICK(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];boot2=[REF(user)]'>KICK</a>)"
53-
#define ADMIN_CENTCOM_REPLY(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];CentComReply=[REF(user)]'>RPLY</a>)"
54-
#define ADMIN_SYNDICATE_REPLY(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];SyndicateReply=[REF(user)]'>RPLY</a>)"
55-
#define ADMIN_SC(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminspawncookie=[REF(user)]'>SC</a>)"
56-
#define ADMIN_SMITE(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminsmite=[REF(user)]'>SMITE</a>)"
46+
#define ADMIN_QUE(user) "(<a href='byond://?_src_=holder;[HrefToken(TRUE)];adminmoreinfo=[REF(user)]'>?</a>)"
47+
#define ADMIN_FLW(user) "(<a href='byond://?_src_=holder;[HrefToken(TRUE)];adminplayerobservefollow=[REF(user)]'>FLW</a>)"
48+
#define ADMIN_PP(user) "(<a href='byond://?_src_=holder;[HrefToken(TRUE)];adminplayeropts=[REF(user)]'>PP</a>)"
49+
#define ADMIN_VV(atom) "(<a href='byond://?_src_=vars;[HrefToken(TRUE)];Vars=[REF(atom)]'>VV</a>)"
50+
#define ADMIN_SM(user) "(<a href='byond://?_src_=holder;[HrefToken(TRUE)];subtlemessage=[REF(user)]'>SM</a>)"
51+
#define ADMIN_TP(user) "(<a href='byond://?_src_=holder;[HrefToken(TRUE)];traitor=[REF(user)]'>TP</a>)"
52+
#define ADMIN_KICK(user) "(<a href='byond://?_src_=holder;[HrefToken(TRUE)];boot2=[REF(user)]'>KICK</a>)"
53+
#define ADMIN_CENTCOM_REPLY(user) "(<a href='byond://?_src_=holder;[HrefToken(TRUE)];CentComReply=[REF(user)]'>RPLY</a>)"
54+
#define ADMIN_SYNDICATE_REPLY(user) "(<a href='byond://?_src_=holder;[HrefToken(TRUE)];SyndicateReply=[REF(user)]'>RPLY</a>)"
55+
#define ADMIN_SC(user) "(<a href='byond://?_src_=holder;[HrefToken(TRUE)];adminspawncookie=[REF(user)]'>SC</a>)"
56+
#define ADMIN_SMITE(user) "(<a href='byond://?_src_=holder;[HrefToken(TRUE)];adminsmite=[REF(user)]'>SMITE</a>)"
5757
#define ADMIN_LOOKUP(user) "[key_name_admin(user)][ADMIN_QUE(user)]"
5858
#define ADMIN_LOOKUPFLW(user) "[key_name_admin(user)][ADMIN_QUE(user)] [ADMIN_FLW(user)]"
59-
#define ADMIN_SET_SD_CODE "(<a href='?_src_=holder;[HrefToken(TRUE)];set_selfdestruct_code=1'>SETCODE</a>)"
60-
#define ADMIN_SET_BC_CODE "(<a href='?_src_=holder;[HrefToken(TRUE)];set_beer_code=1'>SETBEER</a>)"
59+
#define ADMIN_SET_SD_CODE "(<a href='byond://?_src_=holder;[HrefToken(TRUE)];set_selfdestruct_code=1'>SETCODE</a>)"
60+
#define ADMIN_SET_BC_CODE "(<a href='byond://?_src_=holder;[HrefToken(TRUE)];set_beer_code=1'>SETBEER</a>)"
6161
#define ADMIN_FULLMONTY_NONAME(user) "[ADMIN_QUE(user)] [ADMIN_PP(user)] [ADMIN_VV(user)] [ADMIN_SM(user)] [ADMIN_FLW(user)] [ADMIN_TP(user)] [ADMIN_INDIVIDUALLOG(user)] [ADMIN_SMITE(user)]"
6262
#define ADMIN_FULLMONTY(user) "[key_name_admin(user)] [ADMIN_FULLMONTY_NONAME(user)]"
63-
#define ADMIN_JMP(src) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)"
63+
#define ADMIN_JMP(src) "(<a href='byond://?_src_=holder;[HrefToken(TRUE)];adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)"
6464
#define COORD(src) "[src ? "([src.x],[src.y],[src.z])" : "nonexistent location"]"
6565
#define AREACOORD(src) "[src ? "[get_area_name(src, TRUE)] ([src.x], [src.y], [src.z])" : "nonexistent location"]"
6666
#define ADMIN_COORDJMP(src) "[src ? "[COORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]"
6767
#define ADMIN_VERBOSEJMP(src) "[src ? "[AREACOORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]"
68-
#define ADMIN_INDIVIDUALLOG(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];individuallog=[REF(user)]'>LOGS</a>)"
68+
#define ADMIN_INDIVIDUALLOG(user) "(<a href='byond://?_src_=holder;[HrefToken(TRUE)];individuallog=[REF(user)]'>LOGS</a>)"
6969

7070
#define ADMIN_PUNISHMENT_LIGHTNING "Lightning bolt"
7171
#define ADMIN_PUNISHMENT_BRAINDAMAGE "Brain damage"

code/__DEFINES/chat.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
#define MESSAGE_TYPE_MENTORPM "mentorpm"
2626
#define MESSAGE_TYPE_DONATOR "donator"
2727

28+
/// Max length of chat message in characters
29+
#define CHAT_MESSAGE_MAX_LENGTH 110
30+
2831
/// Adds a generic box around whatever message you're sending in chat. Really makes things stand out.
2932
#define EXAMINE_BLOCK(str) ("<div class='examine_block'>" + str + "</div>")
3033

31-
/// Max length of chat message in characters
32-
#define CHAT_MESSAGE_MAX_LENGTH 110
33-
3434
//debug printing macros (for development and testing)
3535
/// Used for debug messages to the world
3636
#define debug_world(msg) if (GLOB.Debug2) to_chat(world, \

code/__DEFINES/fonts.dm

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Font metrics bitfield
2+
/// Include leading A width and trailing C width in GetWidth() or in DrawText()
3+
#define INCLUDE_AC (1<<0)
4+
5+
DEFINE_BITFIELD(font_flags, list(
6+
"INCLUDE_AC" = INCLUDE_AC,
7+
))

code/__DEFINES/html_assistant.dm

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,10 @@
3232
"[(GLOB.tooltips[config_key] ? "<div class='tooltip'>[hover_me]<span class='tooltiptext' style='width: [width_px]px'>[GLOB.tooltips[config_key]]</span></div>" : "[hover_me]")]"
3333

3434
#define OPEN_WIKI(wiki_url, text) (CONFIG_GET(string/wikiurl) ? "<a href='[CONFIG_GET(string/wikiurl)+"/"+wiki_url]' target='_blank'>[text]</a>" : "[text]")
35+
36+
37+
#define HTML_SKELETON_INTERNAL(head, body) \
38+
"<!DOCTYPE html><html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><meta http-equiv='X-UA-Compatible' content='IE=edge'>[head]</head><body>[body]</body></html>"
39+
40+
#define HTML_SKELETON_TITLE(title, body) HTML_SKELETON_INTERNAL("<title>[title]</title>", body)
41+
#define HTML_SKELETON(body) HTML_SKELETON_INTERNAL("", body)

code/__DEFINES/say.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@
9090
#define EAVESDROP_EXTRA_RANGE 1 //how much past the specified message_range does the message get starred, whispering only
9191

9292
// A link given to ghost alice to follow bob
93-
#define FOLLOW_LINK(alice, bob) "<a href=?src=[REF(alice)];follow=[REF(bob)]>(F)</a>"
94-
#define TURF_LINK(alice, turfy) "<a href=?src=[REF(alice)];x=[turfy.x];y=[turfy.y];z=[turfy.z]>(T)</a>"
95-
#define FOLLOW_OR_TURF_LINK(alice, bob, turfy) "<a href=?src=[REF(alice)];follow=[REF(bob)];x=[turfy.x];y=[turfy.y];z=[turfy.z]>(F)</a>"
93+
#define FOLLOW_LINK(alice, bob) "<a href=byond://?src=[REF(alice)];follow=[REF(bob)]>(F)</a>"
94+
#define TURF_LINK(alice, turfy) "<a href=byond://?src=[REF(alice)];x=[turfy.x];y=[turfy.y];z=[turfy.z]>(T)</a>"
95+
#define FOLLOW_OR_TURF_LINK(alice, bob, turfy) "<a href=byond://?src=[REF(alice)];follow=[REF(bob)];x=[turfy.x];y=[turfy.y];z=[turfy.z]>(F)</a>"
9696

9797
#define LINGHIVE_NONE 0
9898
#define LINGHIVE_OUTSIDER 1

0 commit comments

Comments
 (0)