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.

Sign up for GitHub

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

Jump to bottom

Closed. #32427

Closed
wants to merge 88 commits into from
Closed

Closed. #32427

wants to merge 88 commits into from

Conversation

Merrokitsune
Copy link

@Merrokitsune Merrokitsune commented Sep 24, 2024 •
edited
Loading

No description provided.

Merrokitsune and others added 30 commits August 15, 2024 21:19
@Merrokitsune
Reduced artifact scary and boom effects.
e667a7a
@BasedUser @Merrokitsune
Introduce balanced pipe stacking
36f9a41
@Merrokitsune
Merge branch 'RonRonstation:master' into Reduce-artifact-explosions-t…
4a14f3e 
…o-a-manageable-level
@Merrokitsune
Merge branch 'RonRonstation:master' into pipe-stacking-improved
55d507d
@Merrokitsune
Add a slightly redesigned Saltern, Saltern-2.
e1cb9db
@Merrokitsune
Fill saltern-2.yml with data.
b65355b 
If no data, then it's not a map.
@Merrokitsune
Merge branch 'RonRonstation:master' into Reduce-artifact-explosions-t…
3d5a1b2 
…o-a-manageable-level
@Merrokitsune
Merge branch 'RonRonstation:master' into add-new-saltern
f4aadb1
@Merrokitsune
Merge branch 'RonRonstation:master' into pipe-stacking-improved
ca70a1c
@Merrokitsune
Added heccdiver items.
b208c9f
@Merrokitsune
Minor fixes.
4015b9e
@Merrokitsune
Fixes.
d4d18d8
@Merrokitsune
Fixed id of heccdiver hardsuit.
aefdd45
@Merrokitsune
Removed duplicate id of heccdiver hardsuit.
3a7eaba
@Merrokitsune
Fixed starting gear id.
e220fe2
@Merrokitsune
Minor starting gear modifications.
077ccab
@Merrokitsune
Renamed folders.
0a17aa8
@Merrokitsune
Renamed hardsuits.yml and fixed meta.json of hardsuit.
6da09ac
@Merrokitsune
Fixed id card yml to use Ronstation textures.
009ec6b
@Merrokitsune
Fixed sprite import directory to correct directory.
642749b
@Merrokitsune
Minor radio channel fix.
d605396
@Merrokitsune
Temporary reverseable edit amd a rename.
7fb0c58
@Merrokitsune
Temporary mass commenting.
0e21e45
@Merrokitsune
Uncommented radio and channel.
9b2d2a0
@Merrokitsune
Fixed RadioSpeaker channels.
74a48a1
@Merrokitsune
Fixed TerraGov channel designations.
893733a
@Merrokitsune
Removed channel for Terragov.
30ec81b
@Merrokitsune
Some clenaup and some fixes, as well as relocating the ftl files.
79c1c0d
@Merrokitsune
Minor fix.
28625b8
@Merrokitsune
Modified backpack weapon and fixed missing lines in humanoid.yml prot…
3236db2 
…otype.
Merrokitsune and others added 20 commits August 31, 2024 23:35
@Merrokitsune
Merge pull request RonRonstation#65 from Merrokitsune/revive-emergenc…
ac5c46b 
…y-nitrogen-tanks,-and-replace-oxygen-tanks-with-air-tanks

Readd emergency nitrogen tanks, and replace oxygen tanks with air tanks.
@Merrokitsune
Added blueshield role.
7272789
@Merrokitsune
Minor access fix.
c39661a
@Merrokitsune
Readded Heccdiver ID card after being mistakenly deleted.
d17beee
@Merrokitsune
Typo fix.
d2c8da8
@Merrokitsune
Merge branch 'RonRonstation:master' into add-blueshield
213090f
@Merrokitsune
Merge branch 'master' into Alt2
f356245
@RonRonstation
Merge pull request RonRonstation#69 from RonRonstation/Alt2
277bcff 
General update attempt, take 1.
@RonRonstation
Merge branch 'space-wizards:master' into master
dbaa51a
@Merrokitsune
Merge branch 'RonRonstation:master' into add-blueshield
4c0481d
@Merrokitsune
Merge branch 'space-wizards:master' into master
f2f5292
@Merrokitsune
Merge branch 'RonRonstation:master' into add-blueshield
4ff1c20
@Merrokitsune
Readded salvage shuttle.
588c670
@Merrokitsune
Merge branch 'space-wizards:master' into master
f8ce0e8
@Merrokitsune
Merge branch 'space-wizards:master' into master
a8ff822
@Merrokitsune
Merge branch 'RonRonstation:master' into Redo-salvage-
23e2dea
@RonRonstation
Merge pull request RonRonstation#68 from Merrokitsune/add-blueshield
f979fc4 
Added blueshield role.
@RonRonstation
Merge pull request RonRonstation#70 from Merrokitsune/Redo-salvage-
c80daab 
Readded salvage shuttle.
@Merrokitsune
Merge branch 'space-wizards:master' into master
0f76261
@Merrokitsune
Rework firelocks.
58e9934
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged. Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. labels Sep 24, 2024
@Merrokitsune
Copy link
Author

Merrokitsune commented Sep 24, 2024 •
edited
Loading

Closed, due to merge destination error.

@github-actions GitHub Actions
Copy link
Contributor

RSI Diff Bot; head commit 58e9934 merging into 9d75a22
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Ronstation/Clothing/Head/Helmets/heccdiver.rsi

State Old New Status
equipped-HELMET-vox Added
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Ronstation/Clothing/Neck/Cloaks/heccdiver.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Ronstation/Clothing/OuterClothing/Hardsuits/heccdiver.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Added
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Ronstation/Clothing/Uniforms/Jumpskirt/blueshield_grey.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Ronstation/Clothing/Uniforms/Jumpsuit/blueshield_grey.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Ronstation/Clothing/Uniforms/Jumpsuit/heccdiver.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Ronstation/Markers/jobs.rsi

State Old New Status
blueshield_officer Added
green Added

Resources/Textures/Ronstation/Objects/Devices/pda.rsi

State Old New Status
equipped-BELT Added
equipped-IDCARD Added
id_overlay Added
inhand-left Added
inhand-right Added
insert_overlay Added
light_overlay Added
pda-blueshield Added
pda-heccdiver Added
pda Added

Resources/Textures/Ronstation/Objects/Devices/terragovhandy.rsi

State Old New Status
walkietalkie-inhand-left Added
walkietalkie-inhand-right Added
walkietalkie-off Added
walkietalkie-on Added
walkietalkie Added

Resources/Textures/Ronstation/Objects/Misc/id_cards.rsi

State Old New Status
default-inhand-left Added
default-inhand-right Added
default Added
heccdiver-inhand-left Added
heccdiver-inhand-right Added
heccdiver Added
idnanotrasen Added

@Merrokitsune Merrokitsune changed the title Rework how firelocks work. Closed. Sep 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Partmedia Partmedia Awaiting requested review from Partmedia Partmedia is a code owner

@Emisse Emisse Awaiting requested review from Emisse Emisse is a code owner

@EmoGarbage404 EmoGarbage404 Awaiting requested review from EmoGarbage404 EmoGarbage404 is a code owner

Assignees
No one assigned
Labels
Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Status: Needs Review This PR requires new reviews before it can be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Merrokitsune @BasedUser @RonRonstation