diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm index 5d13720da2..923c17277f 100644 --- a/code/modules/jobs/job_types/bartender.dm +++ b/code/modules/jobs/job_types/bartender.dm @@ -25,6 +25,6 @@ ears = /obj/item/radio/headset/headset_srv uniform = /obj/item/clothing/under/rank/bartender suit = /obj/item/clothing/suit/armor/vest - backpack_contents = list(/obj/item/storage/box/beanbag=1) + backpack_contents = list(/obj/item/storage/box/beanbag=1,/obj/item/book/granter/action/drink_fling=1)) shoes = /obj/item/clothing/shoes/laceup diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm index d73937a604..d8b88ae871 100644 --- a/code/modules/jobs/job_types/clown.dm +++ b/code/modules/jobs/job_types/clown.dm @@ -55,3 +55,4 @@ H.fully_replace_character_name(H.real_name, pick(GLOB.clown_names)) //rename the mob AFTER they're equipped so their ID gets updated properly. H.dna.add_mutation(CLOWNMUT) + H.dna.add_mutation(SMILE) diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm index 7f02b6721f..35fa8483d5 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -11,7 +11,7 @@ outfit = /datum/outfit/job/curator - access = list(ACCESS_LIBRARY, ACCESS_CONSTRUCTION, ACCESS_MINING_STATION) + access = list(ACCESS_LIBRARY) minimal_access = list(ACCESS_LIBRARY, ACCESS_CONSTRUCTION, ACCESS_MINING_STATION) display_order = JOB_DISPLAY_ORDER_CURATOR @@ -29,9 +29,9 @@ l_pocket = /obj/item/laser_pointer accessory = /obj/item/clothing/accessory/pocketprotector/full backpack_contents = list( + /obj/item/melee/curator_whip = 1, /obj/item/soapstone = 1, - /obj/item/barcodescanner = 1, - /obj/item/melee/curator_whip = 1 + /obj/item/barcodescanner = 1 ) /datum/outfit/job/curator/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index c1b0c643c6..ef16d8e53f 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -8,6 +8,8 @@ spawn_positions = 3 supervisors = "the quartermaster" selection_color = "#ca8f55" + custom_spawn_text = "Remember, you are a miner, not a hunter. Hunting monsters is not a requirement of your job, the only requirement of your job is to provide materials for the station. Don't be afraid to run away if you're inexperienced with fighting the mining area's locals." + outfit = /datum/outfit/job/miner @@ -17,7 +19,7 @@ display_order = JOB_DISPLAY_ORDER_SHAFT_MINER /datum/outfit/job/miner - name = "Shaft Miner" + name = "Shaft Miner (Lavaland)" jobtype = /datum/job/mining belt = /obj/item/pda/shaftminer @@ -41,8 +43,13 @@ chameleon_extras = /obj/item/gun/energy/kinetic_accelerator +/datum/outfit/job/miner/asteroid + name = "Shaft Miner (Asteroid)" + uniform = /obj/item/clothing/under/rank/miner + shoes = /obj/item/clothing/shoes/workboots + /datum/outfit/job/miner/equipped - name = "Shaft Miner (Equipment)" + name = "Shaft Miner (Lavaland + Equipment)" suit = /obj/item/clothing/suit/hooded/explorer/standard mask = /obj/item/clothing/mask/gas/explorer glasses = /obj/item/clothing/glasses/meson @@ -68,4 +75,3 @@ name = "Shaft Miner (Equipment + Hardsuit)" suit = /obj/item/clothing/suit/space/hardsuit/mining mask = /obj/item/clothing/mask/breath -