Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feat] Новые работки ролеплейной направленности #833

Merged
merged 54 commits into from
Dec 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
f49385e
starting adding jobs
Gaxeer Dec 2, 2024
a4140f9
structurize files
Gaxeer Dec 3, 2024
fb66f22
add most of clothes DMIs for blueshield
Gaxeer Dec 6, 2024
68d995a
more appropriate base undersuit for blueshield
Gaxeer Dec 7, 2024
9e0076a
override icon.dmi with new icon states
Gaxeer Dec 15, 2024
d741880
sorting out files
Gaxeer Dec 15, 2024
9080567
add blueshield and nanotrasen representative jobs
Gaxeer Dec 18, 2024
2e74ba8
remove byond shit
Gaxeer Dec 18, 2024
a0ca417
NT representation exp type, basic player age for blueshield and NTR a…
Gaxeer Dec 18, 2024
6f0c9cd
fix compile errors
Gaxeer Dec 18, 2024
f347ca9
replace huds and trim icons for some jobs
Gaxeer Dec 18, 2024
5d9d82f
add procedure department, add magistrate, move lawyer to procedure
Gaxeer Dec 19, 2024
5e9a979
fix compile error
Gaxeer Dec 19, 2024
3b65882
closets, outfits and more...
Gaxeer Dec 19, 2024
a67cdd0
change lawyer translation
Gaxeer Dec 19, 2024
92230ed
fix includes
Gaxeer Dec 19, 2024
f25dcad
add new jobs to cybernetic revolution trait
Gaxeer Dec 19, 2024
73d884e
next fix after unit test
Gaxeer Dec 19, 2024
db0a0bf
Cyberiad: Add Blueshield, Magistrate and NTR offices
dj-34 Dec 19, 2024
e4a1faf
Additional tweaks to Cyberiad offices
dj-34 Dec 19, 2024
232c0af
procedure department -> department of justice
Gaxeer Dec 19, 2024
e12a381
add magistrate and ntr stamps
Gaxeer Dec 20, 2024
e7351fe
add blueshield revolver
Gaxeer Dec 20, 2024
6a0ff82
add blueshield modsuit
Gaxeer Dec 20, 2024
46adaeb
Cyberiad update
dj-34 Dec 20, 2024
a385ff8
Add modular offices of NTR, Blueshield & Magistrate
dj-34 Dec 20, 2024
917f2a5
Fix linter
dj-34 Dec 20, 2024
68764d7
disable spawn positions by default for new jobs
Gaxeer Dec 20, 2024
3b0c714
Merge branch 'roleplay-jobs' of https://github.com/Gaxeer/tgstation i…
Gaxeer Dec 20, 2024
32f3605
remove typo
Gaxeer Dec 20, 2024
0e6ddc5
Apply suggestions from code review
Gaxeer Dec 20, 2024
4c8158c
add style classes for department, remove some bad code, add new jobs …
Gaxeer Dec 20, 2024
eb2873e
id access and color adjustments
Gaxeer Dec 20, 2024
2414225
Merge branch 'roleplay-jobs' of https://github.com/Gaxeer/tgstation i…
Gaxeer Dec 20, 2024
3ef3d0b
fix colors for new departments in Orbit menu
Gaxeer Dec 20, 2024
13bcff7
Merge remote-tracking branch 'upstream/master' into roleplay-jobs
Gaxeer Dec 20, 2024
0aa38da
proper naming for landmarks
Gaxeer Dec 20, 2024
efc5b13
add nanotrasen_official card for new jobs, add death alarm implant an…
Gaxeer Dec 20, 2024
7f3fac7
add justice department radio channel to captain's encryption key
Gaxeer Dec 20, 2024
7cddacc
add access to Magistrates, NTR's and Blueshield's office to Captain's…
Gaxeer Dec 21, 2024
0069f34
Merge branch 'master' into roleplay-jobs
dj-34 Dec 21, 2024
09dbe61
Replace Magistrate, NTR and Blueshield airlocks to Corporate one
dj-34 Dec 21, 2024
f735f9e
Merge remote-tracking branch 'upstream/master' into roleplay-jobs
Gaxeer Dec 23, 2024
3308943
Fix Blueshield and NTR spawn on Meta
dj-34 Dec 23, 2024
52c432d
Add NTR, Blueshield & Magsitrate offices on Tramstation
dj-34 Dec 23, 2024
fc6afb0
Fix Cyberiad conflict solve mistakes
dj-34 Dec 23, 2024
8710139
Probably fixes atmospheric sanity test on Tram
dj-34 Dec 23, 2024
f709c0d
Add missing landmarks
dj-34 Dec 23, 2024
5ccd744
Remove old BS & NTR areas
dj-34 Dec 23, 2024
6c22b31
Probably fix atmospheric sanity test on Tram, attempt 2
dj-34 Dec 23, 2024
b63861a
Fix templates spawn on Meta and Delta
dj-34 Dec 23, 2024
cc78e99
Probably fix atmospheric sanity test on Tram, attempt 3
dj-34 Dec 23, 2024
a78799f
Add missing holopads on NTR & Blueshield offices
dj-34 Dec 24, 2024
2efdcb6
Fix powernets on Meta and Delta
dj-34 Dec 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 81 additions & 2 deletions _maps/bandastation/automapper/automapper_config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,97 @@ required_map = "builtin"
coordinates = [12, 53, 1]
trait_name = "CentCom"

# IceBoxStation Detective's Office
# DeltaStation
[templates.deltastation_lawyer_office]
map_files = ["deltastation_lawyer_office.dmm"]
directory = "_maps/bandastation/automapper/templates/deltastation/"
required_map = "DeltaStation2.dmm"
coordinates = [123, 143, 1]
trait_name = "Station"

[templates.deltastation_magistrate_office]
map_files = ["deltastation_magistrate_office.dmm"]
directory = "_maps/bandastation/automapper/templates/deltastation/"
required_map = "DeltaStation2.dmm"
coordinates = [185, 122, 1]
trait_name = "Station"

[templates.deltastation_ntr_blueshield_office]
map_files = ["deltastation_ntr_blueshield_office.dmm"]
directory = "_maps/bandastation/automapper/templates/deltastation/"
required_map = "DeltaStation2.dmm"
coordinates = [146, 108, 1]
trait_name = "Station"

# MetaStation
[templates.metastation_lawyer_office]
map_files = ["metastation_lawyer_office.dmm"]
directory = "_maps/bandastation/automapper/templates/metastation/"
required_map = "MetaStation.dmm"
coordinates = [57, 119, 1]
trait_name = "Station"

[templates.metastation_magistrate_office]
map_files = ["metastation_magistrate_office.dmm"]
directory = "_maps/bandastation/automapper/templates/metastation/"
required_map = "MetaStation.dmm"
coordinates = [119, 151, 1]
trait_name = "Station"

[templates.metastation_ntr_blueshield_office]
map_files = ["metastation_ntr_blueshield_office.dmm"]
directory = "_maps/bandastation/automapper/templates/metastation/"
required_map = "MetaStation.dmm"
coordinates = [101, 115, 1]
trait_name = "Station"

# IceBoxStation
[templates.iceboxstation_blueshield_office]
map_files = ["iceboxstation_blueshield_office.dmm"]
directory = "_maps/bandastation/automapper/templates/iceboxstation/"
required_map = "IceBoxStation.dmm"
coordinates = [99, 154, 3]
trait_name = "Station"

[templates.iceboxstation_detective_office]
map_files = ["iceboxstation_detective_office.dmm"]
directory = "_maps/bandastation/automapper/templates/iceboxstation/"
required_map = "IceBoxStation.dmm"
coordinates = [86, 161, 2]
trait_name = "Station"

# TramStation Detective's Office
[templates.iceboxstation_magistrate_office]
map_files = ["iceboxstation_magistrate_office.dmm"]
directory = "_maps/bandastation/automapper/templates/iceboxstation/"
required_map = "IceBoxStation.dmm"
coordinates = [99, 150, 2]
trait_name = "Station"

[templates.iceboxstation_ntr_office]
map_files = ["iceboxstation_ntr_office.dmm"]
directory = "_maps/bandastation/automapper/templates/iceboxstation/"
required_map = "IceBoxStation.dmm"
coordinates = [92, 147, 2]
trait_name = "Station"

# TramStation
[templates.tramstation_detective_office]
map_files = ["tramstation_detective_office.dmm"]
directory = "_maps/bandastation/automapper/templates/tramstation/"
required_map = "tramstation.dmm"
coordinates = [82, 126, 2]
trait_name = "Station"

[templates.tramstation_magistrate_lawyer_office]
map_files = ["tramstation_magistrate_lawyer_office.dmm"]
directory = "_maps/bandastation/automapper/templates/tramstation/"
required_map = "tramstation.dmm"
coordinates = [107, 142, 1]
trait_name = "Station"

[templates.tramstation_ntr_blueshield_office]
map_files = ["tramstation_ntr_blueshield_office.dmm"]
directory = "_maps/bandastation/automapper/templates/tramstation/"
required_map = "tramstation.dmm"
coordinates = [79, 130, 2]
trait_name = "Station"
Loading
Loading