mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-10 07:41:16 +01:00
Bloop
cf14dcfc1a
## About The Pull Request `adjust_fishing_difficulty` is a good one to make into a bespoke element since a number of the same clothing item are created in the wardrobe system. climb_walkable is also good due to how prevalent it is, and it is a bit of a two for one since it also removes the need for the `/component/connect_loc_behalf` Also stops adding the on_climbable trait to literally everything in the turf, it now only applies it to atoms with density. So no more pipes and stuff getting trait lists created for no reason. <details><summary> Tested + things still work as before </summary> <img width="422" height="122" alt="image" src="https://github.com/user-attachments/assets/b23696f5-cd16-4150-aeb3-14ea6bd256fc" /> </details> ## Why It's Good For The Game Lessens overhead, fixes a bug as well. ## Changelog 🆑 fix: fixes a pushed crate not removing on_climbable trait properly off the mob standing atop it /🆑
54 lines
1.8 KiB
Plaintext
54 lines
1.8 KiB
Plaintext
|
|
/obj/item/storage/toolbox/fishing
|
|
name = "fishing toolbox"
|
|
desc = "Contains everything you need for your fishing trip."
|
|
icon_state = "teal"
|
|
inhand_icon_state = "toolbox_teal"
|
|
material_flags = NONE
|
|
custom_price = PAYCHECK_CREW * 3
|
|
storage_type = /datum/storage/toolbox/fishing
|
|
|
|
///How much holding this affects fishing difficulty
|
|
var/fishing_modifier = -4
|
|
|
|
/obj/item/storage/toolbox/fishing/Initialize(mapload)
|
|
. = ..()
|
|
AddElement(/datum/element/adjust_fishing_difficulty, fishing_modifier, ITEM_SLOT_HANDS)
|
|
|
|
/obj/item/storage/toolbox/fishing/PopulateContents()
|
|
new /obj/item/bait_can/worm(src)
|
|
new /obj/item/fishing_rod/unslotted(src)
|
|
new /obj/item/fishing_hook(src)
|
|
new /obj/item/fishing_line(src)
|
|
new /obj/item/paper/paperslip/fishing_tip(src)
|
|
|
|
/obj/item/storage/toolbox/fishing/small
|
|
name = "compact fishing toolbox"
|
|
desc = "Contains everything you need for your fishing trip. Except for the bait."
|
|
w_class = WEIGHT_CLASS_NORMAL
|
|
force = 5
|
|
throwforce = 5
|
|
storage_type = /datum/storage/toolbox/fishing/small
|
|
|
|
/obj/item/storage/toolbox/fishing/small/PopulateContents()
|
|
new /obj/item/fishing_rod/unslotted(src)
|
|
new /obj/item/fishing_hook(src)
|
|
new /obj/item/fishing_line(src)
|
|
new /obj/item/paper/paperslip/fishing_tip(src)
|
|
|
|
/obj/item/storage/toolbox/fishing/master
|
|
name = "super fishing toolbox"
|
|
desc = "Contains (almost) EVERYTHING you need for your fishing trip."
|
|
icon_state = "gold"
|
|
inhand_icon_state = "toolbox_gold"
|
|
fishing_modifier = -10
|
|
|
|
/obj/item/storage/toolbox/fishing/master/PopulateContents()
|
|
new /obj/item/fishing_rod/telescopic/master(src)
|
|
new /obj/item/storage/box/fishing_hooks/master(src)
|
|
new /obj/item/storage/box/fishing_lines/master(src)
|
|
new /obj/item/bait_can/super_baits(src)
|
|
new /obj/item/reagent_containers/cup/fish_feed(src)
|
|
new /obj/item/aquarium_kit(src)
|
|
new /obj/item/fish_analyzer(src)
|