Skip to content

Commit

Permalink
Expanded fishing content 🎣 (#13460)
Browse files Browse the repository at this point in the history
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
  • Loading branch information
Gannets and Zonespace27 committed Jun 6, 2023
1 parent d618fa4 commit 08936fb
Show file tree
Hide file tree
Showing 20 changed files with 1,136 additions and 40 deletions.
17 changes: 17 additions & 0 deletions code/datums/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1659,6 +1659,23 @@ ABSTRACT_TYPE(/datum/job/civilian)

M.bioHolder.AddEffect("bee", magical=1) //They're one with the bees!


/datum/job/special/random/angler
name = "Angler"
wages = PAY_TRADESMAN
slot_jump = list(/obj/item/clothing/under/rank/angler)
slot_head = list(/obj/item/clothing/head/black)
slot_foot = list(/obj/item/clothing/shoes/galoshes/waders)
slot_glov = list(/obj/item/clothing/gloves/black)
slot_poc2 = list(/obj/item/device/pda2/botanist)
slot_ears = list(/obj/item/device/radio/headset/civilian)
items_in_backpack = list(/obj/item/fishing_rod/basic)

New()
..()
src.access = get_access("Rancher")
return

/datum/job/special/random/souschef
name = "Sous-Chef"
wages = PAY_UNTRAINED
Expand Down
2 changes: 1 addition & 1 deletion code/lists/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ var/list/engineering_jobs = list("Chief Engineer", "Engineer", "Miner", "Quarter
var/list/medical_jobs = list("Medical Director", "Medical Doctor", "Roboticist", "Geneticist")
var/list/science_jobs = list("Research Director", "Scientist")
var/list/medsci_jobs = medical_jobs + science_jobs
var/list/service_jobs = list("Head of Personnel", "Bartender", "Chef", "Botanist", "Rancher", "Clown", "Chaplain", "Janitor")
var/list/service_jobs = list("Head of Personnel", "Bartender", "Chef", "Botanist", "Rancher", "Angler", "Clown", "Chaplain", "Janitor")

var/list/command_gimmicks = list("Head of Mining", "Nanotrasen Security Consultant" /* NTSC isn't a gimmick role, but for the sake of sorting, it practically is*/)
var/list/security_gimmicks = list("Vice Officer", "Part-time Vice Officer", "Forensic Technician")
Expand Down
9 changes: 9 additions & 0 deletions code/modules/economy/commodity.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,15 @@
upperfluc = 25
lowerfluc = -25

/datum/commodity/fish
comname = "Fish"
comtype = /obj/item/fish
onmarket = 1
price = 50
baseprice = 50
upperfluc = 25
lowerfluc = -25

/datum/commodity/herbs
comname = "Medical Herbs"
comtype = /obj/item/plant/herb
Expand Down
12 changes: 12 additions & 0 deletions code/modules/economy/supply_packs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,18 @@ ABSTRACT_TYPE(/datum/supply_packs)
carton.ourEgg.blog = "ordered by [key_name(creator)]|"
return beez

/datum/supply_packs/fishing
name = "Angling Starter Kit"
desc = "A full complement of fishing tools for the amateur angler."
category = "Civilian Department"
contains = list(/obj/item/fishing_rod/basic,
/obj/submachine/fishing_upload_terminal/portable,
/obj/submachine/weapon_vendor/fishing/portable,
/obj/fishing_pool/portable)
cost = 500
containertype = /obj/storage/crate
containername = "Angling Starter Kit"

/datum/supply_packs/chemical
name = "Chemistry Resupply Crate"
desc = "x6 Reagent Bottles, x1 Beaker Box, x1 Mechanical Dropper, x1 Spectroscopic Goggles, x1 Reagent Scanner"
Expand Down

0 comments on commit 08936fb

Please sign in to comment.