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

Sorting departments. #42

Open
wants to merge 68 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
cc2f5f8
Sorting departments.
Adrian16199 Jan 18, 2024
2a5ccb5
Merge branch 'master' into Sort-departments
Adrian16199 Jan 25, 2024
4edf031
Just bit of sortin prolly
Adrian16199 Jan 25, 2024
631d949
Merge branch 'master' into Sort-departments
Adrian16199 Jan 30, 2024
76c11e3
Bit of a clean up.
Adrian16199 Jan 30, 2024
671b5c6
Cleaning
Adrian16199 Feb 1, 2024
7eae263
A small detail.
Adrian16199 Feb 1, 2024
d179a6c
Update Resources/Locale/en-US/nyanotrasen/job/job-description.ftl
Adrian16199 Feb 1, 2024
72eaa00
Update Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml
Adrian16199 Feb 1, 2024
df6666c
Update Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
Adrian16199 Feb 1, 2024
56986be
Update Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
Adrian16199 Feb 1, 2024
e0a5719
Update Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier…
Adrian16199 Feb 1, 2024
100f12a
Update Resources/Prototypes/Entities/Structures/Machines/salvage.yml
Adrian16199 Feb 1, 2024
656931f
Update Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
Adrian16199 Feb 1, 2024
731f454
Deletion of logistics
Adrian16199 Feb 3, 2024
b309633
Re-enables forensic mantis.
Adrian16199 Feb 3, 2024
2b0f044
No more captain
Adrian16199 Feb 3, 2024
d4479d3
Buh
Adrian16199 Feb 3, 2024
c847d9c
Update Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
Adrian16199 Feb 4, 2024
899b49c
Update Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
Adrian16199 Feb 4, 2024
1041574
get rid of debug changes
Adrian16199 Feb 4, 2024
bc1f5d0
Merge branch 'master' into Sort-departments
Adrian16199 Feb 4, 2024
43ba09c
Decrease access
Adrian16199 Feb 4, 2024
886267c
Cargo technician instead of QM
Adrian16199 Feb 4, 2024
b479c49
cleanin and fixin....
Adrian16199 Feb 4, 2024
3841942
Buh....
Adrian16199 Feb 4, 2024
3ea3f47
Headset just for salvage!
Adrian16199 Feb 4, 2024
b3e9156
salvage magnet speaks on Engineering comms
DEATHB4DEFEAT Feb 5, 2024
c24438d
some cleanup
DEATHB4DEFEAT Feb 5, 2024
1a9d4d4
eradicate Logistics
DEATHB4DEFEAT Feb 5, 2024
9b3db9e
Applyin....
Adrian16199 Feb 5, 2024
87b4e95
Removin specific....
Adrian16199 Feb 5, 2024
2035b41
Fixin.... whitespacin....
Adrian16199 Feb 5, 2024
a1fffcf
Update Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml
Adrian16199 Feb 10, 2024
9ffec89
Update Content.Server/Salvage/SalvageSystem.Magnet.cs
Adrian16199 Feb 10, 2024
4ef613b
Update Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml
Adrian16199 Feb 10, 2024
78c5f4d
Update Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
Adrian16199 Feb 10, 2024
9b212e1
Update Resources/Prototypes/Entities/Clothing/Head/hoods.yml
Adrian16199 Feb 10, 2024
85010c7
Update Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
Adrian16199 Feb 10, 2024
ecf2d34
Update Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier…
Adrian16199 Feb 10, 2024
8e149d2
Update Resources/Prototypes/Roles/Jobs/departments.yml
Adrian16199 Feb 10, 2024
840cdf4
Update Resources/Prototypes/Entities/Structures/Storage/Closets/Locke…
Adrian16199 Feb 10, 2024
812efbf
Update Resources/Prototypes/Entities/Structures/Decoration/banners.yml
Adrian16199 Feb 10, 2024
3bc069d
Update Resources/Prototypes/Entities/Clothing/Head/soft.yml
Adrian16199 Feb 10, 2024
a27219c
Update Resources/Prototypes/Entities/Clothing/Head/soft.yml
Adrian16199 Feb 10, 2024
e617984
Update Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
Adrian16199 Feb 10, 2024
a0322c6
Update Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
Adrian16199 Feb 10, 2024
3f589da
Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
Adrian16199 Feb 10, 2024
1c62a34
Update Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoa…
Adrian16199 Feb 10, 2024
50d9c1b
Update Resources/Prototypes/Entities/Objects/Misc/identification_card…
Adrian16199 Feb 10, 2024
1b0e7d4
Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
Adrian16199 Feb 10, 2024
c9a8bc2
Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Adrian16199 Feb 10, 2024
6925434
Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Adrian16199 Feb 10, 2024
a519811
Update Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
Adrian16199 Feb 10, 2024
338fd01
Update Resources/Prototypes/Entities/Objects/Devices/pda.yml
Adrian16199 Feb 10, 2024
b2549a3
Update Resources/Prototypes/Entities/Objects/Devices/pda.yml
Adrian16199 Feb 10, 2024
756b004
Update Resources/Prototypes/Entities/Objects/Fun/figurines.yml
Adrian16199 Feb 10, 2024
77698ea
Merge branch 'master' into Sort-departments
Adrian16199 Feb 12, 2024
ccd8637
Apply suggestions from code review
Adrian16199 Feb 14, 2024
4ac4b1a
applying
Adrian16199 Feb 14, 2024
2296b8d
Update head_of_personnel.yml
Adrian16199 Feb 14, 2024
1d8429a
Update head_of_personnel.yml
Adrian16199 Feb 14, 2024
54ba5c9
Merge branch 'master' into Sort-departments
Adrian16199 Mar 5, 2024
d8aa263
B-buh
Adrian16199 Mar 5, 2024
e7a3568
Cargo
Adrian16199 Mar 5, 2024
1b13541
hopefully fixes yml?
Adrian16199 Mar 15, 2024
de5b4fc
Merge branch 'master' into Sort-departments
Adrian16199 Mar 15, 2024
4853d6d
buh
Adrian16199 Mar 17, 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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: entity
parent: BaseItem
id: SpaceCashLuckyBill
name: quartermaster's lucky bill
name: Cargo technician's lucky bill
Adrian16199 marked this conversation as resolved.
Show resolved Hide resolved
description: The first bill ever earned by the Cargo Technician from trading. A small chip is embedded in it.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

components:
- type: Sprite
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
parent: ClothingHeadsetCargo
id: ClothingHeadsetQM
name: quartermaster's headset
description: A headset used by the QuarterMaster.
description: A headset used by the Quartermaster.
components:
- type: ContainerFill
containers:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Head/soft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
parent: ClothingHeadBaseButcherable
id: ClothingHeadHatQMsoft
name: quartermaster's cap
description: "It's a baseball hat painted in the QuarterMaster's colors."
description: "It's a baseball hat painted in the Quartermaster's colors."
components:
- type: Sprite
sprite: Clothing/Head/Soft/qmsoft.rsi
Expand All @@ -62,7 +62,7 @@
parent: ClothingHeadBaseButcherable
id: ClothingHeadHatQMsoftFlipped
name: quartermaster's cap flipped
description: "It's a baseball hat painted in the QuarterMaster's colors. Flipped."
description: "It's a baseball hat painted in the Quartermaster's colors. Flipped."
components:
- type: Sprite
sprite: Clothing/Head/Soft/qmsoft_flipped.rsi
Expand Down
21 changes: 11 additions & 10 deletions Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
Adrian16199 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,24 @@
- Janitor
- Theatre
- Kitchen
# - Chapel # Parkstation-Epistemics
# - Chapel # Parkstation-Epistemics
- Hydroponics
- External
# I mean they'll give themselves the rest of the access levels *anyways*.
# As of 15/03/23 they can't do that so here's MOST of the rest of the access levels.
# Head level access that isn't their own was deliberately left out, get AA from the captain instead.
- Chemistry
- Engineering
- Research
# - Detective
# - Salvage
- Security # NoooOoOo!! My HoPcurity!1
# Delta V - fuck all of this HoP is a service role
# - Chemistry
# - Engineering
# - Research
# - Detective
# - Salvage
# - Security # NoooOoOo!! My HoPcurity!1
# - Brig
- Lawyer
- Cargo
# - Atmospherics
- Medical
# - Cargo
# - Atmospherics
# - Medical
# Parkstation-Oligarchy Start
# - Boxer # DeltaV - Add Boxer access
# - Clown # DeltaV - Add Clown access
Expand Down
Loading