Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fishin' and the killin' power of rock also trash is permanent #428

Merged
merged 13 commits into from
Sep 4, 2024
2 changes: 1 addition & 1 deletion code/controllers/subsystem/item_cleanup.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var/global/list/item_cleanup_list = list()
SUBSYSTEM_DEF(item_cleanup)
name = "Item Cleanup"
wait = 10 MINUTES //should be adjusted for WO
var/start_processing_time = 35 MINUTES //should be adjusted for WO
var/start_processing_time = INFINITY //should be adjusted for WO
var/percentage_of_garbage_to_delete = 0.5 //should be adjusted for WO
//We keep a separate, private list
//So we don't get instant deletions of items
Expand Down
19 changes: 19 additions & 0 deletions code/game/objects/prop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -291,3 +291,22 @@
/obj/item/prop/magazine/boots/n055
name = "Boots!: Issue No.55"
desc = "The only official USCM magazine, the headline reads 'TEN tips to keep your UD4 cockpit both safer and more relaxing.'"

/obj/item/prop/scrap
name = "scrap metal"
icon = 'icons/obj/items/fishing_atoms.dmi'
icon_state = "sheet-scrap"
item_state = ""
desc = "A rusty piece of scrap metal."
w_class = SIZE_MEDIUM

/obj/item/prop/rock
name = "rock"
icon = 'icons/obj/items/plush.dmi'
icon_state = "rock"
item_state = ""
force = 30
throwforce = 25
desc = "The most ancient of tools."
w_class = SIZE_TINY
hitsound = 'sound/weapons/genhit3.ogg'
2 changes: 2 additions & 0 deletions code/modules/fishing/bait/generic.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/obj/item/fish_bait
name = "fish bait"
icon = 'icons/obj/items/fishing_atoms.dmi'
icon_state = "other_meat"
desc = "A tasty piece of... meat? Whatever it is, fish love this."

var/common_mod = -10
Expand Down
17 changes: 9 additions & 8 deletions code/modules/fishing/datums/generic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,21 @@ GLOBAL_LIST_EMPTY(fishing_loot_tables)

/datum/fish_loot_table
var/list/common_fishable_atoms = list(
/obj/item/clothing/shoes/leather,
/obj/item/clothing/shoes/marine,
/obj/item/prop/scrap,
/obj/item/trash/crushed_cup,
/obj/item/trash/c_tube,
/obj/item/trash/cigbutt/bcigbutt,
/obj/item/trash/cigbutt/cigarbutt
)
var/list/uncommon_fishable_atoms = list(
/obj/item/cell/high,
/obj/item/device/multitool
/obj/item/reagent_container/food/snacks/fishable/squid/whorl,
/obj/item/reagent_container/food/snacks/fishable/crab
)
var/list/rare_fishable_atoms = list(
/obj/item/reagent_container/food/snacks/packaged_burrito
/obj/item/coin/silver
)
var/list/ultra_rare_fishable_atoms = list(
/obj/item/card/data/clown,
/obj/item/reagent_container/food/snacks/clownburger,
/obj/item/reagent_container/pill/ultrazine/unmarked
/obj/item/reagent_container/food/snacks/fishable/quadtopus
)

/datum/fish_loot_table/proc/return_caught_fish(common_weight, uncommon_weight, rare_weight, ultra_rare_weight)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/fishing/props/fishing_pole.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

/obj/structure/prop/fishing/pole_interactive
var/time_to_fish = 30 SECONDS
var/fishing_success = 'sound/items/bikehorn.ogg'//to-do get a sound effect(s)
var/fishing_success = 'sound/items/fulton.ogg'//to-do get a sound effect(s)
var/fishing_start = 'sound/items/fulton.ogg'
var/fishing_failure = 'sound/items/jetpack_beep.ogg'
var/fishing_event = 'sound/items/component_pickup.ogg'
Expand Down
Loading