mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-19 14:12:55 +00:00
3591 individual conflicts Update build.js Update install_node.sh Update byond.js oh my fucking god hat slow huh holy shit we all fall down 2 more I missed 2900 individual conflicts 2700 Individual conflicts replaces yarn file with tg version, bumping us down to 2200-ish Down to 2000 individual conflicts 140 down mmm aaaaaaaaaaaaaaaaaaa not yt 575 soon 900 individual conflicts 600 individual conflicts, 121 file conflicts im not okay 160 across 19 files 29 in 4 files 0 conflicts, compiletime fix time some minor incap stuff missed ticks weird dupe definition stuff missed ticks 2 incap fixes undefs and pie fix Radio update and some extra minor stuff returns a single override no more dupe definitions, 175 compiletime errors Unticked file fix sound and emote stuff honk and more radio stuff
128 lines
4.1 KiB
Plaintext
128 lines
4.1 KiB
Plaintext
#undef DMAPI5_PARAM_SERVER_PORT
|
|
#undef DMAPI5_PARAM_ACCESS_IDENTIFIER
|
|
|
|
#undef DMAPI5_BRIDGE_DATA
|
|
#undef DMAPI5_TOPIC_DATA
|
|
|
|
#undef DMAPI5_BRIDGE_REQUEST_LIMIT
|
|
#undef DMAPI5_TOPIC_REQUEST_LIMIT
|
|
#undef DMAPI5_TOPIC_RESPONSE_LIMIT
|
|
|
|
#undef DMAPI5_BRIDGE_COMMAND_STARTUP
|
|
#undef DMAPI5_BRIDGE_COMMAND_PRIME
|
|
#undef DMAPI5_BRIDGE_COMMAND_REBOOT
|
|
#undef DMAPI5_BRIDGE_COMMAND_KILL
|
|
#undef DMAPI5_BRIDGE_COMMAND_CHAT_SEND
|
|
#undef DMAPI5_BRIDGE_COMMAND_CHUNK
|
|
#undef DMAPI5_BRIDGE_COMMAND_EVENT
|
|
|
|
#undef DMAPI5_PARAMETER_ACCESS_IDENTIFIER
|
|
#undef DMAPI5_PARAMETER_CUSTOM_COMMANDS
|
|
|
|
#undef DMAPI5_CHUNK
|
|
#undef DMAPI5_CHUNK_PAYLOAD
|
|
#undef DMAPI5_CHUNK_TOTAL
|
|
#undef DMAPI5_CHUNK_SEQUENCE_ID
|
|
#undef DMAPI5_CHUNK_PAYLOAD_ID
|
|
|
|
#undef DMAPI5_MISSING_CHUNKS
|
|
|
|
#undef DMAPI5_RESPONSE_ERROR_MESSAGE
|
|
|
|
#undef DMAPI5_BRIDGE_PARAMETER_COMMAND_TYPE
|
|
#undef DMAPI5_BRIDGE_PARAMETER_CURRENT_PORT
|
|
#undef DMAPI5_BRIDGE_PARAMETER_VERSION
|
|
#undef DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE
|
|
#undef DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL
|
|
#undef DMAPI5_BRIDGE_PARAMETER_EVENT_INVOCATION
|
|
|
|
#undef DMAPI5_BRIDGE_RESPONSE_NEW_PORT
|
|
#undef DMAPI5_BRIDGE_RESPONSE_RUNTIME_INFORMATION
|
|
|
|
#undef DMAPI5_CHAT_MESSAGE_CHANNEL_IDS
|
|
|
|
#undef DMAPI5_RUNTIME_INFORMATION_ACCESS_IDENTIFIER
|
|
#undef DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION
|
|
#undef DMAPI5_RUNTIME_INFORMATION_SERVER_PORT
|
|
#undef DMAPI5_RUNTIME_INFORMATION_API_VALIDATE_ONLY
|
|
#undef DMAPI5_RUNTIME_INFORMATION_INSTANCE_NAME
|
|
#undef DMAPI5_RUNTIME_INFORMATION_REVISION
|
|
#undef DMAPI5_RUNTIME_INFORMATION_TEST_MERGES
|
|
#undef DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL
|
|
#undef DMAPI5_RUNTIME_INFORMATION_VISIBILITY
|
|
|
|
#undef DMAPI5_CHAT_UPDATE_CHANNELS
|
|
|
|
#undef DMAPI5_TEST_MERGE_TIME_MERGED
|
|
#undef DMAPI5_TEST_MERGE_REVISION
|
|
#undef DMAPI5_TEST_MERGE_TITLE_AT_MERGE
|
|
#undef DMAPI5_TEST_MERGE_BODY_AT_MERGE
|
|
#undef DMAPI5_TEST_MERGE_URL
|
|
#undef DMAPI5_TEST_MERGE_AUTHOR
|
|
#undef DMAPI5_TEST_MERGE_NUMBER
|
|
#undef DMAPI5_TEST_MERGE_PULL_REQUEST_REVISION
|
|
#undef DMAPI5_TEST_MERGE_COMMENT
|
|
|
|
#undef DMAPI5_CHAT_COMMAND_NAME
|
|
#undef DMAPI5_CHAT_COMMAND_PARAMS
|
|
#undef DMAPI5_CHAT_COMMAND_USER
|
|
|
|
#undef DMAPI5_EVENT_NOTIFICATION_TYPE
|
|
#undef DMAPI5_EVENT_NOTIFICATION_PARAMETERS
|
|
|
|
#undef DMAPI5_TOPIC_COMMAND_CHAT_COMMAND
|
|
#undef DMAPI5_TOPIC_COMMAND_EVENT_NOTIFICATION
|
|
#undef DMAPI5_TOPIC_COMMAND_CHANGE_PORT
|
|
#undef DMAPI5_TOPIC_COMMAND_CHANGE_REBOOT_STATE
|
|
#undef DMAPI5_TOPIC_COMMAND_INSTANCE_RENAMED
|
|
#undef DMAPI5_TOPIC_COMMAND_CHAT_CHANNELS_UPDATE
|
|
#undef DMAPI5_TOPIC_COMMAND_SERVER_PORT_UPDATE
|
|
#undef DMAPI5_TOPIC_COMMAND_HEALTHCHECK
|
|
#undef DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH
|
|
#undef DMAPI5_TOPIC_COMMAND_SEND_CHUNK
|
|
#undef DMAPI5_TOPIC_COMMAND_RECEIVE_CHUNK
|
|
#undef DMAPI5_TOPIC_COMMAND_RECEIVE_BROADCAST
|
|
#undef DMAPI5_TOPIC_COMMAND_COMPLETE_EVENT
|
|
|
|
#undef DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE
|
|
#undef DMAPI5_TOPIC_PARAMETER_CHAT_COMMAND
|
|
#undef DMAPI5_TOPIC_PARAMETER_EVENT_NOTIFICATION
|
|
#undef DMAPI5_TOPIC_PARAMETER_NEW_PORT
|
|
#undef DMAPI5_TOPIC_PARAMETER_NEW_REBOOT_STATE
|
|
#undef DMAPI5_TOPIC_PARAMETER_NEW_INSTANCE_NAME
|
|
#undef DMAPI5_TOPIC_PARAMETER_CHAT_UPDATE
|
|
#undef DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION
|
|
#undef DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE
|
|
|
|
#undef DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT
|
|
#undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE
|
|
#undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE
|
|
#undef DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES
|
|
|
|
#undef DMAPI5_REVISION_INFORMATION_COMMIT_SHA
|
|
#undef DMAPI5_REVISION_INFORMATION_TIMESTAMP
|
|
#undef DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA
|
|
|
|
#undef DMAPI5_CHAT_USER_ID
|
|
#undef DMAPI5_CHAT_USER_FRIENDLY_NAME
|
|
#undef DMAPI5_CHAT_USER_MENTION
|
|
#undef DMAPI5_CHAT_USER_CHANNEL
|
|
|
|
#undef DMAPI5_CHAT_CHANNEL_ID
|
|
#undef DMAPI5_CHAT_CHANNEL_FRIENDLY_NAME
|
|
#undef DMAPI5_CHAT_CHANNEL_CONNECTION_NAME
|
|
#undef DMAPI5_CHAT_CHANNEL_IS_ADMIN_CHANNEL
|
|
#undef DMAPI5_CHAT_CHANNEL_IS_PRIVATE_CHANNEL
|
|
#undef DMAPI5_CHAT_CHANNEL_TAG
|
|
#undef DMAPI5_CHAT_CHANNEL_EMBEDS_SUPPORTED
|
|
|
|
#undef DMAPI5_CUSTOM_CHAT_COMMAND_NAME
|
|
#undef DMAPI5_CUSTOM_CHAT_COMMAND_HELP_TEXT
|
|
#undef DMAPI5_CUSTOM_CHAT_COMMAND_ADMIN_ONLY
|
|
|
|
#undef DMAPI5_EVENT_ID
|
|
|
|
#undef DMAPI5_EVENT_INVOCATION_NAME
|
|
#undef DMAPI5_EVENT_INVOCATION_PARAMETERS
|
|
#undef DMAPI5_EVENT_INVOCATION_NOTIFY_COMPLETION
|