cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-13 09:05:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '179a607a90ad7ec62bdaff4e6fe72af60ee56442' of https://github.com/tgstation/tgstation into upstream-24-10b

Browse Source
This commit is contained in:
Majkl-J
2024-10-23 23:27:16 -07:00
parent c90e3e69b9 179a607a90
commit e59d8ba64b
4642 changed files with 25352 additions and 14167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/processing/fishing.dm
+32 -4
View File
@@ -13,10 +13,38 @@ PROCESSING_SUBSYSTEM_DEF(fishing)
fish_properties = list()
for(var/fish_type in subtypesof(/obj/item/fish))
var/obj/item/fish/fish = new fish_type(null, FALSE)
fish_properties[fish_type] = list()
fish_properties[fish_type][FISH_PROPERTIES_FAV_BAIT] = fish.favorite_bait.Copy()
fish_properties[fish_type][FISH_PROPERTIES_BAD_BAIT] = fish.disliked_bait.Copy()
fish_properties[fish_type][FISH_PROPERTIES_TRAITS] = fish.fish_traits.Copy()
var/list/properties = list()
fish_properties[fish_type] = properties
properties[FISH_PROPERTIES_FAV_BAIT] = fish.favorite_bait.Copy()
properties[FISH_PROPERTIES_BAD_BAIT] = fish.disliked_bait.Copy()
properties[FISH_PROPERTIES_TRAITS] = fish.fish_traits.Copy()
var/list/evo_types = fish.evolution_types?.Copy()
properties[FISH_PROPERTIES_EVOLUTIONS] = evo_types
for(var/type in evo_types)
LAZYADD(GLOB.fishes_by_fish_evolution[type], fish_type)
var/beauty_score = "???"
switch(fish.beauty)
if(-INFINITY to FISH_BEAUTY_DISGUSTING)
beauty_score = "OH HELL NAW!"
if(FISH_BEAUTY_DISGUSTING to FISH_BEAUTY_UGLY)
beauty_score = "☆☆☆☆☆"
if(FISH_BEAUTY_UGLY to FISH_BEAUTY_BAD)
beauty_score = "★☆☆☆☆"
if(FISH_BEAUTY_BAD to FISH_BEAUTY_NULL)
beauty_score = "★★☆☆☆"
if(FISH_BEAUTY_NULL to FISH_BEAUTY_GENERIC)
beauty_score = "★★★☆☆"
if(FISH_BEAUTY_GENERIC to FISH_BEAUTY_GOOD)
beauty_score = "★★★★☆"
if(FISH_BEAUTY_GOOD to FISH_BEAUTY_GREAT)
beauty_score = "★★★★★"
if(FISH_BEAUTY_GREAT to INFINITY)
beauty_score = "★★★★★★"
properties[FISH_PROPERTIES_BEAUTY_SCORE] = beauty_score
qdel(fish)
///init the list of things lures can catch
code/controllers/subsystem/processing/manufacturing.dm
+4
View File
@@ -0,0 +1,4 @@
PROCESSING_SUBSYSTEM_DEF(manufacturing)
name = "Manufacturing Processing"
wait = 1 SECONDS
stat_tag = "MN"
code/controllers/subsystem/processing/station.dm
+3 -2
View File
@@ -164,6 +164,8 @@ PROCESSING_SUBSYSTEM_DEF(station)
///Creates a given trait of a specific type, while also removing any blacklisted ones from the future pool.
/datum/controller/subsystem/processing/station/proc/setup_trait(datum/station_trait/trait_type)
if(locate(trait_type) in station_traits)
return
var/datum/station_trait/trait_instance = new trait_type()
station_traits += trait_instance
log_game("Station Trait: [trait_instance.name] chosen for this round.")
@@ -180,6 +182,5 @@ PROCESSING_SUBSYSTEM_DEF(station)
var/datum/hud/new_player/observer_hud = player.hud_used
if (!istype(observer_hud))
continue
observer_hud.add_station_trait_buttons()
observer_hud.show_hud(observer_hud.hud_version)
observer_hud.show_station_trait_buttons()
*/