Sorting departments. #42

Adrian16199 · 2024-01-18T19:03:48Z

Description

Sorts the departments. Cargo being in service, salvagers being in engineering, HoP having low AA.

Media

Changelog

🆑

tweak: Some jobs have been adjusted! Some are in new departments, some gained access.

TO-DO: -Get rid of certain syndicate objectives -Find out how to get rid of Logistics in department.yml -Add service supervisor from parkstation -probably adjust icons to what they were in parkstation -get rid of shoukou when its time to actualy get this on review.

github-actions · 2024-01-22T03:34:33Z

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

github-actions · 2024-01-28T02:34:24Z

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

github-actions · 2024-01-30T15:07:29Z

RSI Diff Bot; head commit 4853d6d merging into 9053d1d
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi

State	Old	New	Status
nyanoMailCarrier			Modified

Resources/Textures/Interface/Misc/job_icons.rsi

State	Old	New	Status
CargoTechnician			Modified

Edit: diff updated after 4853d6d

Adrian16199 · 2024-02-01T13:54:51Z

Pretty much ready for review, no idea why it failed the test debug so would be cool if i was told why

DEATHB4DEFEAT

Is that really how DV does their codebase change markers? That sucks.

Resources/Locale/en-US/nyanotrasen/job/job-description.ftl

Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml

Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml

Resources/Prototypes/Entities/Structures/Machines/salvage.yml

Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml

Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml

Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml

Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml

Resources/Prototypes/Roles/Jobs/departments.yml

…ts.yml Co-authored-by: DEATHB4DEFEAT <[email protected]>

…s.yml Co-authored-by: DEATHB4DEFEAT <[email protected]>

Co-authored-by: DEATHB4DEFEAT <[email protected]>

Pspritechologist · 2024-02-10T09:30:36Z

Oh my god please do it in batches

Co-authored-by: DEATHB4DEFEAT <[email protected]>

Pspritechologist · 2024-02-10T09:30:47Z

I am b e g g i n g you

Co-authored-by: DEATHB4DEFEAT <[email protected]>

Adrian16199

I have only just now figured out that all the pending reviews REQUIRE ME TO FIND THIS WEIRD STUPID THING IN THE CORNER JUST TO SUBMIT IT.

Resources/Prototypes/Maps/debug.yml

Resources/Prototypes/Roles/Jobs/departments.yml

Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml

Resources/Prototypes/Palettes/departmental.yml

Adrian16199 · 2024-02-05T11:46:18Z

Resources/Prototypes/Roles/Jobs/Command/captain.yml

@@ -3,10 +3,9 @@
  name: job-name-captain
  description: job-description-captain
  playTimeTracker: JobCaptain
-  setPreference: false # Parkstation-Playtime


Removed it to use the departemental remove because it causes less issues and doesnt require dev map to be changed.

Adrian16199 · 2024-02-05T11:48:51Z

Resources/Prototypes/Maps/debug.yml

@@ -28,7 +28,7 @@
          mapNameTemplate: "Dev"
        - type: StationJobs
          overflowJobs:
-          - HeadOfPersonnel
+          - Captain


Would require mapping a new spawn point.
Im completely unaware of how often the Dev map gets updated and if it does.
Sounds like conflicts on top of conflicts.
Should be probably ignored and just enter via observer but thats just my opinion.

Pspritechologist

You're certain that removing Captain from the Department list is as effective as labeling them not selectable? I'd still like to see it disabled, personally.

Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml

Resources/Prototypes/Entities/Clothing/Ears/headsets.yml

Resources/Prototypes/Entities/Clothing/Head/soft.yml

Pspritechologist · 2024-02-13T09:36:52Z

Resources/Prototypes/Roles/Jobs/departments.yml

-  primary: false
+# Parkstation-Oligarchy Start
+#- type: department
+#  id: Specific


What's this? DeltaV (or Wizden) delegates their less important roles to a weird fake Department? Lame as hell. Move Psych into Medical and Reporter into Service, please.

uh, it uh, Itss already like that.

At the least those 2 roles that you said.

It's possible I was looking at an old commit then? I believe the "department" wasn't commented out when I left that, but I may have had a commit filter on by mistake.

Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml

Adrian16199 · 2024-02-14T13:23:35Z

You're certain that removing Captain from the Department list is as effective as labeling them not selectable? I'd still like to see it disabled, personally.

Well.....
That would require to update the dev map via map and what roles are avaible on it.
This solution just simply bypasses that issue and you can still just hit observe, if you tell me that you still want to see that change, fair enough.

Co-authored-by: Pspritechologist <[email protected]>

Pspritechologist · 2024-02-22T20:18:34Z

Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml

@@ -1,7 +1,7 @@
 - type: entity
  parent: BaseItem
  id: SpaceCashLuckyBill
-  name: quartermaster's lucky bill
+  name: Cargo technician's lucky bill
  description: The first bill ever earned by the Cargo Technician from trading. A small chip is embedded in it.


Cargo tech isn't a singular role, so 'the Cargo Tech' doesn't make sense.

Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml

Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml

Pspritechologist · 2024-03-15T21:47:07Z

Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml

+  #- type: PaintableAirlock
+  #  department: Cargo


Commenting these out probably isn't the best solution.

Pspritechologist · 2024-03-15T21:47:14Z

Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml

+  #- type: PaintableAirlock
+  #  department: Cargo


github-actions · 2024-03-16T23:39:52Z

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

Sorting departments.

cc2f5f8

TO-DO: -Get rid of certain syndicate objectives -Find out how to get rid of Logistics in department.yml -Add service supervisor from parkstation -probably adjust icons to what they were in parkstation -get rid of shoukou when its time to actualy get this on review.

github-actions bot added Changes: C# Changes any cs files Changes: Map Changes any yml file in the Maps directories Status: Merge Conflict FIX YOUR PR AAAGH labels Jan 18, 2024

Merge branch 'master' into Sort-departments

2a5ccb5

github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 25, 2024

Just bit of sortin prolly

4edf031

github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 28, 2024

Merge branch 'master' into Sort-departments

631d949

github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 30, 2024

Bit of a clean up.

76c11e3

github-actions bot added the Changes: Sprite Changes any png or json in an rsi label Jan 30, 2024

Cleaning

671b5c6

github-actions bot added Changes: Localization Changes any ftl files Changes: YML Changes any yml files and removed Changes: C# Changes any cs files Changes: Map Changes any yml file in the Maps directories labels Feb 1, 2024

Adrian16199 marked this pull request as ready for review February 1, 2024 13:37

Adrian16199 requested review from Pspritechologist and DEATHB4DEFEAT as code owners February 1, 2024 13:37

github-actions bot added the Status: Needs Review Someone please review this label Feb 1, 2024

A small detail.

7eae263

DEATHB4DEFEAT requested changes Feb 1, 2024

View reviewed changes

DEATHB4DEFEAT added Size: 3-Medium For medium issues/PRs Status: Requires This requires something else to be done before being resolved Priority: 2-High Needs to be resolved as soon as possible labels Feb 1, 2024

Adrian16199 and others added 7 commits February 10, 2024 10:29

Update Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoa…

1c62a34

…ts.yml Co-authored-by: DEATHB4DEFEAT <[email protected]>

Update Resources/Prototypes/Entities/Objects/Misc/identification_card…

50d9c1b

…s.yml Co-authored-by: DEATHB4DEFEAT <[email protected]>

Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml

1b0e7d4

Co-authored-by: DEATHB4DEFEAT <[email protected]>

Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

c9a8bc2

Co-authored-by: DEATHB4DEFEAT <[email protected]>

Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

6925434

Co-authored-by: DEATHB4DEFEAT <[email protected]>

Update Resources/Prototypes/Entities/Markers/Spawners/jobs.yml

a519811

Co-authored-by: DEATHB4DEFEAT <[email protected]>

Update Resources/Prototypes/Entities/Objects/Devices/pda.yml

338fd01

Co-authored-by: DEATHB4DEFEAT <[email protected]>

Update Resources/Prototypes/Entities/Objects/Devices/pda.yml

b2549a3

Co-authored-by: DEATHB4DEFEAT <[email protected]>

Update Resources/Prototypes/Entities/Objects/Fun/figurines.yml

756b004

Co-authored-by: DEATHB4DEFEAT <[email protected]>

Adrian16199 commented Feb 12, 2024

View reviewed changes

Merge branch 'master' into Sort-departments

77698ea

Pspritechologist requested changes Feb 13, 2024

View reviewed changes

Pspritechologist reviewed Feb 13, 2024

View reviewed changes

Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml Outdated Show resolved Hide resolved

Adrian16199 and others added 4 commits February 14, 2024 14:25

Apply suggestions from code review

ccd8637

Co-authored-by: Pspritechologist <[email protected]>

applying

4ac4b1a

Update head_of_personnel.yml

2296b8d

Update head_of_personnel.yml

1d8429a

Pspritechologist reviewed Feb 22, 2024

View reviewed changes

Adrian16199 and others added 5 commits March 5, 2024 21:56

Merge branch 'master' into Sort-departments

54ba5c9

B-buh

d8aa263

Cargo

e7a3568

hopefully fixes yml?

1b13541

Merge branch 'master' into Sort-departments

de5b4fc

Pspritechologist requested changes Mar 15, 2024

View reviewed changes

github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Mar 16, 2024

buh

4853d6d

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sorting departments. #42

Sorting departments. #42

Adrian16199 commented Jan 18, 2024 •

edited

Loading

github-actions bot commented Jan 22, 2024

github-actions bot commented Jan 28, 2024

github-actions bot commented Jan 30, 2024 •

edited

Loading

Adrian16199 commented Feb 1, 2024

DEATHB4DEFEAT left a comment

Pspritechologist commented Feb 10, 2024

Pspritechologist commented Feb 10, 2024

Adrian16199 left a comment

Adrian16199 Feb 5, 2024

Adrian16199 Feb 5, 2024

Pspritechologist left a comment

Pspritechologist Feb 13, 2024

Adrian16199 Feb 14, 2024

Adrian16199 Feb 14, 2024

Pspritechologist Feb 22, 2024

Adrian16199 commented Feb 14, 2024

Pspritechologist Feb 22, 2024

Pspritechologist Mar 15, 2024

Pspritechologist Mar 15, 2024

github-actions bot commented Mar 16, 2024

Sorting departments. #42

Are you sure you want to change the base?

Sorting departments. #42

Conversation

Adrian16199 commented Jan 18, 2024 • edited Loading

Description

Media

Changelog

github-actions bot commented Jan 22, 2024

github-actions bot commented Jan 28, 2024

github-actions bot commented Jan 30, 2024 • edited Loading

Adrian16199 commented Feb 1, 2024

DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

Pspritechologist commented Feb 10, 2024

Pspritechologist commented Feb 10, 2024

Adrian16199 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Pspritechologist left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Adrian16199 commented Feb 14, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Mar 16, 2024

Adrian16199 commented Jan 18, 2024 •

edited

Loading

github-actions bot commented Jan 30, 2024 •

edited

Loading