61 Commits
Author SHA1 Message Date
WaterpigandMajkl-J bb70889f6e TG Upstream Part 1
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
2024-10-19 08:04:33 -07:00
Waterpig 4c4930c71d Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit 2024-09-08 00:59:39 +02:00
3569f9fd94 [MISSED MIRROR] Loads Away Missions for Unit Testing (#76245) (#22534)
* Loads Away Missions for Unit Testing (#76245)

Hey there,

A pretty bad bug (#76226) got through, but it was fixed pretty quickly
in #76241 (cf92862daf). I realized that if
we were testing all the away missions, that this could theoretically get
caught and not happen again. Regardless, unit testing gateway missions
has been on my to-do list for a while now, and I finally got it nailed
down.

Basically, we just have a really small "station" map with the bare bones
(_teeny_ bit of fluff, maploading is going to take 30 seconds tops
anyways let me have my kicks) with a JSON map datum flag that causes it
to load all away missions in the codebase (which are all in one folder).
Just in case some admins were planning on invoking the proc on
`SSmapping`, I also decided to gate a `tgui_alert()` behind it because
you never can be too sure of what people think is funny these days (it
really does lock up your game for a second or so at a time).

I also alphabetized the maps.txt config because that was annoying me.

Things that break on production could(?) be caught in unit testing? I
don't know if the linked issue I mentioned above would have been caught
in retrospect, but it's likely to catch more than a few upcoming bugs
(like the UO45 atmospherics thing at the very top) and ensure that these
gateway missions, which tend to be the most neglected part of mapping,
stay bug-free.

This is also helpful in case someone makes a new away mission and wants
to see if stuff's broken. Helps out maptainers a bit because very, very
technically broken mapping will throw up runtimes. Neato.
Nothing that players should be concerned about.

Let me know if there's a better way to approach this, but I really think
that having a super-duper light map with the bare basics to load up
gateway missions and then all nine-ish gateway missions can sequentially
load during init. I can't think of a better way to do it aside from some
really ugly `#ifdef` shit. Also also, it has the added benefit of being
a map that will always load your away mission without touching a single
shred of config (and it's not likely to break if you follow sane
practices such as making your own areas)

* Update gateway_test.json

* Map Reset

* Gets rid of an area that was in a space turf

* Attempting to fix some runtimes

* Map Reset

* Lets remains spawn in xen water

* and acid, too

* Update remains.dm

* Removes extra airlock helper

* Delete research2.dmm

Surely this was a mistake?

* Merge branch 'master' into pr/22534

* Map Reset

* Update snowdin.dmm

* Revert "Update snowdin.dmm"

This reverts commit c860c6f4fb.

* Update snowdin.dmm

* Update snowdin.dmm

* Revert "Update snowdin.dmm"

This reverts commit 47e7916056.

* Update snowdin.dmm

* Revert "Update snowdin.dmm"

This reverts commit c82576bee6.

* Update immerse.dm

* Revert "Update immerse.dm"

This reverts commit 2ad622f302.

* Update immerse.dm

* Update maps.txt

* Fix hard dels in area spawn

* Update gateway_test.json

* Actually we can just get away with keeping a list of types here, no refs needed.

* Update area_spawn_subsystem.dm

* Update automapper.dm

* Let's just test to see if getting rid of black mesa stops the segfaults...

* Let's try deleting astrum too

* Revert "Let's just test to see if getting rid of black mesa stops the segfaults..."

This reverts commit de9a05708d.

* Revert "Let's try deleting astrum too"

This reverts commit 2121a6357a.

* Update waypointstation.dmm

* Update blackmesa.dmm

* Update decaySS.dm

* Update gateway_test.json

* Revert "Update gateway_test.json"

This reverts commit 93adc08819.

* Testing

* Revert "Testing"

This reverts commit 1d476d2369.

* Testing

* Revert "Testing"

This reverts commit de05a74636.

* Now try and actually fix the stupid thing

* Update clockwork_research.dm

---------

Co-authored-by: san7890 <the@san7890.com>
2023-08-19 20:51:34 -07:00
san7890andGitHub 755fa4db6d Loads Away Missions for Unit Testing (#76245)
## About The Pull Request

Hey there,

A pretty bad bug (#76226) got through, but it was fixed pretty quickly
in #76241 (cf92862daf). I realized that if
we were testing all the away missions, that this could theoretically get
caught and not happen again. Regardless, unit testing gateway missions
has been on my to-do list for a while now, and I finally got it nailed
down.

Basically, we just have a really small "station" map with the bare bones
(_teeny_ bit of fluff, maploading is going to take 30 seconds tops
anyways let me have my kicks) with a JSON map datum flag that causes it
to load all away missions in the codebase (which are all in one folder).
Just in case some admins were planning on invoking the proc on
`SSmapping`, I also decided to gate a `tgui_alert()` behind it because
you never can be too sure of what people think is funny these days (it
really does lock up your game for a second or so at a time).

I also alphabetized the maps.txt config because that was annoying me.
## Why It's Good For The Game

Things that break on production could(?) be caught in unit testing? I
don't know if the linked issue I mentioned above would have been caught
in retrospect, but it's likely to catch more than a few upcoming bugs
(like the UO45 atmospherics thing at the very top) and ensure that these
gateway missions, which tend to be the most neglected part of mapping,
stay bug-free.

This is also helpful in case someone makes a new away mission and wants
to see if stuff's broken. Helps out maptainers a bit because very, very
technically broken mapping will throw up runtimes. Neato.
## Changelog
Nothing that players should be concerned about.

Let me know if there's a better way to approach this, but I really think
that having a super-duper light map with the bare basics to load up
gateway missions and then all nine-ish gateway missions can sequentially
load during init. I can't think of a better way to do it aside from some
really ugly `#ifdef` shit. Also also, it has the added benefit of being
a map that will always load your away mission without touching a single
shred of config (and it's not likely to break if you follow sane
practices such as making your own areas)
2023-07-05 19:40:24 -07:00
3d4b8e19ba [MIRROR] Fix further/MetaStation [MDB IGNORE] (#21944)
* Fix further/MetaStation (#76158)

## About The Pull Request

Typo fixes. Further and fixes MetaStation's default name to match the
JSON.

## Changelog

🆑 LT3
spellcheck: Fixed a few typos
/🆑

* Fix further/MetaStation

---------

Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
2023-06-20 09:32:47 -07:00
lessthanthreeandGitHub 8a8dd8f4b6 Fix further/MetaStation (#76158)
## About The Pull Request

Typo fixes. Further and fixes MetaStation's default name to match the
JSON.

## Changelog

🆑 LT3
spellcheck: Fixed a few typos
/🆑
2023-06-19 23:04:45 -07:00
80c3fa0504 [MIRROR] Adds a unit test that all roundstart spawnable jobs have a landmark to spawn at [MDB IGNORE] (#20942)
* Adds a unit test that all roundstart spawnable jobs have a landmark to spawn at

* Update _job.dm

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2023-05-10 00:40:23 +01:00
MrMelbertandGitHub aacc85964a Adds a unit test that all roundstart spawnable jobs have a landmark to spawn at (#74995)
## About The Pull Request


https://github.com/tgstation/tgstation/pull/74985#issuecomment-1523773626

Tests that all jobs that have `spawn_position > 0` at roundstart have a
location to spawn at.

Also changes the failure message for
`get_default_roundstart_spawn_point` to send to `log_mapping` rather
than `log_world`, as it is a map error and log world doesn't really help
anyone. This would've been sufficient for the existing unit test
`log_mapping`, but that unit test expects that the log has an areacoord
supplied, which we can't really do, given we're reporting a _lack_ of
something.

## Why It's Good For The Game

Stops maps from regressing and dumping people on the latejoin shuttle
roundstart.

## Changelog

~~Not necessary unless I find a map which forgot a landmark~~

🆑 Melbert
fix: Tramstation Robotics and RD now spawn in their departments
roundstart
fix: Birdboat detective now spawns in their office
/🆑
2023-05-04 14:03:49 -06:00
fd79c7c9d5 [MIRROR] Makes ruin budget proportional to amount of space ruin z-levels [MDB IGNORE] (#20725)
* Makes ruin budget proportional to amount of space ruin z-levels (#74841)

## About The Pull Request
Adds global define for DEFAULT_SPACE_RUIN_LEVELS and
DEFAULT_SPACE_EMPTY_LEVELS

### Proportional budget
Adds proportional budget to setup_ruins
The budget is multiplied by the current amount of ruin levels over the
default amount
Smaller amounts will have less ruins, while bigger maps will have more
ruins
Should maintain the same amount of ruins per z-level

### Z-levels spawning fix
Z-levels didn't seem to spawn their intended amount of ruins
This was because the for loop added the count variable before doing the
spawning. So for example if there was only 1 level, it would count to 1
and end the loop without spawning the level.
Also removed a loop that seemed to just make the process more complex
for no reason. It even had a note to remove it. However, if it has a use
then you should tell me.

## Why It's Good For The Game

Maps with a smaller amount of ruin levels won't be completely filled
The amount of ruins will be consistent per z-level
The creator of North Star won't allow space exploration unless there's a
way to proportionally reduce the space budget see #74719
## Changelog
🆑
fix: Maps now spawn the correct amount of space levels. The bug caused
them to spawn 1 less in each category
code: The space ruins budget is now proportional to the amount of ruin
levels. This has no effect on the current default maps, but added maps
with less than the default amount of ruin levels will see less ruins.
/🆑

* Makes ruin budget proportional to amount of space ruin z-levels

---------

Co-authored-by: BlueMemesauce <47338680+BlueMemesauce@users.noreply.github.com>
2023-04-23 21:48:37 -04:00
BlueMemesauceandGitHub 20602ce519 Makes ruin budget proportional to amount of space ruin z-levels (#74841)
## About The Pull Request
Adds global define for DEFAULT_SPACE_RUIN_LEVELS and
DEFAULT_SPACE_EMPTY_LEVELS

### Proportional budget
Adds proportional budget to setup_ruins
The budget is multiplied by the current amount of ruin levels over the
default amount
Smaller amounts will have less ruins, while bigger maps will have more
ruins
Should maintain the same amount of ruins per z-level


### Z-levels spawning fix
Z-levels didn't seem to spawn their intended amount of ruins
This was because the for loop added the count variable before doing the
spawning. So for example if there was only 1 level, it would count to 1
and end the loop without spawning the level.
Also removed a loop that seemed to just make the process more complex
for no reason. It even had a note to remove it. However, if it has a use
then you should tell me.

## Why It's Good For The Game

Maps with a smaller amount of ruin levels won't be completely filled
The amount of ruins will be consistent per z-level
The creator of North Star won't allow space exploration unless there's a
way to proportionally reduce the space budget see #74719
## Changelog
🆑
fix: Maps now spawn the correct amount of space levels. The bug caused
them to spawn 1 less in each category
code: The space ruins budget is now proportional to the amount of ruin
levels. This has no effect on the current default maps, but added maps
with less than the default amount of ruin levels will see less ruins.
/🆑
2023-04-23 17:20:52 -06:00
00e22c3158 [MIRROR] Lazy Template Loading - Nukie/Wiz [MDB IGNORE] (#18254)
* Lazy Template Loading - Nukie/Wiz

* fixes + mirror 66540

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
Co-authored-by: John Doe <gamingskeleton3@gmail.com>
2022-12-31 10:18:59 -08:00
78c1b9f456 [MIRROR] [MDB Ignore] Unit Tests for Invalid Space Turfs (Area Bullshit Edition) [MDB IGNORE] (#17626)
* [MDB Ignore] Unit Tests for Invalid Space Turfs (Area Bullshit Edition)

* should probably make tests pass

Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
2022-11-25 16:29:20 -05:00
75809eb720 [MIRROR] Makes ruin blacklist file actually set from JSON [MDB IGNORE] (#17619)
* Makes ruin blacklist file actually set from JSON (#71387)

## About The Pull Request

Json was never checked for the blacklist file, meaning icebox didn't
have any blacklisted ruins.

Now:

![image](https://user-images.githubusercontent.com/53777086/202890015-6d5df1ef-c03e-4392-857a-3ff317ffc2d3.png)

## Why It's Good For The Game

I broke icebox's blacklist by fixing lavalands, hopefully now both will
work.

Fixes https://github.com/tgstation/tgstation/issues/71377

## Changelog

🆑
fix: Icebox's blacklisted ruins works again.
/🆑

* Makes ruin blacklist file actually set from JSON

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2022-11-21 18:07:38 -05:00
san7890andGitHub cb20ec99f9 [MDB Ignore] Unit Tests for Invalid Space Turfs (Area Bullshit Edition) (#70967)
## About The Pull Request

So, there's some bullshit with the map loader(?) sometimes where it'll
let space turfs spawn in spots where we REALLY don't want space turfs.
Or, it could also just be a mapper screwing up. Anyways, we might miss
these, so let's set up a broad Unit Test that checks and verifies that
these round-ruining snagglers do _not_ exist.

In order to help me to do this, I standardized and fixed the
nomenclature such that `/area/ruin/space` is default for any map file in
`_maps/RandomRuins/SpaceRuins`, as well as it's subtypes. I also touched
up how we handle shuttle areas in these scenarios. This got a lot of
Unit Test noise filtered out, and is crucial for its functioning. It
should also be how we did it from the start anyways. I added in an
UpdatePaths for any compatible change, but it was completely
non-workable for some of the area type updates.

I also fixed any organic bugs that didn't require an areas type update.
Cool.

Placing space turfs on IceBox:

![image](https://user-images.githubusercontent.com/34697715/199177940-21c64964-1808-41b0-9a92-bf5b82eee2fa.png)

Organically found issues:

![image](https://user-images.githubusercontent.com/34697715/199177972-b27a89de-0e1a-41e5-8fa4-3bee1763b9da.png)

I also added a `planetary` variable to `/datum/map_config` because I
didn't like the hack I was using to see if we had a planetary map, and
I'd rather it just be an explicit variable in the map's JSON.

## Why It's Good For The Game

The less times we get Space Turfs showing up on IceBoxStation, the
better. It also standardizes areas a bit more, which I like (we were
using some incorrect ones in the wrong spots, so those were touched up
in this PR as well). Like, if it's a space ruin, we don't need to use
the lengthy `/area/ruin/unpowered/no_grav` when `/area/ruin/space` does
the same thing.
## Changelog
Nothing in here should concern a player (unless I broke something)

Expect a few commits as I spam unit tests a few times and play
whack-a-mole with bugs.
2022-11-21 07:59:54 +00:00
John WillardandGitHub 3d4473d141 Makes ruin blacklist file actually set from JSON (#71387)
## About The Pull Request

Json was never checked for the blacklist file, meaning icebox didn't
have any blacklisted ruins.

Now:

![image](https://user-images.githubusercontent.com/53777086/202890015-6d5df1ef-c03e-4392-857a-3ff317ffc2d3.png)

## Why It's Good For The Game

I broke icebox's blacklist by fixing lavalands, hopefully now both will
work.

Fixes https://github.com/tgstation/tgstation/issues/71377

## Changelog

🆑
fix: Icebox's blacklisted ruins works again.
/🆑
2022-11-20 23:14:35 -08:00
d99be10b78 [MIRROR] Fixes Golems not spawning on Lavaland [MDB IGNORE] (#17541)
* Fixes Golems not spawning on Lavaland (#71017)

## About The Pull Request

Golems is apparently disabled on Icebox, but isn't disabled on Lavaland.
However, blacklisting ruins doesn't care for maps, and will blacklist
all, as if it were using all maps at once. This isn't a problem because
Lavaland and Icebox do not share common ruins, except for one: Golem
ship.

## Why It's Good For The Game

Config now works as it's supposed to, Golems should spawn on Lavaland
again (assuming it's enabled in config, I dont keep up to date with
that)

## Changelog

🆑
fix: Ruins blacklisted from icebox shouldn't also blacklist it from
lavaland, and vice versa.
/🆑

* Fixes Golems not spawning on Lavaland

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Jolly <70232195+Jolly-66@users.noreply.github.com>
2022-11-17 17:20:39 -08:00
John WillardandGitHub 562a99c467 Fixes Golems not spawning on Lavaland (#71017)
## About The Pull Request

Golems is apparently disabled on Icebox, but isn't disabled on Lavaland.
However, blacklisting ruins doesn't care for maps, and will blacklist
all, as if it were using all maps at once. This isn't a problem because
Lavaland and Icebox do not share common ruins, except for one: Golem
ship.

## Why It's Good For The Game

Config now works as it's supposed to, Golems should spawn on Lavaland
again (assuming it's enabled in config, I dont keep up to date with
that)

## Changelog

🆑
fix: Ruins blacklisted from icebox shouldn't also blacklist it from
lavaland, and vice versa.
/🆑
2022-11-17 12:14:46 -08:00
48cf7ee691 [MIRROR] Spinward Threat Advisory: Making Dynamic Threat Announcements Make More Sense [MDB IGNORE] (#15345)
* Spinward Threat Advisory: Making Dynamic Threat Announcements Make More Sense (#68754)

* Spinward Threat Advisory: Making Dynamic Threat Announcements Make More Sense

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
2022-08-01 20:30:36 -07:00
EOBGamesandGitHub fc51fa0256 Spinward Threat Advisory: Making Dynamic Threat Announcements Make More Sense (#68754) 2022-08-01 17:52:55 -07:00
TomandGitHub 2b42a89386 remove skyrat edit from map config (#15306) 2022-07-30 23:49:21 +01:00
84c8b1867e [MIRROR] Fixes centcom announcements referring to icebox as a station in orbit [MDB IGNORE] (#14104)
* Fixes centcom announcements referring to icebox as a station in orbit (#67528)

Fixes #67467

* Fixes centcom announcements referring to icebox as a station in orbit

Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
2022-06-06 00:07:01 +01:00
IamgoofballandGitHub 2719af0f05 Fixes centcom announcements referring to icebox as a station in orbit (#67528)
Fixes #67467
2022-06-05 20:51:23 +01:00
san7890andGitHub 27946f516d Update Comments and Adjusts Incorrect Variables for Map Defines and Map Config (#66540)
Hey there,

These comments were really showing their age, and they gave the false impression that nothing had changed (there was a fucking City of Cogs mention in this comment!). I rewrote a bit of that, and included a blurb about using the in-game verb for Z-Levels so people don't get the wrong impressions of this quick-reference comment (they always do).

I also snooped around map_config.dm and I found some irregularities and rewrote the comments there to be a bit more readable (in my opinion). Do tell me if I'm a cringe bastard for writing what I did.

Also, we were using the Box whiteship/emergency shuttle if we were missing the MetaStation JSON. Whoops, let's make sure that's fixed.

People won't have to wander in #coding-general/#mapping-general asking "WHAT Z-LEVEL IS X ON???". It's now here for quick reference, as well as a long-winded section on why you shouldn't trust said quick reference.
2022-05-03 22:33:34 -07:00
35f3fa11c8 Upstream merge 65326 (#12460)
* [MDB IGNORE] TGUI library, plus polish

* Update _computer.dm

* Update manuals.dm

* Update medguns.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2022-04-01 01:20:27 +01:00
0c4af38f41 [MDB IGNORE] TGUI library, plus polish (#65326)
* Prevents potentially infinite length books from being written and stored. I'm not sure if this is an actual issue, but I have a funny feeling it may become one someday

* Moves the paper defines to their own file

* It's become clear to me that I am stupid

* git add --all

* Makes book info into a datum to allow for easy passing around

* Converts the library scanner to tgui, lays the groundwork for tgui visitor consoles

* Makes the db request for book info sort
Adds the frontend for the visitor's console
Adds a hash to prevent duplicate db requests
Adds a prams changed var to help facilitate a better search button
Makes the page number code accept text as input

* Makes the ui index at 1 even tho we index at 0 internally

* Begins the conversion process for the library console.

Changes the library console to override the visitor, to utalize for the archive access portion of the ui
Makes scanner into a weakref, I'm coming for you handheld scanner
Renames some vars to make things clearer

* Converts the remaining refs of the old console typepath over, adds a circuit board for consoles because pain

* Changes how bookshelves load in books
Instead of loading them in lazyally, we load them during init
This lets us track what books are stored in which areas

Somewhat jutting off of this, adds map config for designating something as "part of the library"
This will be useful later

* Renames the random poster, adds a spritesheet for bibles. Both will be useful in a moment

* Ok. This is a bit of a mess.
Converts the library console to tgui.
This comes with a few minor behavior changes:
You can now select what type of poster you want to print, instead of just printing a random one
It's now possible to heed the console's emag warning
The console's inventory page will fill at roundstart with the books in your area/if you're in a library, any
areas designated as "library like" in the map config
You can see what type of bible the chaplin has selected?

"Fixes":
You can no longer just dump books into the scanner forever

Implementation details:
Any input that makes a db request will now A: freeze up any other db inputs until it's finished, and B: Start a
1 second timer before any new db requests can be made
Of note, I'm handling html encoding in a very targeted way.
All book_data datums need to have html encoded values. get_title/author/content exist so a defaulting and tgui
appropriate version can be loaded in. This somewhat matches with the trusted var on set_title, it exists to
prevent double html encoding.

While we're here

Input/DB (Book data should be html encoded)
Inside book datum (Book data should be html encoded)
Sending to tgui (Book data should be decoded during extraction with the get_() procs)
Sending anywhere else (Book data should be html encoded, otherwise it's an xss vuln)

Uhhhh tgui stuff?
I'm using a custom theme for emag visuals, I'll get into that more later
The visitor and book management console share the same data/act pipeline, which is why they're parented/subtyped
They also share a page selection component, which is why the visitor's console imports it.

Uhhhhh
Oh right, fuck.
Ok so the page selection component is kinda cursed, the left and right controls are fine
But I'm trying to get a << < [page/max] > >> setup going, and that means resetting the center input past change
so the default value can be used
This ends up being slightly hacky. I'm sorry.

Oh also, I implemented a custom tab setup for this ui. I have no idea why it was literally like 5 months ago.
I think it looks pretty nice, but if you want me to nuke it I can. Sorry for any headache around this.

More tgui stuff next

* Scanner/visitor cleanup, some other odds and ends

* Adds in a dark red and black theme for library computers to be triggered by an emag.
Things of note: I'm overriding some lists that get passed into buttons and one other thing using set, since the
list is alreadt generated by that step in the process? I think?
I've added dimness control to the dimmer component, since well, it was dimming already dark uis.
I also made and added a rather large background svg. I've got no experience with this sort of thing, and all the
compression methods I found for this ended up being busts. I know this isn't acceptable as an end product, but I
don't know how to get it there.

Somewhat on that note, this ui might not be worth the size for the amount of use it gets. I'm fine with nuking
it if that's the case, I bring this up because I have a very poor understanding of the logistics of something
like this, so I have a feeling I've fucked up somewhere

* Forgot these, just a scss file for library computers, barely used but I think it's worthwhile

* Missed this eariler. As a part of the uploading tab, I'm displaying the contents of books. I'm loading in that
context as raw html so paper -> book books look close to right. Means I need more html tags then our current
sanitize provides. I don't think any of these will cause issues, and there's also a good chance I'm missing
some. Will come up with a list later

* Updates the rest of the maps to use the new management typepath

* Fixes the default bible name being Default Bible Name, I am sorry

* Turns out I had the scaling wrong for bible names, lead to weird stacking because the bible icon doesn't scale, so I lowered its sizing

* Yeets unneeded exports (Thank you jlsnow)

Haha wouldn't it be funny if I didn't know how components worked

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>

* Resets the maps to master

* Fixes oversights from merge commit, changes maps

* Removes needless Flex's from the scanner

* Gives the library console the ability to parse markdown. Expands the list of acceptable html elements a bit

* Adds audio cues for printing and inserting/removing from the scanner, makes the scanner nicer to use in general

* Uses a compressed version of the background. It's still huge, but smaller at least

* Adds the printing audio to the book binder

* Cleans up tram

* curse you tram

* AHHHHHHHH

* MY LIFE IS TRUE PAIN

* Adds a path conversion statement to make people's lives easier

* Apply's style's suggestions

thx style

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>

* Compresses the background svg

* Further js cleanup

* We no longer render markdown in the ui, since any source of markdown is converted to html anyway

* More ui changes

Makes the tab/main screen logic use Flex rather then manuel offsets
Makes modals better fit the size of their contents
Readjusts the width of some inputs
Properly uses the header prop for a table
Makes the buttons in the upload panel look nicer
Restructures the print tab a bit

* Increase a modal's size

* Fixes computers with no keyboard overlay showing their screen even when the power is out

* Moves some data and logic onto the library subsystem. Kyler's review

Fixes harddels held by the library scanner. Makes the scanner's buffer
actually do something

* Makes book icon randomization a proc rather then just copypasta'd code

* Removes the kilo library edit, the soul was removed

* Damn you san (Fixes mapconflicts)

* Pain

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2022-03-30 19:56:53 -07:00
551fa984bb [MIRROR] Map load unit testing and directory whitelisting - Mojave Sun is a really cool downstream, like and subscribe for longer PR names. oranges was here and made this github PR name much longer, thereby proving once and for all that upstreams do add value to the downstream not just endless amounts of refactoring because we can't write any api's in a modular fashion the first time around so have to update them later to be modular. Anyway do you think a taco counts as a sandwich? [MDB IGNORE] (#9290)
* Map load unit testing and directory whitelisting - Mojave Sun is a really cool downstream, like and subscribe for longer PR names. oranges was here and made this github PR name much longer, thereby proving once and for all that upstreams do add value to the downstream not just endless amounts of refactoring because we can't write any api's in a modular fashion the first time around so have to update them later to be modular. Anyway do you think a taco counts as a sandwich? (#62620)

About The Pull Request

This is a fix for map not load anymore because of security changes
Why It's Good For The Game

Maps are good as they encourage gameplay and differentiate ss13 from a classic MUD game
Changelog

cl
add: unit test for map load
add: directory param to map load + whitelist for data and _maps
add: advertising for mojave sun in tg commit logs
/cl

* Map load unit testing and directory whitelisting - Mojave Sun is a really cool downstream, like and subscribe for longer PR names. oranges was here and made this github PR name much longer, thereby proving once and for all that upstreams do add value to the downstream not just endless amounts of refactoring because we can't write any api's in a modular fashion the first time around so have to update them later to be modular. Anyway do you think a taco counts as a sandwich?

Co-authored-by: AndrewL97 <andrewjlove97@gmail.com>
2021-11-07 08:09:43 -05:00
AndrewL97andGitHub 1ef73dbc37 Map load unit testing and directory whitelisting - Mojave Sun is a really cool downstream, like and subscribe for longer PR names. oranges was here and made this github PR name much longer, thereby proving once and for all that upstreams do add value to the downstream not just endless amounts of refactoring because we can't write any api's in a modular fashion the first time around so have to update them later to be modular. Anyway do you think a taco counts as a sandwich? (#62620)
About The Pull Request

This is a fix for map not load anymore because of security changes
Why It's Good For The Game

Maps are good as they encourage gameplay and differentiate ss13 from a classic MUD game
Changelog

cl
add: unit test for map load
add: directory param to map load + whitelist for data and _maps
add: advertising for mojave sun in tg commit logs
/cl
2021-11-07 21:30:49 +13:00
GoldenAlpharexandGitHub ed61c8684d [CI] Removing the last traces of safety_mode and makes our Meta the default map to be loaded in case map config loading fails (#9278)
* Removing the last traces of safety_mode and makes our Meta the default config map

* Fixing the linter
2021-11-06 19:40:15 -04:00
ec8ac5f18f [MIRROR] Makes maps be able to load correctly again [MDB IGNORE] (#9276)
* Makes maps be able to load correctly again

* Feex

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-11-06 15:27:52 -04:00
GoldenAlpharexandGitHub 5025ed3620 Makes maps be able to load correctly again (#62623)
This PR fixes a bunch of the code for load_map_config(), documenting it better and removing a deprecated (I hope) parameter that was also a security concern along the way, while also making another proc for just loading the default map config, which is supposed to always be functional.
2021-11-06 18:39:25 +00:00
d45e3ce55f [MIRROR] [s] Security vulnerability patch [MDB IGNORE] (#9256)
* [s] Security vulnerability patch (#62568)

About The Pull Request

In my personal, subjective opinion; trialmins should not, in fact, be able to read and delete server/box configuration files on a whim.

cl
server: Patches multiple(?) arbitrary file related vulnerabilities
/cl

* [s] Security vulnerability patch

Co-authored-by: TheFakeElon <59686430+TheFakeElon@users.noreply.github.com>
2021-11-06 19:47:20 +13:00
ArchanialandGitHub b3006951c6 Fixes mapload (#62612)
next_map is stored in data not _maps
2021-11-05 22:43:33 -07:00
TheFakeElonandGitHub 3de38b11b8 [s] Security vulnerability patch (#62568)
About The Pull Request

In my personal, subjective opinion; trialmins should not, in fact, be able to read and delete server/box configuration files on a whim.

cl
server: Patches multiple(?) arbitrary file related vulnerabilities
/cl
2021-11-05 13:31:13 +13:00
a43b8c5fc4 Nanotrasen Fleet Command Expansion (#7418)
* A

* Update centcom_computers.dm

* a

* Update CommandReportConsole.js

* commandreporter

* Update command_report_computer.dm

* a

* FEET COMMAND

* a

* e

* e

* Update departments.dm

* F

* a

* a

* Update new_player.dm

* Update new_player.dm

* AAAAAA

* Update zombie.dm

* Update zombie.dm

* aaaaaaa

* 0

* a

* Update CentCom_skyrat.dmm

* aa

* Update nsstitan.dmm

* A

* Update station_goal_computer.dm

* Update station_goal_computer.dm

* Update bridge_officer.dm

* Update CentCom_skyrat.dmm

* Update pda.dm

* Revert "Update pda.dm"

This reverts commit fbe1823726.

* logic

* cargo system

* 0

* Update import_console.dm

* Update cargo_skyrat.dmm

* noob coder

* Update cargo_shuttle_console.dm

* a

* Update deck_crew.dm

* Update export_console.dm

* Update deck_crew.dm

* 0

* Update CentCom_skyrat_z2.dmm

* AAAA

* 0

* Update CentCom_skyrat_z2.dmm

* Update cargo_shuttle_console.dm

* Update CentCom_skyrat_z2.dmm

* a

* SELLING CREW IS BAD.

* a

* Update supply.dm

* Update CentCom_skyrat_z2.dmm

* Update supply.dm

* A

* a

* a

* Update zombie.dm

* Update modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-08-17 18:43:19 +01:00
GandalfandGitHub 31c8d7ca34 Massive shuttle refactor and arrivals system change (#4572)
* FIRST!!

* aaaa

* Update floor.dm

* aaaaaaaa

* aaaaaaaaaaaaaaaaaaaaaa

* aaaaaaaaaaa

* Update CentCom_skyrat_z2.dmm

* Update MetaStation_skyrat.dmm

* aaaaaaaaaaaaaaaaaaaaa

* crashing this shuttle with no survivors

* aaaaaaaaaaaaaaaaaaaaaa

* aaaaaaaa

* aaaaaaaa

* Update emergency.dm

* aaaaa

* Update emergency_skyrat.dmm

* Update emergency_skyrat.dmm

* aaaaa

* a
2021-04-05 14:49:02 +01:00
bdc9b9aaaa [MIRROR] Fix typo on map_config JSON parsing (#1482)
* Fix typo on map_config JSON parsing (#54603)

* Fix typo on map_config JSON parsing

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-10-27 09:40:57 +01:00
Jordan BrownandGitHub e0f2205d4a Fix typo on map_config JSON parsing (#54603) 2020-10-26 13:24:31 -03:00
dc7d9a81a1 [MIRROR] Fix Map JSON loading errors (#1460)
* Fix Map JSON loading errors (#54563)

Also fixes that one runtime everyone runs into when they first load in

* Fix Map JSON loading errors

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-10-25 11:11:00 +01:00
Jordan BrownandGitHub d240eb7fd6 Fix Map JSON loading errors (#54563)
Also fixes that one runtime everyone runs into when they first load in
2020-10-24 23:47:12 -03:00
ed99a59ae9 [MIRROR] Out of repo maps part 1: JSON Improvements (#1432)
* Out of repo maps part 1: JSON Improvements (#53663)

Replaces the map job changes code system with a JSON based one.
Added map versioning to the config JSON.
Formats map config JSONs.

* Out of repo maps part 1: JSON Improvements

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-10-23 05:08:50 +01:00
Jordan BrownandGitHub 94b076bd5a Out of repo maps part 1: JSON Improvements (#53663)
Replaces the map job changes code system with a JSON based one.
Added map versioning to the config JSON.
Formats map config JSONs.
2020-10-22 20:29:32 -03:00
62676e72a8 Force LF line endings with gitattributes and convert repo (#52266)
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-07-16 03:02:40 +03:00
skoglol eca1ebad92 Removes BoxStation in favor of IceBox 2020-07-06 15:03:07 +02:00
TheChosenEvilOneandAnturK a66126d7e3 Add map voting (#44244)
- Add map voting
- Rename config option for preferred map weighted map selection
2019-06-04 23:55:14 +02:00
Tad HardestyandJordan Brown 018a74e558 Allow configuring ruin/empty space level count - #36191
Allows map configs to set how many ruin levels (def. 7) and how many empty levels (def. 1) that will be created. Most useful for landlocked stations, event/one-off stations with unusual composition, or testing situations such as RuntimeStation.
2018-03-07 02:48:22 -05:00
Tad HardestyandAnturK bbe4d12d13 Support stations with multiple z-levels (#35339)
* Remove ZLEVEL_STATION_PRIMARY

* Add Up and Down traits for use by ladders and chasms

* Give map_config creation its own proc

* Combine LoadConfig and ValidateJSON and remove transition_config

* Make space linkage a z-level trait

* Remove ZLEVEL_EMPTY_SPACE

* Update uses of GetFullMapPath

* Handle multi-Z stations and load Lavaland and Reebe at runtime

* Remove unused space maps

* Fix inappropriate z-expansion in map reader, improve logging

* Update comments relating to z-level configuration

* Add Lavaland and Reebe to ALL_MAPS
2018-02-15 10:21:25 +01:00
coiaxandEmmett Gaines 8e20aa3f7b Refactors shuttles to be loaded in, rather than be on the station maps (#33766)
* Refactors shuttles to be loaded in, rather than be on the station maps

- Shuttles are now loaded in by the shuttle subsystem.

You configure what shuttles are loaded in via
`/obj/configuration/shuttle_load` objects.

* Box arrivals shuttle is now imported from template

* Moves things out of the #ifdef

* Box emergency shuttle is now imported

* Box emergency shuttle is now templated

* Box ferry and whiteship now load from template

* More shuttles on Box done

* Apart from the pods, Box is now completely templated

* Delta now has all non-awkward shuttles loaded in

And Centcom..

* Removes no ops turfs, more error messages

* Fixes slightly chopped off external wall

* Massaging more shuttles into working correctly

* Debug messages are king

* Delta cargo shuttle now docks again

* First pass of Metastation shuttles

* Omegastation first pass

* Metastation now has its own shuttle

* Did most shuttles on Pubby

* Turns out Pubby arrival shuttle is slightly smaller than Box arrival

* Whoops, missed a stationary port

* TGMified the pubby arrival shuttle

* First pass, box is working

* All stations now have roundstart_template and no configuration objects

* Removes roundstart_move

* Why do we even have these unused keys

* Remove unused coded vars

* removes some excessive safety checks

* Missed some Centcom cargo dock stuff

* Got it working again

* That thing that Cyberboss wanted

* Noop turfs the shuttle templates

* And template noop for the area

* Attempts to assuage travis

* Warning!

* Please love me, Travis

* RIP Remie
2018-01-25 15:18:15 -05:00
Jordan BrownandShizCalev db1e201e27 Fixes error if next_map.json is missing (#34222) 2018-01-11 04:53:42 -05:00
Jordan Brownandoranges 379869ef6b Fixes allow_custom_shuttles default (#32221)
* Fixes allow_custom_shuttles default

* Fix the check
2017-10-31 09:20:34 +13:00
Jordan BrownandAnturK 9375965fd7 Fixes map_config validation (#32206) 2017-10-29 16:25:50 +01:00