mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-10 06:43:11 +01:00
Ghom
ba4fa8fe07
## About The Pull Request A foreword, I had to refactor a few bits of shitcode my past self added first. For context, the "gone fishing" and "actively fishing" traits only had one source, which is the fishing challenge itself, ad there was no way to access the challenge from outside its code, except for a few weakrefs which were being used as sources for the aforementioned traits (the shitcode in a nutshell). There were also a few signals that I didn't like because they were being sent to the harder-to-access challenge datum rather than the user. So I scrapped the traits for a couple signals to send to the user, then added a global list as a mean to easily access the challenge datum, and lastly changed the code to accomodate the titled feature (and allow the challenge to recalculate its difficulty DURING the minigame phase) Moving on to the actual feature: I've added a component that can be added to objects on which mobs can be buckled to or items. When equipped in the right slots or buckled to, the object will adjust the difficulty of current and future fishing challenges by a certain amount (more often than not positive, but there're many exceptions) as long as the object isn't equipped or the user is unbuckled. I've been having some fun adding component to a ton of clothes in the game as well as chairs. Way too many objects to enumerate, so I'll give you the general idea: - each carp-themed article provides a slight positive modifier (easier) - some (not all) doctor-related garbs provide a marginal positive modifier each (fish doctor jokes) - floortile camo clothes have positive modifiers - Tuxedo, laceups, gowns provide negative modifier (more difficult) - utility garbs such as bio/bomb/rad hoods and suits are quite bad. Riot armor too. - boxing gloves are very, very bad. Insulated gloves and haul gauntlets are also very bad, to a lesser degree. - **tackle** gloves are good. (pun intended) - wizard garbs are good, because wizards are good at casting. (also a pun) - magboots slightly bad. Space suits bad. - Blindfolds and welding protection are also bad. Gas masks marginally bad. - Pirate attire is nice to have. (I just vibed a little on this one) - plastic chairs are quite versatile because they can be carried around, but the mime chair is the best, followed by ratvarian chairs. - Fishing toolboxes, analyzers and the fish catalog are a plus, because they can be held. - And the fishing hat, obviously (not as great as you'd think) Some of these may be subject to change depending on what people say. ## Why It's Good For The Game A hundred lines of fishing challenge code made ever-so-slightly less awful, and a way to modify fishing diffculty beside skills and bait. ## Changelog 🆑 add: Your current clothes and what chair you sit on can now influence the difficulty of fishing minigames. Having a bare minimum of fishing skill will let you distinguish which objects can help and which won't, so keep an eye out. Holding fishing toolboxes, fish analyzers or fish catalogs can also help. /🆑
123 lines
4.3 KiB
Plaintext
123 lines
4.3 KiB
Plaintext
/obj/item/clothing/under/suit
|
|
icon = 'icons/obj/clothing/under/suits.dmi'
|
|
worn_icon = 'icons/mob/clothing/under/suits.dmi'
|
|
can_adjust = FALSE
|
|
female_sprite_flags = FEMALE_UNIFORM_NO_BREASTS
|
|
inhand_icon_state = null
|
|
|
|
/obj/item/clothing/under/suit/green
|
|
name = "green suit"
|
|
desc = "A green suit and yellow necktie. Baller."
|
|
icon = 'icons/obj/clothing/under/captain.dmi'
|
|
icon_state = "green_suit"
|
|
inhand_icon_state = "dg_suit"
|
|
worn_icon = 'icons/mob/clothing/under/captain.dmi'
|
|
|
|
/obj/item/clothing/under/suit/red //Also used by the Curator's suit, /obj/item/clothing/under/rank/civilian/curator
|
|
name = "red suit"
|
|
desc = "A red suit and blue tie. Somewhat formal."
|
|
icon_state = "red_suit"
|
|
inhand_icon_state = "r_suit"
|
|
|
|
/obj/item/clothing/under/suit/charcoal
|
|
name = "charcoal suit"
|
|
desc = "A charcoal suit and red tie. Very professional."
|
|
icon_state = "charcoal_suit"
|
|
|
|
/obj/item/clothing/under/suit/navy
|
|
name = "navy suit"
|
|
desc = "A navy suit and red tie, intended for the station's finest."
|
|
icon_state = "navy_suit"
|
|
|
|
/obj/item/clothing/under/suit/burgundy
|
|
name = "burgundy suit"
|
|
desc = "A burgundy suit and black tie. Somewhat formal."
|
|
icon_state = "burgundy_suit"
|
|
|
|
/obj/item/clothing/under/suit/checkered
|
|
name = "checkered suit"
|
|
desc = "That's a very nice suit you have there. Shame if something were to happen to it, eh?"
|
|
icon_state = "checkered_suit"
|
|
|
|
/obj/item/clothing/under/suit/beige
|
|
name = "beige suit"
|
|
desc = "An excellent light colored suit, experts in the field stress that it should not to be confused with the inferior tan suit."
|
|
icon_state = "beige_suit"
|
|
|
|
/obj/item/clothing/under/suit/black
|
|
name = "black two piece suit"
|
|
desc = "A black suit with charcoal pants and a red tie. Very formal."
|
|
icon_state = "black_suit"
|
|
|
|
/obj/item/clothing/under/suit/black/skirt
|
|
name = "black two piece suit"
|
|
desc = "A black suit with a charcoal skirt and a red tie. Very formal."
|
|
icon_state = "black_suit_skirt"
|
|
body_parts_covered = CHEST|GROIN|ARMS
|
|
dying_key = DYE_REGISTRY_JUMPSKIRT
|
|
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
|
|
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
|
|
|
|
/obj/item/clothing/under/suit/white
|
|
name = "white suit"
|
|
desc = "A white suit and jacket with a blue shirt. You wanna play rough? OKAY!"
|
|
icon_state = "white_suit"
|
|
inhand_icon_state = "white_suit"
|
|
|
|
/obj/item/clothing/under/suit/white/skirt
|
|
name = "white suitskirt"
|
|
desc = "A white suitskirt, suitable for an excellent host."
|
|
icon_state = "white_suit_skirt"
|
|
body_parts_covered = CHEST|GROIN|ARMS
|
|
dying_key = DYE_REGISTRY_JUMPSKIRT
|
|
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
|
|
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
|
|
|
|
/obj/item/clothing/under/suit/tan
|
|
name = "tan suit"
|
|
desc = "A tan suit. Smart, but casual."
|
|
icon_state = "tan_suit"
|
|
inhand_icon_state = "tan_suit"
|
|
|
|
/obj/item/clothing/under/suit/waiter
|
|
name = "waiter's outfit"
|
|
desc = "It's a very smart uniform with a special pocket for tip."
|
|
icon_state = "waiter"
|
|
inhand_icon_state = "waiter"
|
|
|
|
/obj/item/clothing/under/suit/black_really
|
|
name = "executive suit"
|
|
desc = "A formal black suit, intended for the station's finest."
|
|
icon_state = "really_black_suit"
|
|
inhand_icon_state = null
|
|
|
|
/obj/item/clothing/under/suit/black_really/skirt
|
|
name = "executive suitskirt"
|
|
desc = "A formal black suitskirt, intended for the station's finest."
|
|
icon_state = "really_black_suit_skirt"
|
|
inhand_icon_state = null
|
|
body_parts_covered = CHEST|GROIN|ARMS
|
|
dying_key = DYE_REGISTRY_JUMPSKIRT
|
|
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS
|
|
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
|
|
|
|
/obj/item/clothing/under/suit/tuxedo
|
|
name = "tuxedo"
|
|
desc = "A formal black tuxedo. It exudes classiness."
|
|
icon_state = "tuxedo"
|
|
inhand_icon_state = null
|
|
|
|
/obj/item/clothing/under/suit/tuxedo/Initialize(mapload)
|
|
. = ..()
|
|
AddComponent(/datum/component/adjust_fishing_difficulty, 4) //You aren't going to fish with this are you?
|
|
|
|
/obj/item/clothing/under/suit/carpskin
|
|
name = "carpskin suit"
|
|
desc = "An luxurious suit made with only the finest scales, perfect for conducting dodgy business deals."
|
|
icon_state = "carpskin_suit"
|
|
inhand_icon_state = null
|
|
|
|
/obj/item/clothing/under/suit/carpskin/Initialize(mapload)
|
|
. = ..()
|
|
AddComponent(/datum/component/adjust_fishing_difficulty, -2)
|