Skip to content

Commit

Permalink
Merge branch 'master' into Command-Area-Remake
Browse files Browse the repository at this point in the history
  • Loading branch information
LC4492 authored Aug 27, 2023
2 parents 65d5bc7 + b788db1 commit 1a8c06e
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 18 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/autowiki.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ jobs:
- name: Install rust-g
if: steps.secrets_set.outputs.SECRETS_ENABLED
run: |
sudo dpkg --add-architecture i386
sudo apt update || true
sudo apt install -o APT::Immediate-Configure=false zlib1g-dev:i386 libssl-dev:i386
bash tools/ci/install_rust_g.sh
- name: Compile and generate Autowiki files
if: steps.secrets_set.outputs.SECRETS_ENABLED
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/whisper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@

//now mobs
var/speech_bubble_test = say_test(message)
var/image/speech_bubble = image('icons/mob/hud/talk.dmi',src,"h[speech_bubble_test]")
var/image/speech_bubble = image('icons/mob/effects/talk.dmi',src,"[bubble_icon][speech_bubble_test]")
speech_bubble.appearance_flags = NO_CLIENT_COLOR|KEEP_APART|RESET_COLOR

var/not_dead_speaker = (stat != DEAD)
Expand Down
4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4127.yml

This file was deleted.

5 changes: 0 additions & 5 deletions html/changelogs/AutoChangeLog-pr-4212.yml

This file was deleted.

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

This file was deleted.

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

This file was deleted.

13 changes: 13 additions & 0 deletions html/changelogs/archive/2023-08.yml
Original file line number Diff line number Diff line change
Expand Up @@ -410,3 +410,16 @@
- rscadd: Telephones can now receive calls from multiple networks.
- rscadd: Adds UPP, CLF and WY prefab phones.
- bugfix: UPP RTO pack is now titled UPP rather than USCM
2023-08-27:
AnuvKH:
- maptweak: Fixed deep ocean around NV monsoon, removed incend ammo.
Diegoflores31:
- bugfix: Glasses with flash protection can no longer be used for welding.
- refactor: Adds defines for negative welding protection.
Morrow:
- bugfix: fixed a bypass to allow ghost scan health when it should not be allowed
cuberound:
- rscadd: UPP SL gets proper bag with mini fire extinguisher three WP grenades ,
two snacks and an AP mag
harryob:
- bugfix: whispering no longer uses the old speech bubble

0 comments on commit 1a8c06e

Please sign in to comment.