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

Unique DeltaV borg names! #2371

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
68 changes: 68 additions & 0 deletions Resources/Prototypes/DeltaV/Datasets/Names/borg.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
- type: dataset
id: names_borg_deltav
values:
- Abacus
- Apple
- Atlas
- Atom
- Atom II
- Ballpoint
- Bee
- Boopsky
- Box
- Breda
- Bren
- Brick
- Brick II
- Broadsword
- Catnip
- Classic
- Danny
- Discovery
- Eagle
- Everest
- Experiment VII
- F.O.X. Bot
- Flywheel
- Gear
- Gear II
- Gear III
- Hammer
- Huh? Skub? # Huh, Skub
- Impossible
- Is-A-Cyborg
- K2
- Lancer
- Loves-The-Crew
- Mac-10
- Mach
- Man Of Iron
- Matchstick
- Meatball
- Meow
- Metal Felinid
- Metal Man
- Metalball
- Mountain
- NASA
- Nermal
- Nova
- Number Five
- Number One
- Ox
- Pastry
- Pea-Body
- Petra
- PrAI
- Prism
- Prydwen # People of the station...
- S.C.R.A.M.
- Sir Mops-A-Lot
- Spud-Nik
- Squirrel # Fun with nutimov laws!
- Steve
- Talent
- Talus
- Thomas
- Trawler
- Voyager
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellMedium
- type: RandomMetadata
nameSegments: [names_borg]
nameSegments: [names_borg_deltav]

- type: entity
parent: BorgChassisSecurity
Expand All @@ -30,4 +30,4 @@
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellMedium
- type: RandomMetadata
nameSegments: [names_borg] # TODO: Make good names, this is a stupid list.
nameSegments: [names_borg_deltav] # TODO: Make good names, this is a stupid list. # Your wish is my command, unknown commenter -Fox
Copy link
Member

Choose a reason for hiding this comment

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

just remove the comment so it wont show on TODOs

Copy link
Member

Choose a reason for hiding this comment

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

the comment intent was to have secborg with less goofy names, not that this pr is bad just saying

also remove the comments yes

2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Player/silicon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellMedium
- type: RandomMetadata # DeltaV: give job borgs names
Copy link
Member

Choose a reason for hiding this comment

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

change the comment to # DeltaV - summary while you're at it for the sake of my OCD

Copy link
Member Author

Choose a reason for hiding this comment

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

pro I diddnt write that but sure

nameSegments: [names_borg]
nameSegments: [names_borg_deltav]

- type: entity
id: PlayerBorgSyndicateAssaultBattery
Expand Down
Loading