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

A few more horny alt titles #992

Merged
merged 2 commits into from
Nov 5, 2023
Merged

A few more horny alt titles #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e698c92
horny alt titles
NopemanMcHalt Nov 4, 2023
c62605d
extra
NopemanMcHalt Nov 4, 2023
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
27 changes: 19 additions & 8 deletions modular_splurt/code/modules/jobs/job_types/_job_alt_titles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
var/list/extra_titles = list(
"Security Commander",
"Head of Slutcurity",
"Head of Studcurity",
"Commissar"
)
if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
Expand All @@ -60,7 +61,8 @@
alt_titles = list(
"Medical Director",
"Medical Administrator",
"Chief Heal Slut"
"Chief Heal Slut",
"Chief Heal Stud"
) // Sandcode do not have alt titles for CMO at the moment.


Expand Down Expand Up @@ -232,7 +234,8 @@
"Alchemist",
"Apothecarist",
"Chemical Plumber",
"Chemi-Slut"
"Chemi-Slut",
"Chemi-Stud"
)
LAZYADD(alt_titles, extra_titles)
. = ..()
Expand All @@ -243,7 +246,8 @@
"Medical Intern",
"Medical Resident",
"Medtech",
"Medi-Slut"
"Medi-Slut",
"Medi-Stud"
)
LAZYADD(alt_titles, extra_titles)
. = ..()
Expand All @@ -259,6 +263,7 @@
"Rental Mommy",
"Rental Daddy",
"Psycholo-Slut",
"Psycholo-Stud",
"Sexual Advisor"
)
LAZYADD(alt_titles, extra_titles)
Expand All @@ -267,15 +272,17 @@
/datum/job/geneticist/New()
var/list/extra_titles = list(
"Genetics Researcher",
"Gene-Slut"
"Gene-Slut",
"Gene-Stud"
)
LAZYADD(alt_titles, extra_titles)
. = ..()

/datum/job/paramedic/New()
var/list/extra_titles = list(
"Trauma Team",
"Para-Slut"
"Para-Slut",
"Para-Stud"
)
LAZYADD(alt_titles, extra_titles)
. = ..()
Expand All @@ -284,7 +291,8 @@
var/list/extra_titles = list(
"Microbiologist",
"Biochemist",
"Viro-Slut"
"Viro-Slut",
"Viro-Stud"
)
LAZYADD(alt_titles, extra_titles)
. = ..()
Expand All @@ -295,6 +303,7 @@
var/list/extra_titles = list(
"Gumshoe",
"Slutective",
"Studective",
"Van Dorn Agent",
"Forensic Investigator",
"Cinder Dick",
Expand All @@ -311,7 +320,8 @@
"Probation Officer",
"Guardsman",
"Police Officer",
"Slutcurity Officer"
"Slutcurity Officer",
"Studcurity Officer"
)
var/list/rem_titles = list(
"Peacekeeper"
Expand Down Expand Up @@ -370,7 +380,8 @@
"Maximum Security Prisoner",
"Supermax Prisoner",
"Protective Custody Prisoner",
"Prison Slut"
"Prison Slut",
"Prison Stud"
)
LAZYADD(alt_titles, extra_titles)
. = ..()
2 changes: 1 addition & 1 deletion modular_splurt/code/modules/jobs/job_types/blueshield.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
exp_type = EXP_TYPE_COMMAND
considered_combat_role = TRUE //Brigger then shit yes it is
exp_type_department = EXP_TYPE_COMMAND
alt_titles = list("Command Security", "Command Guard", "Command Bodyguard", "Blueguard", "Blueshit")
alt_titles = list("Command Security", "Command Guard", "Command Bodyguard", "Blueguard", "Blueshit", "Blueslut", "Bluestud")
//SPLURT CHANGES (Tells the blueshield they are command, and just a bodyguard, not security)
custom_spawn_text = "<font color='red'><b>You are a member of command, meant to act as a bodyguard for all Heads of Staff. However, you are not a member of security nor a Head of Staff yourself - avoid acting as either.</b></font>"
outfit = /datum/outfit/job/blueshield
Expand Down
2 changes: 1 addition & 1 deletion modular_splurt/code/modules/jobs/job_types/bridgeofficer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
minimal_access = list(ACCESS_HEADS, ACCESS_MAINT_TUNNELS, ACCESS_BRIDGE_OFFICER, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH)
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_CIV
alt_titles = list("Command Secretary", "Command Officer", "Bridge Secretary", "Ensign", "Bridge Bitch", "Bridge Advisor", "Bridge Intern")
alt_titles = list("Command Secretary", "Command Officer", "Bridge Secretary", "Ensign", "Bridge Bitch", "Bridge Stud", "Bridge Pet", "Bridge Advisor", "Bridge Intern")
display_order = JOB_DISPLAY_ORDER_BO
blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/prosopagnosia, /datum/quirk/insanity)
threat = 1
Expand Down