cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-05 23:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes human lore (#6800)

Browse Source 
Allows Idris and Hephaestus QMs
    Allows Zeng-Hu roboticists and xenobiologists (as was always intended, but never made it into the final PR)
    Allows Idris detectives and Necropolis forensic technicians
    Adds bloat.
This commit is contained in:
VTCobaltblood
2019-08-03 20:04:31 +03:00
committed by Erki
parent 5e1f7de096
commit a517a678c4
6 changed files with 120 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/jobs/faction/eridani.dm
View File

@@ -17,8 +17,8 @@
you cannot abide. That being said you're here to make a profit and stuffing
someone in a cell is a waste of human resources - think of the money lost in
time! Abhorrent! The best thing to do is fine perpetrators and set them back
to work. Remember your fine quota still applies, you don't want to miss out on
your bonus because you didn't hit target after all, it is a substantial bonus.</li>
to work. Remember, your fine quota still applies, you don't want to miss out on
your bonus because you didn't hit target. After all, it is a substantial bonus.</li>
</ul></p>"}
title_suffix = "EPMC"
@@ -43,7 +43,9 @@
"Security Officer" = /datum/outfit/job/officer/eridani,
"Warden" = /datum/outfit/job/warden/eridani,
"Forensic Technician" = /datum/outfit/job/forensics/eridani,
"Crime Scene Investigator" = /datum/outfit/job/forensics/eridani,
"Paramedic" = /datum/outfit/job/paramedic/eridani,
"Emergency Medical Technician" = /datum/outfit/job/paramedic/eridani,
"Corporate Liaison" = /datum/outfit/job/representative/eridani
)

16
code/game/jobs/faction/hephaestus.dm
View File

@@ -35,6 +35,7 @@
/datum/job/roboticist,
/datum/job/mining,
/datum/job/cargo_tech,
/datum/job/qm,
/datum/job/representative
)
@@ -43,15 +44,23 @@
/datum/species/skrell,
/datum/species/machine,
/datum/species/unathi,
/datum/species/bug
/datum/species/bug,
/datum/species/tajaran
)
titles_to_loadout = list(
"Station Engineer" = /datum/outfit/job/engineer/hephaestus,
"Maintenance Technician" = /datum/outfit/job/engineer/hephaestus,
"Engine Technician" = /datum/outfit/job/engineer/hephaestus,
"Electrician" = /datum/outfit/job/engineer/hephaestus,
"Atmospherics Technician" = /datum/outfit/job/atmos/hephaestus,
"Scientist" = /datum/outfit/job/scientist/hephaestus,
"Phoron Researcher" = /datum/outfit/job/scientist/hephaestus,
"Xenoarcheologist" = /datum/outfit/job/scientist/hephaestus,
"Anomalist" = /datum/outfit/job/scientist/hephaestus,
"Roboticist" = /datum/outfit/job/roboticist/hephaestus,
"Shaft Miner" = /datum/outfit/job/mining/hephaestus,
"Quartermaster" = /datum/outfit/job/qm/hephaestus,
"Cargo Technician" = /datum/outfit/job/cargo_tech/hephaestus,
"Corporate Liaison" = /datum/outfit/job/representative/hephaestus
)
@@ -81,6 +90,11 @@
uniform = /obj/item/clothing/under/rank/hephaestus
id = /obj/item/weapon/card/id/hephaestus
/datum/outfit/job/qm/hephaestus
name = "Quartermaster - Hephaestus"
uniform = /obj/item/clothing/under/rank/hephaestus
id = /obj/item/weapon/card/id/hephaestus
/datum/outfit/job/cargo_tech/hephaestus
name = "Cargo Technician - Hephaestus"
uniform = /obj/item/clothing/under/rank/hephaestus

17
code/game/jobs/faction/idris.dm
View File

@@ -33,10 +33,12 @@
allowed_role_types = list(
/datum/job/officer,
/datum/job/detective,
/datum/job/bartender,
/datum/job/chef,
/datum/job/hydro,
/datum/job/cargo_tech,
/datum/job/qm,
/datum/job/representative
)
@@ -51,8 +53,12 @@
"Security Officer" = /datum/outfit/job/officer/idris,
"Bartender" = /datum/outfit/job/bartender/idris,
"Chef" = /datum/outfit/job/chef/idris,
"Cook" = /datum/outfit/job/chef/idris,
"Detective" = /datum/outfit/job/chef/idris,
"Gardener" = /datum/outfit/job/hydro/idris,
"Hydroponicist" = /datum/outfit/job/hydro/idris,
"Cargo Technician" = /datum/outfit/job/cargo_tech/idris,
"Quartermaster" = /datum/outfit/job/qm/idris,
"Corporate Liaison" = /datum/outfit/job/representative/idris
)
@@ -61,6 +67,11 @@
uniform = /obj/item/clothing/under/rank/security/idris
id = /obj/item/weapon/card/id/idris/sec
/datum/outfit/job/detective/idris
name = "Detective - Idris"
uniform = /obj/item/clothing/under/rank/security/idris
id = /obj/item/weapon/card/id/idris/sec
/datum/outfit/job/bartender/idris
name = "Bartender - Idris"
uniform = /obj/item/clothing/under/rank/idris
@@ -81,6 +92,12 @@
uniform = /obj/item/clothing/under/rank/idris
id = /obj/item/weapon/card/id/idris
/datum/outfit/job/qm/idris
name = "Quartermaster - Idris"
uniform = /obj/item/clothing/under/rank/idris
id = /obj/item/weapon/card/id/idris
/datum/outfit/job/representative/idris
name = "Corporate Liaison - Idris"
uniform = /obj/item/clothing/under/rank/idris

20
code/game/jobs/faction/necropolis.dm
View File

@@ -24,7 +24,7 @@
and you think you might know how.</li>
<li><b>Personal Security Professional</b>: Excellent customer service and client
care is why Necropolis wins security contracts and you know this. A cut above
the rest you are clear, calm, concise and polite when working. As a security
the rest, you are clear, calm, concise and polite when working. As a security
force you were voted the top firm to employ and as such, NT ISD should really
be referring to your better judgement with security issues as far as you're
concerned. All crew are your customers and as such deserve a top notch customer
@@ -34,6 +34,7 @@
allowed_role_types = list(
/datum/job/officer,
/datum/job/forensics,
/datum/job/warden,
/datum/job/doctor,
/datum/job/pharmacist,
@@ -53,10 +54,20 @@
"Security Officer" = /datum/outfit/job/officer/necropolis,
"Warden" = /datum/outfit/job/warden/necropolis,
"Medical Doctor" = /datum/outfit/job/doctor/necropolis,
"Surgeon" = /datum/outfit/job/doctor/necropolis,
"Emergency Phyisician" = /datum/outfit/job/doctor/necropolis,
"Nurse" = /datum/outfit/job/doctor/necropolis,
"Pharmacist" = /datum/outfit/job/pharmacist/necropolis,
"Medical Doctor" = /datum/outfit/job/doctor/necropolis,
"Biochemist" = /datum/outfit/job/pharmacist/necropolis,
"Scientist" = /datum/outfit/job/scientist/necropolis,
"Phoron Researcher" = /datum/outfit/job/scientist/necropolis,
"Xenoarcheologist" = /datum/outfit/job/scientist/necropolis,
"Anomalist" = /datum/outfit/job/scientist/necropolis,
"Forensics Technician" = /datum/outfit/job/forensics/necropolis,
"Crime Scene Investigator" = /datum/outfit/job/forensics/necropolis,
"Roboticist" = /datum/outfit/job/roboticist/necropolis,
"Biomechanical Engineer" = /datum/outfit/job/roboticist/necropolis,
"Mechatronic Engineer" = /datum/outfit/job/roboticist/necropolis,
"Corporate Liaison" = /datum/outfit/job/representative/necropolis
)
@@ -65,6 +76,11 @@
uniform = /obj/item/clothing/under/rank/security/necropolis
id = /obj/item/weapon/card/id/necropolis/sec
/datum/outfit/job/forensics/necropolis
name = "Forensics Technician - Necropolis"
uniform = /obj/item/clothing/under/rank/security/necropolis
id = /obj/item/weapon/card/id/necropolis/sec
/datum/outfit/job/warden/necropolis
name = "Warden - Necropolis"
uniform = /obj/item/clothing/under/rank/security/necropolis

23
code/game/jobs/faction/zeng_hu.dm
View File

@@ -38,6 +38,8 @@
/datum/job/pharmacist,
/datum/job/psychiatrist,
/datum/job/paramedic,
/datum/job/roboticist,
/datum/job/xenobiologist,
/datum/job/representative
)
@@ -50,9 +52,20 @@
titles_to_loadout = list(
"Medical Doctor" = /datum/outfit/job/doctor/zeng_hu,
"Surgeon" = /datum/outfit/job/doctor/zeng_hu,
"Emergency Phyisician" = /datum/outfit/job/doctor/zeng_hu,
"Nurse" = /datum/outfit/job/doctor/zeng_hu,
"Pharmacist" = /datum/outfit/job/pharmacist/zeng_hu,
"Biochemist" = /datum/outfit/job/pharmacist/zeng_hu,
"Psychiatrist" = /datum/outfit/job/psychiatrist/zeng_hu,
"Psychologist" = /datum/outfit/job/psychiatrist/zeng_hu,
"Paramedic" = /datum/outfit/job/paramedic/zeng_hu,
"Emergency Medical Technician" = /datum/outfit/job/paramedic/zeng_hu,
"Roboticist" = /datum/outfit/job/roboticist/zeng_hu,
"Biomechanical Engineer" = /datum/outfit/job/roboticist/zeng_hu,
"Mechatronic Engineer" = /datum/outfit/job/roboticist/zeng_hu,
"Xenobiologist" = /datum/outfit/job/xenobiologist/zeng_hu,
"Xenobotanist" = /datum/outfit/job/xenobiologist/zeng_hu,
"Corporate Liaison" = /datum/outfit/job/representative/zeng_hu
)
@@ -61,6 +74,11 @@
uniform = /obj/item/clothing/under/rank/zeng
id = /obj/item/weapon/card/id/zeng_hu
/datum/outfit/job/roboticist/zeng_hu
name = "Roboticist - Zeng-Hu"
uniform = /obj/item/clothing/under/rank/zeng
id = /obj/item/weapon/card/id/zeng_hu
/datum/outfit/job/pharmacist/zeng_hu
name = "Pharmacist - Zeng-Hu"
uniform = /obj/item/clothing/under/rank/zeng
@@ -81,6 +99,11 @@
uniform = /obj/item/clothing/under/rank/zeng
id = /obj/item/weapon/card/id/zeng_hu
/datum/outfit/job/xenobiologist/zeng_hu
name = "Xenobiologist - Zeng-Hu"
uniform = /obj/item/clothing/under/rank/zeng
id = /obj/item/weapon/card/id/zeng_hu
/datum/outfit/job/representative/zeng_hu
name = "Corporate Liaison - Zeng-Hu"
uniform = /obj/item/clothing/under/rank/zeng

43
html/changelogs/VTCobaltblood - fixes_human_lore.yml Normal file
View File

@@ -0,0 +1,43 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: VTCobaltblood
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "Tajara are now allowed to be Hephaestus contractors."
- tweak: "Zeng-Hu contractors are now allowed to be Roboticists and Xenobiologists. Idris and Hephaestus contractors are now allowed to be Quartermasters. Idris contractors are allowed to be Detectives, and Necropolis ones can be Forensic Technicians."
- bugfix: "Contractor alt-titles now properly spawn in uniforms."