Skip to content

Commit

Permalink
Merge branch 'master' into beep
Browse files Browse the repository at this point in the history
  • Loading branch information
Blundir committed Jul 29, 2024
2 parents 078a1da + 79b931c commit f7ea33c
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion code/__DEFINES/tgs.dm
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
4 changes: 3 additions & 1 deletion code/game/objects/items/tools/cleaning_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down
2 changes: 1 addition & 1 deletion code/modules/tgs/README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 2 additions & 0 deletions code/modules/tgs/v5/api.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-6563.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-6581.yml

This file was deleted.

7 changes: 0 additions & 7 deletions html/changelogs/AutoChangeLog-pr-6668.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-6684.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-6716.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-6776.yml

This file was deleted.

23 changes: 23 additions & 0 deletions html/changelogs/archive/2024-07.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file modified icons/mob/humans/onmob/head_0.dmi
Binary file not shown.

0 comments on commit f7ea33c

Please sign in to comment.