Commit Graph
13 Commits
Author SHA1 Message Date
Majkl-J e59d8ba64b Merge commit '179a607a90ad7ec62bdaff4e6fe72af60ee56442' of https://github.com/tgstation/tgstation into upstream-24-10b 2024-10-23 23:27:16 -07:00
SmArtKarandGitHub d4ac95a0e1 Nobody expects the span inquisition: replaces most <span>s with macros (#86798)
## About The Pull Request
123 changed files and multiple crashes after writing broken regex, I
replaced most remains of direct spans with macros. This cleans up the
code and makes it easier to work with in general, see justification for
the original PR. I also fixed a bunch of broken and/or unclosed spans
here too.
I intentionally avoided replacing spans with multiple classes (in most
cases) and spans in the middle of strings as it would impact readability
(in my opinion at least) and could be done later if required.

## Why It's Good For The Game

Cleaner code, actually using our macros, fixes borked HTML in some
places. See original PR.

## Changelog
Nothing player-facing
2024-09-26 19:36:13 +00:00
grungussussandGitHub 58501dce77 Reorganizes the sound folder (#86726)
## About The Pull Request

<details>

- renamed ai folder to announcer

-- announcer --
- moved vox_fem to announcer
- moved approachingTG to announcer

- separated the ambience folder into ambience and instrumental
-- ambience --

- created holy folder moved all related sounds there
- created engineering folder and moved all related sounds there
- created security folder and moved ambidet there
- created general folder and moved ambigen there
- created icemoon folder and moved all icebox-related ambience there
- created medical folder and moved all medbay-related ambi there
- created ruin folder and moves all ruins ambi there
- created beach folder and moved seag and shore there
- created lavaland folder and moved related ambi there
- created aurora_caelus folder and placed its ambi there
- created misc folder and moved the rest of the files that don't have a
specific category into it

-- instrumental --

- moved traitor folder here
- created lobby_music folder and placed our songs there (title0 not used
anywhere? - server-side modification?)

-- items --

- moved secdeath to hailer
- moved surgery to handling

-- effects --

- moved chemistry into effects
- moved hallucinations into effects
- moved health into effects
- moved magic into effects

-- vehicles --

- moved mecha into vehicles


created mobs folder

-- mobs --

- moved creatures folder into mobs
- moved voice into mobs

renamed creatures to non-humanoids
renamed voice to humanoids

-- non-humanoids--

created cyborg folder
created hiss folder
moved harmalarm.ogg to cyborg

-- humanoids --




-- misc --

moved ghostwhisper to misc
moved insane_low_laugh to misc

I give up trying to document this.

</details>

- [X] ambience
- [x] announcer
- [x] effects
- [X] instrumental
- [x] items
- [x] machines
- [x] misc 
- [X] mobs
- [X] runtime
- [X] vehicles

- [ ] attributions

## Why It's Good For The Game

This folder is so disorganized that it's vomit inducing, will make it
easier to find and add new sounds, providng a minor structure to the
sound folder.

## Changelog
🆑 grungussuss
refactor: the sound folder in the source code has been reorganized,
please report any oddities with sounds playing or not playing
server: lobby music has been repathed to sound/music/lobby_music
/🆑
2024-09-23 22:24:50 -07:00
650be38517 [MIRROR] Fixes a weird formatting problem with the intern announcer (#28052)
* Fixes a weird formatting problem with the intern announcer (#83630)

## About The Pull Request
Fixes this:

![image](https://github.com/tgstation/tgstation/assets/37270891/90c0e496-5eda-47f2-945e-3293ce9ead7d)

## Why It's Good For The Game
Bugfix

## Changelog
🆑
spellcheck: Intern announcer no longer has a weird space before the
introduction message.
/🆑

Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>

* Fixes a weird formatting problem with the intern announcer

---------

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>
2024-06-08 15:20:05 +05:30
69e46a61e4 Fixes a weird formatting problem with the intern announcer (#83630)
## About The Pull Request
Fixes this:

![image](https://github.com/tgstation/tgstation/assets/37270891/90c0e496-5eda-47f2-945e-3293ce9ead7d)

## Why It's Good For The Game
Bugfix

## Changelog
🆑
spellcheck: Intern announcer no longer has a weird space before the
introduction message.
/🆑

Co-authored-by: Watermelon914 <3052169-Watermelon914@users.noreply.gitlab.com>
2024-06-08 00:48:23 +00:00
7cb9bb365b [MIRROR] Air alarms will now talk about their problems [MDB IGNORE] (#21497)
* Air alarms will now talk about their problems

* Update code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm

---------

Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2023-05-29 23:26:37 +00:00
e1456b0cf6 Massive announcer/BSA overhaul (#4254)
* oh yeehaw

* Update default_announcer.dm

* a

* Update sound.dm

* Delete poweroff.ogg

* pref+newshit!

* Update preferences.dm

* Update preferences.dm

* Update preferences.dm

* a

* Update set_security_level.dm

* a

* a

* a

* Update default_announcer.dm

* a

* a

* Update priority_announce.dm

* a

* Update priority_announce.dm

* ERT NOW HAS AN ALERT OPTION

* more changes to sounds! ALERTS

* Update set_security_level.dm

* THSI IS THE WAYSDFSASA

* you think you've seen shitcode? just you wait cowboy.

* a

* Update set_security_level.dm

* Update default_announcer.dm

* Update set_security_level.dm

* Update set_security_level.dm

* Update gravitygenerator.dm

* BSA AND FIXES!

* a

* Update bsa_cannon.dm

* Update bsa_cannon.dm

* aaaaaaaaaaaaaa

* Update bsa_cannon.dm

* Update bsa_cannon.dm

* Update bsa_cannon.dm

* a

* autodocker

* Update modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm

Co-authored-by: Azarak <azarak10@gmail.com>
2021-03-23 00:16:26 +00:00
bf451b7e62 [MIRROR] Medbot centcom announcer and relative station trait. (#4033)
* Medbot centcom announcer and relative station trait. (#57532)

Co-authored-by: Qustinnus <Floydje123@ hotmail.com>

* Medbot centcom announcer and relative station trait.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Qustinnus <Floydje123@ hotmail.com>
2021-03-10 11:34:08 +00:00
d5b14f5cc4 Medbot centcom announcer and relative station trait. (#57532)
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2021-03-09 16:11:17 -08:00
24803c3662 [MIRROR] Fixes another broken announcer sound (and removes a copy-pasted file) (#3835)
* Fixes another broken announcer sound (and removes a copy-pasted file) (#57369)

* Fixes another broken announcer sound (and removes a copy-pasted file)

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-03-04 01:03:56 +00:00
MrMelbertandGitHub ad9352ded0 Fixes another broken announcer sound (and removes a copy-pasted file) (#57369) 2021-03-03 16:36:23 -08:00
cc67a133e5 [MIRROR] [READY] Adds station traits: Small modifiers that can randomly be chosen each round (#3132)
* [READY] Adds station traits: Small modifiers that can randomly be chosen each round

* conflicts

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:07:24 +00:00
95731342b9 [READY] Adds station traits: Small modifiers that can randomly be chosen each round (#56309)
This PR adds station traits which are essentially small changes to a normal round that can be used to create small variations in how a round might play out, sometimes there might be only one, very simple trait, but you might have a round where they have a somewhat bigger impact, to make rounds feel slightly more different from each other.

The following traits have been added:
Positive:

    Lucky winner - Free pizza and beer every 6-12 minutes
    Galactic Grant - Larger starting funds for cargo
    Premium internals boxes - emergency box has flare + radio as bonus
    Bountiful bounties - Bounties pay 20% more
    Strong supply lines - Imports 20% cheaper
    Filled maint - More loot in maint
    Fast shuttle - Cargo shuttle is faster
    Free scarves - Free scarfs if a slot is free

Neutral:

    Bananium shipment - Clown starts with 5 sheets of bananium (Neutral because this helps noone but the clown)
    Unnatural atmosphere - Lava planet can get more restricted gasses
    Unique AI - Random lawset at roundstart for AI
    Ian adventure - Ian teleports to a random spot on the station
    Glitched PDAs - PDA's have a different beep
    Announcer intern - Changes the announcement messages to sound like they're from an intern at Centcom

Negative:

    Carp infestation - Carp event is more common and can start earlier
    Weak supply lines - Imports 20% more expensive
    Blackout - Station lights are partially broken around the station
    Empty maint - Less loot in maint
    Overflow bureacracy mistake - Random overflow job (From a vetted list)
    Late Arrivals - Everyone starts in arrivals
    Random spawns - Random spawn location (by drop pod)
    Slow shuttle - Cargo shuttle is slower

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@gmail.com>
2021-02-05 15:49:49 -08:00