cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Moves heirloom lists to job/species datums (#3773)

Browse Source 
* Moves heirloom lists to job/species datums

* Revert "Merge branch 'master' into upstream-merge-57329"

This reverts commit dde12e8a1bb916f4e152925c181d006210402423, reversing
changes made to 1994fc1ee357824519f1b3071e774f6700e99c62.

* Revert "Revert "Merge branch 'master' into upstream-merge-57329""

This reverts commit 3d7c92afc1b92ab4d70c456f06f24d3213324338.

* a

* a

* Update chief_medical_officer.dm

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-03-03 18:59:14 +00:00
committed by GitHub
co-authored by MrMelbert Gandalf2k15
parent bdd8270c04
commit 68b06637e1
41 changed files with 104 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/jobs/job_types/_job.dm
+3
View File
@@ -70,6 +70,9 @@
/// Should this job be allowed to be picked for the bureaucratic error event?
var/allow_bureaucratic_error = TRUE
/// List of family heirlooms this job can get with the family heirloom quirk. List of types.
var/list/family_heirlooms
/datum/job/New()
. = ..()
var/list/jobs_changes = get_map_changes()
code/modules/jobs/job_types/assistant.dm
+2
View File
@@ -18,6 +18,8 @@ Assistant
paycheck_department = ACCOUNT_CIV
display_order = JOB_DISPLAY_ORDER_ASSISTANT
family_heirlooms = list(/obj/item/storage/toolbox/mechanical/old/heirloom, /obj/item/clothing/gloves/cut/heirloom)
/datum/outfit/job/assistant
name = "Assistant"
jobtype = /datum/job/assistant
code/modules/jobs/job_types/atmospheric_technician.dm
+2
View File
@@ -20,6 +20,8 @@
bounty_types = CIV_JOB_ENG
departments = DEPARTMENT_ENGINEERING
family_heirlooms = list(/obj/item/lighter, /obj/item/lighter/greyscale, /obj/item/storage/box/matches)
/datum/outfit/job/atmos
name = "Atmospheric Technician"
jobtype = /datum/job/atmospheric_technician
code/modules/jobs/job_types/bartender.dm
+2
View File
@@ -15,6 +15,8 @@
bounty_types = CIV_JOB_DRINK
departments = DEPARTMENT_SERVICE
family_heirlooms = list(/obj/item/reagent_containers/glass/rag, /obj/item/clothing/head/that, /obj/item/reagent_containers/food/drinks/shaker)
/datum/outfit/job/bartender
name = "Bartender"
jobtype = /datum/job/bartender
code/modules/jobs/job_types/botanist.dm
+2
View File
@@ -15,6 +15,8 @@
bounty_types = CIV_JOB_GROW
departments = DEPARTMENT_SERVICE
family_heirlooms = list(/obj/item/cultivator, /obj/item/reagent_containers/glass/bucket, /obj/item/toy/plush/beeplushie)
/datum/outfit/job/botanist
name = "Botanist"
jobtype = /datum/job/botanist
code/modules/jobs/job_types/captain.dm
Regular → Executable
+2
View File
@@ -23,6 +23,8 @@
display_order = JOB_DISPLAY_ORDER_CAPTAIN
departments = DEPARTMENT_COMMAND
family_heirlooms = list(/obj/item/reagent_containers/food/drinks/flask/gold)
/datum/job/captain/announce(mob/living/carbon/human/H, announce_captaincy = TRUE)
..()
if(announce_captaincy)
code/modules/jobs/job_types/cargo_technician.dm
+2
View File
@@ -17,6 +17,8 @@
bounty_types = CIV_JOB_RANDOM
departments = DEPARTMENT_CARGO
family_heirlooms = list(/obj/item/clipboard)
/datum/outfit/job/cargo_tech
name = "Cargo Technician"
jobtype = /datum/job/cargo_technician
code/modules/jobs/job_types/chaplain.dm
+2
View File
@@ -15,6 +15,8 @@
display_order = JOB_DISPLAY_ORDER_CHAPLAIN
departments = DEPARTMENT_SERVICE
family_heirlooms = list(/obj/item/toy/windup_toolbox, /obj/item/reagent_containers/food/drinks/bottle/holywater)
/datum/job/chaplain/after_spawn(mob/living/H, mob/M)
. = ..()
code/modules/jobs/job_types/chemist.dm
+2 -1
View File
@@ -20,6 +20,8 @@
bounty_types = CIV_JOB_CHEM
departments = DEPARTMENT_MEDICAL
family_heirlooms = list(/obj/item/book/manual/wiki/chemistry, /obj/item/ph_booklet)
/datum/outfit/job/chemist
name = "Chemist"
jobtype = /datum/job/chemist
@@ -40,4 +42,3 @@
chameleon_extras = /obj/item/gun/syringe
id_trim = /datum/id_trim/job/chemist
code/modules/jobs/job_types/chief_engineer.dm
+2
View File
@@ -25,6 +25,8 @@
display_order = JOB_DISPLAY_ORDER_CHIEF_ENGINEER
bounty_types = CIV_JOB_ENG
family_heirlooms = list(/obj/item/clothing/head/hardhat/white, /obj/item/screwdriver, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters)
/datum/job/chief_engineer/announce(mob/living/carbon/human/H, announce_captaincy = FALSE)
..()
if(announce_captaincy)
code/modules/jobs/job_types/chief_medical_officer.dm
+2 -1
View File
@@ -25,6 +25,8 @@
display_order = JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER
bounty_types = CIV_JOB_MED
family_heirlooms = list(/obj/item/storage/firstaid/ancient/heirloom)
/datum/job/chief_medical_officer/announce(mob/living/carbon/human/H, announce_captaincy = FALSE)
..()
if(announce_captaincy)
@@ -63,4 +65,3 @@
suit = /obj/item/clothing/suit/space/hardsuit/medical
suit_store = /obj/item/tank/internals/oxygen
r_pocket = /obj/item/flashlight/pen/paramedic
code/modules/jobs/job_types/clown.dm
+1
View File
@@ -17,6 +17,7 @@
display_order = JOB_DISPLAY_ORDER_CLOWN
departments = DEPARTMENT_SERVICE
family_heirlooms = list(/obj/item/bikehorn/golden)
/datum/job/clown/after_spawn(mob/living/carbon/human/H, mob/M)
. = ..()
code/modules/jobs/job_types/cook.dm
+2
View File
@@ -19,6 +19,8 @@
bounty_types = CIV_JOB_CHEF
departments = DEPARTMENT_SERVICE
family_heirlooms = list(/obj/item/reagent_containers/food/condiment/saltshaker, /obj/item/kitchen/rollingpin, /obj/item/clothing/head/chefhat)
/datum/outfit/job/cook
name = "Cook"
jobtype = /datum/job/cook
code/modules/jobs/job_types/curator.dm
+2
View File
@@ -15,6 +15,8 @@
display_order = JOB_DISPLAY_ORDER_CURATOR
departments = DEPARTMENT_SERVICE
family_heirlooms = list(/obj/item/pen/fountain, /obj/item/storage/pill_bottle/dice)
/datum/outfit/job/curator
name = "Curator"
jobtype = /datum/job/curator
code/modules/jobs/job_types/detective.dm
+2 -1
View File
@@ -22,6 +22,8 @@
display_order = JOB_DISPLAY_ORDER_DETECTIVE
family_heirlooms = list(/obj/item/reagent_containers/food/drinks/bottle/whiskey)
/datum/outfit/job/detective
name = "Detective"
jobtype = /datum/job/detective
@@ -55,4 +57,3 @@
if(visualsOnly)
return
code/modules/jobs/job_types/geneticist.dm
+2
View File
@@ -18,6 +18,8 @@
display_order = JOB_DISPLAY_ORDER_GENETICIST
bounty_types = CIV_JOB_SCI
family_heirlooms = list(/obj/item/clothing/under/shorts/purple)
/datum/outfit/job/geneticist
name = "Geneticist"
jobtype = /datum/job/geneticist
code/modules/jobs/job_types/head_of_personnel.dm
+2 -3
View File
@@ -26,6 +26,8 @@
display_order = JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL
family_heirlooms = list(/obj/item/reagent_containers/food/drinks/trophy/silver_cup)
/datum/job/head_of_personnel/announce(mob/living/carbon/human/H, announce_captaincy = FALSE)
..()
if(announce_captaincy)
@@ -46,14 +48,11 @@
chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/hop)
id_trim = /datum/id_trim/job/head_of_personnel
/datum/outfit/job/hop/pre_equip(mob/living/carbon/human/H)
..()
if(locate(/datum/holiday/ianbirthday) in SSevents.holidays)
undershirt = /datum/sprite_accessory/undershirt/ian
/obj/item/paper/fluff/ids_for_dummies
name = "Memo: New IDs and You"
desc = "It looks like this was left by the last Head of Personnel to man this station. It explains some information about new IDs."
code/modules/jobs/job_types/head_of_security.dm
+2 -1
View File
@@ -26,6 +26,8 @@
display_order = JOB_DISPLAY_ORDER_HEAD_OF_SECURITY
bounty_types = CIV_JOB_SEC
family_heirlooms = list(/obj/item/book/manual/wiki/security_space_law)
/datum/job/head_of_security/announce(mob/living/carbon/human/H, announce_captaincy = FALSE)
..()
if(announce_captaincy)
@@ -67,4 +69,3 @@
suit = /obj/item/clothing/suit/space/hardsuit/security/hos
suit_store = /obj/item/tank/internals/oxygen
backpack_contents = list(/obj/item/melee/baton/loaded=1)
code/modules/jobs/job_types/janitor.dm
+2
View File
@@ -15,6 +15,8 @@
display_order = JOB_DISPLAY_ORDER_JANITOR
departments = DEPARTMENT_SERVICE
family_heirlooms = list(/obj/item/mop, /obj/item/clothing/suit/caution, /obj/item/reagent_containers/glass/bucket, /obj/item/paper/fluff/stations/soap)
/datum/outfit/job/janitor
name = "Janitor"
jobtype = /datum/job/janitor
code/modules/jobs/job_types/lawyer.dm
+2
View File
@@ -19,6 +19,8 @@
display_order = JOB_DISPLAY_ORDER_LAWYER
departments = DEPARTMENT_SERVICE
family_heirlooms = list(/obj/item/gavelhammer, /obj/item/book/manual/wiki/security_space_law)
/datum/outfit/job/lawyer
name = "Lawyer"
jobtype = /datum/job/lawyer
code/modules/jobs/job_types/medical_doctor.dm
+2
View File
@@ -18,6 +18,8 @@
bounty_types = CIV_JOB_MED
departments = DEPARTMENT_MEDICAL
family_heirlooms = list(/obj/item/storage/firstaid/ancient/heirloom)
/datum/outfit/job/doctor
name = "Medical Doctor"
jobtype = /datum/job/doctor
code/modules/jobs/job_types/mime.dm
+2
View File
@@ -15,6 +15,8 @@
display_order = JOB_DISPLAY_ORDER_MIME
departments = DEPARTMENT_SERVICE
family_heirlooms = list(/obj/item/food/baguette)
/datum/job/mime/after_spawn(mob/living/carbon/human/H, mob/M)
H.apply_pref_name("mime", M.client)
code/modules/jobs/job_types/paramedic.dm
+2
View File
@@ -18,6 +18,8 @@
bounty_types = CIV_JOB_MED
departments = DEPARTMENT_MEDICAL
family_heirlooms = list(/obj/item/storage/firstaid/ancient/heirloom)
/datum/outfit/job/paramedic
name = "Paramedic"
jobtype = /datum/job/paramedic
code/modules/jobs/job_types/prisoner.dm
+2
View File
@@ -11,6 +11,8 @@
display_order = JOB_DISPLAY_ORDER_PRISONER
family_heirlooms = list(/obj/item/pen/blue)
/datum/outfit/job/prisoner
name = "Prisoner"
jobtype = /datum/job/prisoner
code/modules/jobs/job_types/psychologist.dm
+2
View File
@@ -17,6 +17,8 @@
display_order = JOB_DISPLAY_ORDER_PSYCHOLOGIST
departments = DEPARTMENT_SERVICE
family_heirlooms = list(/obj/item/storage/pill_bottle)
/datum/outfit/job/psychologist
name = "Psychologist"
jobtype = /datum/job/psychologist
code/modules/jobs/job_types/quartermaster.dm
+2
View File
@@ -26,6 +26,8 @@
if(announce_captaincy)
SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/minor_announce, "Due to extreme staffing shortages, newly promoted Acting Captain [H.real_name] on deck!"))
family_heirlooms = list(/obj/item/stamp, /obj/item/stamp/denied)
/datum/outfit/job/quartermaster
name = "Quartermaster"
jobtype = /datum/job/quartermaster
code/modules/jobs/job_types/research_director.dm
+2
View File
@@ -23,6 +23,8 @@
display_order = JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR
bounty_types = CIV_JOB_SCI
family_heirlooms = list(/obj/item/toy/plush/slimeplushie)
/datum/job/research_director/announce(mob/living/carbon/human/H, announce_captaincy = FALSE)
..()
if(announce_captaincy)
code/modules/jobs/job_types/roboticist.dm
+6
View File
@@ -18,6 +18,12 @@
display_order = JOB_DISPLAY_ORDER_ROBOTICIST
family_heirlooms = list(/obj/item/toy/plush/pkplush)
/datum/job/roboticist/New()
. = ..()
family_heirlooms += subtypesof(/obj/item/toy/prize)
/datum/outfit/job/roboticist
name = "Roboticist"
jobtype = /datum/job/roboticist
code/modules/jobs/job_types/scientist.dm
+2
View File
@@ -18,6 +18,8 @@
bounty_types = CIV_JOB_SCI
departments = DEPARTMENT_SCIENCE
family_heirlooms = list(/obj/item/toy/plush/slimeplushie)
/datum/outfit/job/scientist
name = "Scientist"
jobtype = /datum/job/scientist
code/modules/jobs/job_types/security_officer.dm
+2
View File
@@ -23,6 +23,8 @@
bounty_types = CIV_JOB_SEC
departments = DEPARTMENT_SECURITY
family_heirlooms = list(/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/head/beret/sec)
GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, SEC_DEPT_SCIENCE, SEC_DEPT_SUPPLY))
/datum/job/security_officer/after_spawn(mob/living/carbon/human/H, mob/M)
code/modules/jobs/job_types/shaft_miner.dm
+2
View File
@@ -16,6 +16,8 @@
bounty_types = CIV_JOB_MINE
departments = DEPARTMENT_CARGO
family_heirlooms = list(/obj/item/pickaxe/mini, /obj/item/shovel)
/datum/outfit/job/miner
name = "Shaft Miner"
jobtype = /datum/job/shaft_miner
code/modules/jobs/job_types/station_engineer.dm
+2
View File
@@ -20,6 +20,8 @@
bounty_types = CIV_JOB_ENG
departments = DEPARTMENT_ENGINEERING
family_heirlooms = list(/obj/item/clothing/head/hardhat, /obj/item/screwdriver, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters)
/datum/outfit/job/engineer
name = "Station Engineer"
jobtype = /datum/job/station_engineer
code/modules/jobs/job_types/virologist.dm
+2
View File
@@ -20,6 +20,8 @@
bounty_types = CIV_JOB_VIRO
departments = DEPARTMENT_MEDICAL
family_heirlooms = list(/obj/item/reagent_containers/syringe)
/datum/outfit/job/virologist
name = "Virologist"
jobtype = /datum/job/virologist
code/modules/jobs/job_types/warden.dm
+2
View File
@@ -23,6 +23,8 @@
bounty_types = CIV_JOB_SEC
departments = DEPARTMENT_SECURITY
family_heirlooms = list(/obj/item/book/manual/wiki/security_space_law)
/datum/outfit/job/warden
name = "Warden"
jobtype = /datum/job/warden
code/modules/mob/living/carbon/human/species.dm
+3
View File
@@ -190,6 +190,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
///For custom overrides for species ass images
var/icon/ass_image
/// List of family heirlooms this species can get with the family heirloom quirk. List of types.
var/list/family_heirlooms
///List of results you get from knife-butchering. null means you cant butcher it. Associated by resulting type - value of amount
var/list/knife_butcher_results
code/modules/mob/living/carbon/human/species_types/felinid.dm
+1
View File
@@ -14,6 +14,7 @@
var/original_felinid = TRUE //set to false for felinids created by mass-purrbation
payday_modifier = 0.75
ass_image = 'icons/ass/asscat.png'
family_heirlooms = list(/obj/item/toy/cattoy)
//SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular)
code/modules/mob/living/carbon/human/species_types/mothmen.dm
+1
View File
@@ -19,6 +19,7 @@
wings_icons = list("Megamoth", "Mothra")
has_innate_wings = TRUE
payday_modifier = 0.75
family_heirlooms = list(/obj/item/flashlight/lantern/heirloom_moth)
/datum/species/moth/regenerate_organs(mob/living/carbon/C,datum/species/old_species,replace_current=TRUE,list/excluded_zones)
. = ..()