diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index e2c89df90e9b..17464b44dae8 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,6 +1,6 @@ // tgstation-server DMAPI -#define TGS_DMAPI_VERSION "7.1.2" +#define TGS_DMAPI_VERSION "7.1.3" // All functions and datums outside this document are subject to change with any version and should not be relied on. diff --git a/code/game/objects/items/tools/cleaning_tools.dm b/code/game/objects/items/tools/cleaning_tools.dm index f392f096bcf6..fba21de3328d 100644 --- a/code/game/objects/items/tools/cleaning_tools.dm +++ b/code/game/objects/items/tools/cleaning_tools.dm @@ -99,13 +99,15 @@ desc = "This cone is trying to warn you of something!" icon_state = "cone" icon = 'icons/obj/janitor.dmi' + item_icons = 'icons/mob/humans/onmob/head_0.dmi' force = 1 throwforce = 3 throw_speed = SPEED_FAST throw_range = 5 w_class = SIZE_SMALL attack_verb = list("warned", "cautioned", "smashed") - + flags_equip_slot = SLOT_HEAD + flags_inv_hide = HIDEEARS|HIDETOPHAIR diff --git a/code/modules/tgs/README.md b/code/modules/tgs/README.md index 6319028d8106..35ca73d7e9a8 100644 --- a/code/modules/tgs/README.md +++ b/code/modules/tgs/README.md @@ -1,6 +1,6 @@ # DMAPI Internals -This folder should be placed on it's own inside a codebase that wishes to use the TGS DMAPI. Warranty void if modified. +This folder should be placed on its own inside a codebase that wishes to use the TGS DMAPI. Warranty void if modified. - [includes.dm](./includes.dm) is the file that should be included by DM code, it handles including the rest. - The [core](./core) folder includes all code not directly part of any API version. diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm index 95b8edd3ee5c..05d0dee25b3c 100644 --- a/code/modules/tgs/v5/api.dm +++ b/code/modules/tgs/v5/api.dm @@ -50,7 +50,9 @@ version = null // we want this to be the TGS version, not the interop version // sleep once to prevent an issue where world.Export on the first tick can hang indefinitely + TGS_DEBUG_LOG("Starting Export bug prevention sleep tick. time:[world.time] sleep_offline:[world.sleep_offline]") sleep(world.tick_lag) + TGS_DEBUG_LOG("Export bug prevention sleep complete") var/list/bridge_response = Bridge(DMAPI5_BRIDGE_COMMAND_STARTUP, list(DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL = minimum_required_security_level, DMAPI5_BRIDGE_PARAMETER_VERSION = api_version.raw_parameter, DMAPI5_PARAMETER_CUSTOM_COMMANDS = ListCustomCommands(), DMAPI5_PARAMETER_TOPIC_PORT = GetTopicPort())) if(!istype(bridge_response)) diff --git a/html/changelogs/AutoChangeLog-pr-6563.yml b/html/changelogs/AutoChangeLog-pr-6563.yml deleted file mode 100644 index a7b212dd963e..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6563.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Steelpoint" -delete-after: True -changes: - - imageadd: "The Sniper and Anti-Material Rifle Specialists will now use an urban camouflage sprite for their ghillie suit instead of a green camouflage." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6581.yml b/html/changelogs/AutoChangeLog-pr-6581.yml deleted file mode 100644 index 2510f8ece84b..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6581.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Blundir" -delete-after: True -changes: - - imageadd: "shoes icons resprite" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6668.yml b/html/changelogs/AutoChangeLog-pr-6668.yml deleted file mode 100644 index d4a009d8dd79..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6668.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "Blundir" -delete-after: True -changes: - - bugfix: "fixed runner having no gib animation" - - bugfix: "fixed gib remains being invisible" - - imageadd: "boiler gib animation" - - imageadd: "larva gib remains" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6684.yml b/html/changelogs/AutoChangeLog-pr-6684.yml deleted file mode 100644 index 2eea40559f7a..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6684.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "BlackCrystalic" -delete-after: True -changes: - - qol: "if server take too long to pre init all before lobby art, players will see lobbyart \"loading\"" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6716.yml b/html/changelogs/AutoChangeLog-pr-6716.yml deleted file mode 100644 index 6d66bde00997..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6716.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "rythenx" -delete-after: True -changes: - - rscadd: "more options for hats to ASO vendor to bring it in line with what SO has available" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6776.yml b/html/changelogs/AutoChangeLog-pr-6776.yml deleted file mode 100644 index 4ff50416b836..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6776.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "realforest2001" -delete-after: True -changes: - - rscadd: "Synthetics and Yautja now spawn with the Iron Teeth trait, not dropping items held in their mouth." \ No newline at end of file diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml index 815d6987ea35..3a08f35ded14 100644 --- a/html/changelogs/archive/2024-07.yml +++ b/html/changelogs/archive/2024-07.yml @@ -228,3 +228,26 @@ 2024-07-25: cuberound: - rscdel: removes /obj/item/device/suit_cooling_unit and get_pressure_weakness() +2024-07-26: + BlackCrystalic: + - qol: if server take too long to pre init all before lobby art, players will see + lobbyart "loading" + Blundir: + - bugfix: fixed runner having no gib animation + - bugfix: fixed gib remains being invisible + - imageadd: boiler gib animation + - imageadd: larva gib remains + - imageadd: shoes icons resprite + Steelpoint: + - imageadd: The Sniper and Anti-Material Rifle Specialists will now use an urban + camouflage sprite for their ghillie suit instead of a green camouflage. + realforest2001: + - rscadd: Synthetics and Yautja now spawn with the Iron Teeth trait, not dropping + items held in their mouth. + rythenx: + - rscadd: more options for hats to ASO vendor to bring it in line with what SO has + available +2024-07-29: + TheManWithNoHands: + - code_imp: adds flags to cone, allowing it to be worn on head + - imageadd: added on mob sprites for cone diff --git a/icons/mob/humans/onmob/head_0.dmi b/icons/mob/humans/onmob/head_0.dmi index 9fc0bc82c123..4a4338eac4c2 100644 Binary files a/icons/mob/humans/onmob/head_0.dmi and b/icons/mob/humans/onmob/head_0.dmi differ