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

[Repo] Corvax #20

Merged
merged 86 commits into from
Aug 29, 2023
Merged

[Repo] Corvax #20

merged 86 commits into from
Aug 29, 2023

Conversation

DEATHB4DEFEAT
Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT commented Jan 28, 2023 •
edited
Loading

Changelog

🆑 DEATHB4DEFEAT, courtesy of Corvax

  • tweak: Typing indicators are more reactive, with a new state for idling in the chat bar
  • tweak: Resprite typing indicators
  • add: Slimepeople, Moths, Aliens, and Robots now have unique typing indicators
  • add: Added a queue system, if the server is full, players will be put in a queue instead of being kicked
  • add: Added random station goals, sent to the command fax machine at the start of the shift
  • add: Added some new lobby art
  • add: Added more Captain clothing
  • add: Added a HoP coat
  • add: Added 9 potted plant variations
  • tweak: Different shotguns have different sounds
  • tweak: Resprite ERT jumpsuits and helmets
  • tweak: Resprite Syndicate EVA suit
  • tweak: Resprite Singularity and related equipment
  • tweak: Resprite intercom
  • tweak: Resprite lamps
  • tweak: Resprite reagent tanks
  • fix: Resprite uranium windows
  • tweak: Resprite chairs
  • tweak: Resprite mailing units
  • tweak: Resprite diagonal solid walls
  • tweak: Resprite Atmospheric Technician backpacks
  • tweak: Resprite cans
  • tweak: Resprite gas canisters
  • tweak: Resprite fax machines
  • tweak: Resprite some melee weapons

@DEATHB4DEFEAT DEATHB4DEFEAT self-assigned this Jan 28, 2023
@github-actions github-actions bot added Changes: Sprite Changes any png or json in an rsi Changes: UI Changes any XAML files labels Jan 28, 2023
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Jan 28, 2023
@github-actions
Copy link

github-actions bot commented Jan 28, 2023 •
edited
Loading

RSI Diff Bot; head commit 488a774 merging into 1ab6db8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi

State Old New Status
equipped-BACKPACK Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi

State Old New Status
equipped-BACKPACK Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi

State Old New Status
equipped-BACKPACK Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Eyes/Glasses/meson.rsi

State Old New Status
icon Modified

Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi

State Old New Status
icon Modified

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi

State Old New Status
icon-flash Modified
icon Modified
off-equipped-HELMET Modified
off-inhand-left Modified
off-inhand-right Modified
on-equipped-HELMET Modified
on-inhand-left Modified
on-inhand-right Modified

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi

State Old New Status
icon-flash Modified
icon Modified
off-equipped-HELMET Modified
off-inhand-left Modified
off-inhand-right Modified
on-equipped-HELMET Modified
on-inhand-left Modified
on-inhand-right Modified

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi

State Old New Status
icon-flash Modified
icon Modified
off-equipped-HELMET Modified
off-inhand-left Modified
off-inhand-right Modified
on-equipped-HELMET Modified
on-inhand-left Modified
on-inhand-right Modified

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi

State Old New Status
icon-flash Modified
icon Modified
off-equipped-HELMET Modified
off-inhand-left Modified
off-inhand-right Modified
on-equipped-HELMET Modified
on-inhand-left Modified
on-inhand-right Modified

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi

State Old New Status
icon-flash Modified
icon Modified
off-equipped-HELMET Modified
off-inhand-left Modified
off-inhand-right Modified
on-equipped-HELMET Modified
on-inhand-left Modified
on-inhand-right Modified

Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi

State Old New Status
equipped-HELMET Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi

State Old New Status
equipped-HELMET Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi

State Old New Status
equipped-HELMET Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi

State Old New Status
equipped-HELMET Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Head/Helmets/ert_security.rsi

State Old New Status
equipped-HELMET Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Mask/gascaptain.rsi

State Old New Status
equipped-MASK Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Neck/Cloaks/cap.rsi

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

Resources/Textures/Clothing/Neck/Cloaks/hop.rsi

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

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Head/Helmets/syndicate.rsi

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

Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi

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

Resources/Textures/Corvax/Clothing/Head/Hats/ERT_leader_beret.rsi

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

Resources/Textures/Corvax/Clothing/Head/Hats/capcap.rsi

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

Resources/Textures/Corvax/Clothing/Head/Hats/caphat.rsi

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

Resources/Textures/Corvax/Clothing/Neck/Mantles/ERTmantle.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Corvax/Clothing/OuterClothing/Coats/captain.rsi

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

Resources/Textures/Corvax/Clothing/OuterClothing/Coats/hop.rsi

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

Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/engineerERT.rsi

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

Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/janitorERT.rsi

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

Edit: diff updated after 488a774

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Feb 1, 2023
@github-actions
Copy link

github-actions bot commented Feb 1, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Feb 3, 2023
@Pspritechologist
Copy link
Member

We need to sort out the indicators, customize the station goal system and write up some of our own, and double-triple sanity check that everything's working fine.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Feb 24, 2023
@github-actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Feb 26, 2023
@Pspritechologist Pspritechologist self-assigned this Mar 3, 2023
@DEATHB4DEFEAT

This comment was marked as resolved.

Sign in to view
@DEATHB4DEFEAT
more station goals
b5498b3
@DEATHB4DEFEAT
Merge branch 'master' into corvax
2cd00c9 
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Textures/Effects/speech.rsi/meta.json
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Aug 25, 2023
DEATHB4DEFEAT and others added 23 commits August 24, 2023 19:05
@DEATHB4DEFEAT
fix station goal paper formatting
46d176e
@DEATHB4DEFEAT
remove bank goal
e92f196
@DEATHB4DEFEAT
add date/station to station goals
de8aac4
@SonicHDC @ficcialfaint @DEATHB4DEFEAT
Diagonal wall resprite (#1130)
1abadc0 
Co-authored-by: faint <[email protected]>
@SonicHDC @DEATHB4DEFEAT
Added directional sprites for lamps (#1047)
0a63511
@SonicHDC @DEATHB4DEFEAT
[Resprite] Ammo machine redisign (#873)
024a6fe
@Morb0 @DEATHB4DEFEAT
[Resprite] Cans (#1365)
56450f2
@Morb0 @DEATHB4DEFEAT
[Resprite] ERT helmets (#1352)
a9e9905
@lzk228 @DEATHB4DEFEAT
[Resprite] Atmospheric backpacks (#1235)
1648e41
@Morb0 @DEATHB4DEFEAT
[Resprite] Meson & thermal glasses icon (#1225)
58d9fc5
@mhamsterr @DEATHB4DEFEAT
Coats, cloaks and captain mask resprite (#1134)
d3162cc
@SonicHDC @DEATHB4DEFEAT
Mailing resprite (#1117)
162b895
@SonicHDC @lzk228
@ficcialfaint @DEATHB4DEFEAT
[Resprite] Better tanks (#1095)
5668cdf 
Co-authored-by: lzk228 <[email protected]>
Co-authored-by: faint <[email protected]>
@DEATHB4DEFEAT
[Resprite] Uranium windows (#1089)
c38c115
@lzk228 @DEATHB4DEFEAT
[Resprite] Ore & hydro bag inhand (#1059)
6ace299
@Morb0 @DEATHB4DEFEAT
[Resprite] Chairs (#887)
1746263
@DEATHB4DEFEAT
remove extra locale from cherry picks
44900f8
@DEATHB4DEFEAT
fix banana lamp
5724532
@DEATHB4DEFEAT
fix advertisements
0a5da39
@RomanMinaev @DEATHB4DEFEAT
[Resprite] Fax and gas canisters (#659)
e1f2537
@DEATHB4DEFEAT
[Resprite] Melee weapon (#883)
8def667
@DEATHB4DEFEAT
fix chat again
f45e4ef
@DEATHB4DEFEAT
enable queue
488a774
@DEATHB4DEFEAT DEATHB4DEFEAT merged commit 27fe3ea into master Aug 29, 2023
6 of 15 checks passed
@DEATHB4DEFEAT DEATHB4DEFEAT deleted the corvax branch August 29, 2023 04:40
SimpleStation14 added a commit that referenced this pull request Aug 29, 2023
@SimpleStation14
Automatic Changelog Update (#20)
31e078d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Pspritechologist Pspritechologist Pspritechologist approved these changes

Assignees

@DEATHB4DEFEAT DEATHB4DEFEAT

@Pspritechologist Pspritechologist

Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: UI Changes any XAML files Changes: YML Changes any yml files Priority: 2-High Needs to be resolved as soon as possible Size: Large For large issues/PRs Status: Awaiting Changes Do not merge due to requested changes Status: Help Wanted Extra attention is needed Status: Needs Cleanup Someone has to clean this before merging Status: Needs Discussion Must be discussed Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@DEATHB4DEFEAT @Pspritechologist @Morb0 @nomad0260 @fedKotikeD @lzk228 @JerryImMouse @SonicHDC @mhamsterr @RomanMinaev