Bridge Assistant Station Trait #80279

Fikou · 2023-12-12T20:58:11Z

About The Pull Request

adds a station trait which adds a new role, the bridge assistant
he is designed to help commandeer the bridge and help out other heads when needed. he is armed with the mini energy gun (the one heads used to have on kilostation), a flash, a toolbelt (with an inducer), some cool shades and a swanky scarf.
as he is a nerd he is weak and unable to twohand weapons, preventing him from wielding the fire axe.
currently he does not have a mindshield but he cannot roll antag
he currently has access to the bridge, announcement console, eva, teleporter, gateway, maint, and a weapon permit (somewhat (not really other than for nerds) interestingly this is the first job that isnt assistant that doesnt have access to any lathes, so he doesnt have orm access unlike all the other jobs (except assistant))
the trait also makes a coffee machine spawn on the bridge
here is some useful art of your role

and ingame screenshots

Why It's Good For The Game

Adds upon the station trait job system with a straight forward role that IS just a human (unlike the cargorilla), and is pretty basic with no custom assets or whatever other than hud icons
Having the bridge assistant in some rounds seems like a neat way to protect it since it gets fucked up in like half the time, while also not having enough mechanical depth or gameplay as to warrant it as a permanent role

Changelog

🆑
add: Bridge Assistant job accessible from a station trait.
/:cl:

DrDiasyl · 2023-12-12T21:02:46Z

Finally, a coffee fetcher.

I always thought that we needed a Adjutant role, even as a station trait. Also, you can get its trim from station ID consoles?

Fikou · 2023-12-12T21:09:12Z

apparently you can

DrDiasyl · 2023-12-12T21:09:55Z

apparently you can

S tier mega super duper PR.

code/datums/station_traits/job_traits.dm

SimplySmiley123 · 2023-12-12T23:04:29Z

apparently you can

Finally, a trim for command assistant tomfoolery.

Co-authored-by: san7890 <the@san7890.com>

MrMelbert · 2023-12-12T23:24:05Z

code/datums/station_traits/job_traits.dm

+/// Creates a coffeemaker in the bridge, if we don't have one yet.
+/datum/station_trait/job/bridge_assistant/proc/add_coffeemaker(datum/source)


I still think this is silly, this is what downstreams do because they don't have the luxury of being able to edit maps, we really can just map in coffee machines

i dont want to add the expectation for mappers to deal with this shit

There doesn't need to be an expectation, a mapper can include a coffee machine if they think one fits the bridge and can not if they do not

If anything, a bridge without a coffee machine is just more job content for the bridge assistant, because now the captain can order them to hunt down a coffee machine

fyi coffee machines require water recyclers which require plastic to be made and also require to be made in an autolathe (no protolathe prints them)

somewhat tangibly related. im just ranting about how annoying it is to make coffee machines- and most maps don't have them? i think?

no they dont

meta has a coffee machine next to cargo in the cafe, no?

NOT ON THE BRIDGE

fwiw i think its fine in principle. let mappers choose a place manually, but automatic otherwise. also makes it easier to migrate existing "unused, but frequently run" maps like kilo/pubby

I'd prefer a landmark system.
Is there's a "coffee maker spawn point" use that.
Findt an open table otherwise

i still disagree with it in practice but since it's a rare station trait it's like... whatever. i wouldn't want to see it expanded

code/modules/jobs/job_types/station_trait/bridge_assistant.dm

code/datums/station_traits/job_traits.dm

projectkepler-ru · 2023-12-13T10:45:01Z

whar

code/modules/jobs/job_types/station_trait/bridge_assistant.dm

Jacquerel · 2023-12-13T14:41:52Z

I think they should spawn with a whistle that they can peep at people who are loitering on the bridge

Admiral-Gigaton · 2023-12-13T14:53:20Z

this seems awesome, NVS13 bridge staff fr. i wish this would be a normal job, but like others have said, the pwr gaming without head of staff restrictions would be hard. then again, thats the admin's job to deal with.

code/datums/station_traits/job_traits.dm

code/datums/components/twohanded.dm

Mothblocks · 2023-12-15T09:21:58Z

code/datums/station_traits/job_traits.dm

+			SSstation.antag_protected_roles += job_to_add::title
+		if(CAN_ROLL_NEVER)
+			SSstation.antag_restricted_roles += job_to_add::title


we're sure this works? i thought :: was always calculated at compile time. this feels like it's going to give you the initial of /datum/job::title, not of whatever the job is. Double check this.

its essentially just a wrapper for initial(job_to_add.title)

we need to decide which one of these we want

code/datums/station_traits/job_traits.dm

…bridgeassistant

Wallemations

You're gonna need a better menu button, I can't tell what that's supposed to represent at all

Admiral-Gigaton · 2023-12-18T15:49:18Z

is this able to happen with cargorilla or is it separated? could do the "station trait gang" (maybe an event?) where jobs that are station traits all happen at once, so theres just this gang of executives and animals roaming around doing dumb shit

Jacquerel · 2023-12-18T17:23:23Z

is this able to happen with cargorilla or is it separated? could do the "station trait gang" (maybe an event?) where jobs that are station traits all happen at once, so theres just this gang of executives and animals roaming around doing dumb shit

Currently all traits which add a job are coded to be mutually exclusive. although admins can probably bypass this limit.

Original PR: tgstation/tgstation#80279 ----- ## About The Pull Request adds a station trait which adds a new role, the bridge assistant he is designed to help commandeer the bridge and help out other heads when needed. he is armed with the mini energy gun (the one heads used to have on kilostation), a flash, a toolbelt (with an inducer), some cool shades and a swanky scarf. as he is a nerd he is weak and unable to twohand weapons, preventing him from wielding the fire axe. currently he does not have a mindshield but he cannot roll antag he currently has access to the bridge, announcement console, eva, teleporter, gateway, maint, and a weapon permit (somewhat (not really other than for nerds) interestingly this is the first job that isnt assistant that doesnt have access to any lathes, so he doesnt have orm access unlike all the other jobs (except assistant)) the trait also makes a coffee machine spawn on the bridge here is some useful art of your role ![image](https://github.com/tgstation/tgstation/assets/23585223/905e5527-9069-4226-b160-8dedd1ea7b74) and ingame screenshots ![image](https://github.com/tgstation/tgstation/assets/23585223/0aa537ac-a791-4249-a702-490584919fd9) ![image](https://github.com/tgstation/tgstation/assets/23585223/eb93e2d1-0291-4ade-9208-b1c0b68648c7) ![image](https://github.com/tgstation/tgstation/assets/23585223/1d3c2f11-8ac0-4ee9-91a5-176f81a08dcb) ## Why It's Good For The Game Adds upon the station trait job system with a straight forward role that IS just a human (unlike the cargorilla), and is pretty basic with no custom assets or whatever other than hud icons Having the bridge assistant in some rounds seems like a neat way to protect it since it gets fucked up in like half the time, while also not having enough mechanical depth or gameplay as to warrant it as a permanent role ## Changelog :cl: add: Bridge Assistant job accessible from a station trait. /:cl: --------- Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com> Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>

Fikou added 5 commits December 12, 2023 21:03

Bridge Assistant

e10f0ab

spawn on the bridge

4487bcb

spawns correctly

858c569

brew coffee

a3f55d4

work

d4c35b3

Fikou requested review from Imaginos16, Krysonism, Twaticus, Wallemations and LemonInTheDark as code owners December 12, 2023 20:58

tgstation-server added Sprites A bikeshed full of soulless bikes. Feature Exposes new bugs in interesting ways UI We make the game less playable, but with round edges labels Dec 12, 2023

move that coffee

755f685

github-actions bot requested a review from stylemistake December 12, 2023 20:58

fUCK YOU!!!!!!!!

9ace15d

Fikou added 2 commits December 12, 2023 22:29

protects melbert

4c419d1

boost the weight to 2?

c3dd4ed

san7890 reviewed Dec 12, 2023

View reviewed changes

code/datums/station_traits/job_traits.dm Outdated Show resolved Hide resolved

Update code/datums/station_traits/job_traits.dm

7351da7

Co-authored-by: san7890 <the@san7890.com>

MrMelbert reviewed Dec 12, 2023

View reviewed changes

code/modules/jobs/job_types/station_trait/bridge_assistant.dm Outdated Show resolved Hide resolved

MrMelbert reviewed Dec 12, 2023

View reviewed changes

code/modules/jobs/job_types/station_trait/bridge_assistant.dm Outdated Show resolved Hide resolved

MrMelbert requested changes Dec 12, 2023

View reviewed changes

code/datums/station_traits/job_traits.dm Outdated Show resolved Hide resolved

its melbover

ab45e90

Fikou requested a review from ZephyrTFA as a code owner December 13, 2023 00:01

projectkepler-ru reviewed Dec 13, 2023

View reviewed changes

code/modules/jobs/job_types/station_trait/bridge_assistant.dm Show resolved Hide resolved

MrMelbert reviewed Dec 14, 2023

View reviewed changes

code/datums/station_traits/job_traits.dm Outdated Show resolved Hide resolved

MrMelbert reviewed Dec 14, 2023

View reviewed changes

code/datums/station_traits/job_traits.dm Outdated Show resolved Hide resolved

coffee boy

2732a5b

Mothblocks requested changes Dec 15, 2023

View reviewed changes

richard

2a59a04

tgstation-server added the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label Dec 15, 2023

github-actions bot requested a review from Mothblocks December 15, 2023 12:04

Fikou added 2 commits December 15, 2023 13:10

Merge remote-tracking branch 'upstream/master' into bridgeassistant

1aa5068

Merge branch 'master' of https://github.com/tgstation/tgstation into …

82fa088

…bridgeassistant

tgstation-server removed the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label Dec 15, 2023

Wallemations requested changes Dec 15, 2023

View reviewed changes

commit

57891da

github-actions bot requested a review from Wallemations December 16, 2023 00:04

he doesnt need an unique hud icon

48b8020

Wallemations approved these changes Dec 16, 2023

View reviewed changes

ZephyrTFA merged commit a3fa541 into tgstation:master Dec 17, 2023
19 checks passed

comfyorange added a commit that referenced this pull request Dec 17, 2023

Automatic changelog for PR #80279 [ci skip]

2171435

github-actions bot added a commit that referenced this pull request Dec 17, 2023

Updating GBP balances for #80279

47ef795

SkyratBot mentioned this pull request Dec 17, 2023

[MIRROR] Bridge Assistant Station Trait [MDB IGNORE] Skyrat-SS13/Skyrat-tg#25667

Merged

TaleStationBot mentioned this pull request Dec 17, 2023

[MIRROR] [MDB IGNORE] Bridge Assistant Station Trait TaleStation/TaleStation#9070

Merged

Steals-The-PRs mentioned this pull request Dec 24, 2023

[MIRROR] Bridge Assistant Station Trait Fluffy-Frontier/FluffySTG#1297

Closed

vinylspiders mentioned this pull request Jan 10, 2024

[MIRROR] Bridge Assistant Station Trait (#80279) NovaSector/NovaSector#388

Merged

Steals-The-PRs mentioned this pull request Jan 22, 2024

[MIRROR] Bridge Assistant Station Trait (#80279) Fluffy-Frontier/FluffySTG#1637

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bridge Assistant Station Trait #80279

Bridge Assistant Station Trait #80279

Fikou commented Dec 12, 2023 •

edited

DrDiasyl commented Dec 12, 2023

Fikou commented Dec 12, 2023

DrDiasyl commented Dec 12, 2023

SimplySmiley123 commented Dec 12, 2023

MrMelbert Dec 12, 2023

Fikou Dec 12, 2023

MrMelbert Dec 12, 2023

iwishforducks Dec 12, 2023

Fikou Dec 12, 2023

newfren Dec 13, 2023

Fikou Dec 13, 2023

Mothblocks Dec 13, 2023 •

edited

ZephyrTFA Dec 13, 2023

MrMelbert Dec 14, 2023

projectkepler-ru commented Dec 13, 2023

Jacquerel commented Dec 13, 2023

Admiral-Gigaton commented Dec 13, 2023

Mothblocks Dec 15, 2023

Fikou Dec 15, 2023 •

edited

ZephyrTFA Dec 15, 2023

LemonInTheDark Dec 17, 2023

Wallemations left a comment

Admiral-Gigaton commented Dec 18, 2023

Jacquerel commented Dec 18, 2023

		/// Creates a coffeemaker in the bridge, if we don't have one yet.
		/datum/station_trait/job/bridge_assistant/proc/add_coffeemaker(datum/source)

Bridge Assistant Station Trait #80279

Bridge Assistant Station Trait #80279

Conversation

Fikou commented Dec 12, 2023 • edited

About The Pull Request

Why It's Good For The Game

Changelog

DrDiasyl commented Dec 12, 2023

Fikou commented Dec 12, 2023

DrDiasyl commented Dec 12, 2023

SimplySmiley123 commented Dec 12, 2023

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mothblocks Dec 13, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

projectkepler-ru commented Dec 13, 2023

Jacquerel commented Dec 13, 2023

Admiral-Gigaton commented Dec 13, 2023

Choose a reason for hiding this comment

Fikou Dec 15, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Wallemations left a comment

Choose a reason for hiding this comment

Admiral-Gigaton commented Dec 18, 2023

Jacquerel commented Dec 18, 2023

Fikou commented Dec 12, 2023 •

edited

Mothblocks Dec 13, 2023 •

edited

Fikou Dec 15, 2023 •

edited