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

Upstream Merge 2024-10-13 #260

Closed
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
c87928e
Replace Shittle With Pathfinder (#1027)
VMSolidus Oct 9, 2024
ac72909
Automatic Changelog Update (#1027)
SimpleStation14 Oct 9, 2024
457e618
Re-Add Crusher Weapons (#1026)
VMSolidus Oct 9, 2024
2e97c44
Automatic Changelog Update (#1026)
SimpleStation14 Oct 9, 2024
b0262f3
Port Gax From Estação Pirata (#1019)
Ichaie Oct 9, 2024
0410b9a
Automatic Changelog Update (#1019)
SimpleStation14 Oct 9, 2024
41f1172
Security Loadouts Expansion 2 (#1025)
VMSolidus Oct 9, 2024
df747c4
Fix Librarian Access (#1023)
VMSolidus Oct 9, 2024
6ab7965
Psionic Potential Trait Fixes (#1022)
VMSolidus Oct 9, 2024
b179f27
Automatic Changelog Update (#1025)
SimpleStation14 Oct 9, 2024
7237d66
Automatic Changelog Update (#1022)
SimpleStation14 Oct 9, 2024
db88b1b
Update Languages.ftl (#1020)
VMSolidus Oct 9, 2024
811b91d
Automatic Changelog Update (#1020)
SimpleStation14 Oct 9, 2024
14d2280
Random Bark Revamp (#1003)
Mnemotechnician Oct 9, 2024
8c5faf3
Language Refactor 3 (#937)
Mnemotechnician Oct 9, 2024
f0636f7
Automatic Changelog Update (#1003)
SimpleStation14 Oct 9, 2024
87cc149
Station Only Glimmer Mites (#976)
VMSolidus Oct 9, 2024
39ddc33
Custom Specie Name (#994)
FoxxoTrystan Oct 9, 2024
da39971
Automatic Changelog Update (#976)
SimpleStation14 Oct 9, 2024
dde6130
Automatic Changelog Update (#994)
SimpleStation14 Oct 9, 2024
fb54f66
Cargo Hardsuit Market (#1024)
VMSolidus Oct 9, 2024
683b8b6
Automatic Changelog Update (#1024)
SimpleStation14 Oct 9, 2024
00d83ef
Resprites Service Uniforms & Adds Rolled Sleeve Variants (#1021)
DangerRevolution Oct 10, 2024
0efe026
Automatic Changelog Update (#1021)
SimpleStation14 Oct 10, 2024
480b273
Head of Security Equipment (#1031)
VMSolidus Oct 11, 2024
c22e80a
Automatic Changelog Update (#1031)
SimpleStation14 Oct 11, 2024
7d07958
Port a New Map: RadStation (#1034)
Ichaie Oct 11, 2024
ad53e7c
Automatic Changelog Update (#1034)
SimpleStation14 Oct 11, 2024
87d4a8a
Feat: Sleeping and Muzzle Block Vocal Emotes (#1037)
Mnemotechnician Oct 11, 2024
6227db4
Automatic Changelog Update (#1037)
SimpleStation14 Oct 11, 2024
d6a2db2
Bluespace And Normality Ores (#1042)
VMSolidus Oct 12, 2024
f5521e4
Automatic Changelog Update (#1042)
SimpleStation14 Oct 12, 2024
aa85a33
Merge remote-tracking branch 'real-ee/master' into feat/floof-upstrea…
Mnemotechnician Oct 13, 2024
676d013
Early merge of Simple-Station/Einstein-Engines#1036
Mnemotechnician Oct 10, 2024
5835445
Ugh.
Mnemotechnician Oct 13, 2024
4eaa4ea
Early merge Simple-Station/Einstein-Engines#1032
Mnemotechnician Oct 13, 2024
6e91632
Fix bluespace recipe?
Mnemotechnician Oct 13, 2024
60dd693
Fix Arrivals Shuttle (#1040)
Fansana Oct 13, 2024
f29a5bf
Automatic Changelog Update (#1040)
SimpleStation14 Oct 13, 2024
124af12
Custom Name Fixes (#1032)
FoxxoTrystan Oct 13, 2024
d84a728
Cherry Pick "Fix Latejoin Antag Preferences Not Being Respected" (#1038)
Remuchi Oct 13, 2024
f1dd679
Add ArachneWeb to Spiderweb. (#1033)
FoxxoTrystan Oct 13, 2024
74fa664
Automatic Changelog Update (#1033)
SimpleStation14 Oct 13, 2024
aa799f5
Feat: Togglable Under-Table Crawling (#1036)
Mnemotechnician Oct 13, 2024
d3e4d14
Automatic Changelog Update (#1036)
SimpleStation14 Oct 13, 2024
fcada74
Improve "Show Clothing" Button Labels (#1030)
DEATHB4DEFEAT Oct 13, 2024
053d42b
Automatic Changelog Update (#1030)
SimpleStation14 Oct 13, 2024
8fec666
Update Credits (#1043)
github-actions[bot] Oct 13, 2024
c377ee5
Make Brains Not Food (#1044)
VMSolidus Oct 13, 2024
705a5f3
Automatic Changelog Update (#1044)
SimpleStation14 Oct 13, 2024
20c1ccc
Transhumanism Physical Traits (#1035)
VMSolidus Oct 13, 2024
782f590
Automatic Changelog Update (#1035)
SimpleStation14 Oct 13, 2024
977fccf
Service Contractor Loadouts (#1041)
VMSolidus Oct 13, 2024
120f73d
Automatic Changelog Update (#1041)
SimpleStation14 Oct 13, 2024
6a815ba
Feat: Port All Delta-V Mail Improvements (#1011)
Mnemotechnician Oct 13, 2024
1bb7f1b
Automatic Changelog Update (#1011)
SimpleStation14 Oct 13, 2024
69a12e2
Merge remote-tracking branch 'real-ee/master' into feat/floof-upstrea…
Mnemotechnician Oct 14, 2024
d2c6612
Apparently secwatch was silently reverted???
Mnemotechnician Oct 14, 2024
d2aaf88
Update hardsuits.yml
Mnemotechnician Oct 20, 2024
a4d6ea3
Update cargo_hardsuits.yml
Mnemotechnician Oct 20, 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
Prev Previous commit
Next Next commit
Port a New Map: RadStation (#1034)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

this PR Port the RadStation map from Estação Pirata
RadStation is a map made by CRISO, ported from BeeStation from ss13 to
Estação Pirata, I made some updates to make the map playable on EE

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->


---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


![Rad-0](https://github.com/user-attachments/assets/f18cf403-4545-40f5-8fc7-d325707dfbef)


</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: A map called "RadStation" has been added to rotation.
- add: A new Evac shuttle called "emergency_neol" has been added to
RadStation
Ichaie authored Oct 11, 2024
commit 7d07958af43cf2234a5d3d9ea0ef75e5b0cb7082
3 changes: 2 additions & 1 deletion Content.IntegrationTests/Tests/PostMapInitTest.cs
Original file line number Diff line number Diff line change
@@ -62,7 +62,8 @@ public sealed class PostMapInitTest
"Hammurabi", //DeltaV
"Lighthouse", //DeltaV
"Submarine", //DeltaV
"Gax"
"Gax",
"Rad"
};

/// <summary>
6,758 changes: 6,758 additions & 0 deletions Resources/Maps/Shuttles/emergency_neol.yml

Large diffs are not rendered by default.

159,523 changes: 159,523 additions & 0 deletions Resources/Maps/radstation.yml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Resources/Prototypes/Maps/Pools/default.yml
Original file line number Diff line number Diff line change
@@ -15,3 +15,4 @@
- Tortuga
- TheHive
- Gax
- Rad
75 changes: 75 additions & 0 deletions Resources/Prototypes/Maps/radstation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
- type: gameMap
id: Rad
mapName: 'RadStation'
mapPath: /Maps/radstation.yml
minPlayers: 35
stations:
RadStation:
stationProto: StandardNanotrasenStation
components:
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_neol.yml
- type: StationNameSetup
mapNameTemplate: '{0} RadStation {1}'
nameGenerator:
!type:NanotrasenNameGenerator
prefixCreator: '14'
- type: StationJobs
overflowJobs:
- Passenger
availableJobs:
#service
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
Bartender: [ 1, 1 ]
Botanist: [ 3, 3 ]
Chef: [ 2, 2 ]
Janitor: [ 2, 2 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 1, 1 ]
#engineering
ChiefEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 4, 4 ]
StationEngineer: [ 3, 3 ]
TechnicalAssistant: [ 2, 2 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
Chemist: [ 2, 2 ]
MedicalBorg: [ 2, 2 ]
MedicalDoctor: [ 3, 3 ]
Paramedic: [ 1, 1 ]
MedicalIntern: [ 2, 2 ]
#science
ResearchDirector: [ 1, 1 ]
Roboticist: [ 1, 2 ]
Scientist: [ 5, 5 ]
ForensicMantis: [ 1, 1 ]
ResearchAssistant: [ 2, 2 ]
Borg: [ 1, 1 ]
Chaplain: [ 1, 1 ]
#security
HeadOfSecurity: [ 1, 1 ]
Brigmedic: [ 1, 1 ]
Warden: [ 1, 1 ]
SecurityOfficer: [ 5, 5 ]
Prisoner: [ 2, 3 ]
PrisonGuard: [ 2, 3 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 2, 2 ]
#supply
Quartermaster: [ 1, 1 ]
MailCarrier: [ 1, 2 ]
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 5, 5 ]
#civilian
Passenger: [ -1, -1 ]
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
Reporter: [ 2, 2 ]
Psychologist: [ 1, 1 ]
#justice
ChiefJustice: [ 1, 1 ]
Clerk: [ 1, 1 ]
Lawyer: [ 1, 1 ]
Prosecutor: [ 1, 1]