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.

Sign up for GitHub

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

Jump to bottom

Conversion of obj/item/fish into /obj/item/reagent_container/food/fish and addition of fish oil #14857

Merged
merged 14 commits into from Jul 28, 2023
Merged

Conversion of obj/item/fish into /obj/item/reagent_container/food/fish and addition of fish oil #14857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
642ad0a
Replaces all item/fish with reagentcontainer/food/fish
M-Earthfire Jul 5, 2023
e2523a4
Merge branch 'master' of https://github.com/M-Earthfire/goonstation i…
M-Earthfire Jul 5, 2023
30597aa
added fish oil, inert plant gene strain and made fish compatible with…
M-Earthfire Jul 5, 2023
91f8b15
fillet now keep their reagents upon slicing to fillet slices
M-Earthfire Jul 5, 2023
9dc260a
removed the material properties applied to the fish objects
M-Earthfire Jul 6, 2023
33d8581
Merge branch 'master' of https://github.com/M-Earthfire/goonstation i…
M-Earthfire Jul 6, 2023
7ab26d8
fixed fillet_type to slioce_product
M-Earthfire Jul 6, 2023
fd3c339
Merge branch 'master' of https://github.com/M-Earthfire/goonstation i…
M-Earthfire Jul 19, 2023
e6c866b
Merge branch 'master' of https://github.com/M-Earthfire/goonstation i…
M-Earthfire Jul 20, 2023
ae9f0bb
Merge branch 'master' of https://github.com/M-Earthfire/goonstation i…
M-Earthfire Jul 25, 2023
2e501d5
fixed wall fish trophy allowed type
M-Earthfire Jul 25, 2023
b86692c
Add a UpdatePaths-Script for the fish-refactor
M-Earthfire Jul 25, 2023
4df0209
Merge branch 'master' of https://github.com/M-Earthfire/goonstation i…
M-Earthfire Jul 28, 2023
b31064c
made slice_product work with all atoms and resolved merge conflicts
M-Earthfire Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions assets/maps/prefabs/largetest.dmm
View file
Open in desktop
Expand Up @@ -6,23 +6,23 @@
/turf/simulated/wall,
/area/space)
"c" = (
/obj/item/fish/bass,
/obj/item/reagent_containers/food/fish/bass,
/turf/simulated/floor/airless,
/area/space)
"d" = (
/obj/item/fish/carp,
/obj/item/reagent_containers/food/fish/carp,
/turf/simulated/floor/airless,
/area/space)
"e" = (
/obj/item/fish/mahimahi,
/obj/item/reagent_containers/food/fish/mahimahi,
/turf/simulated/floor/airless,
/area/space)
"f" = (
/obj/item/fish/red_herring,
/obj/item/reagent_containers/food/fish/red_herring,
/turf/simulated/floor/airless,
/area/space)
"g" = (
/obj/item/fish/salmon,
/obj/item/reagent_containers/food/fish/salmon,
/turf/simulated/floor/airless,
/area/space)

Expand Down
2 changes: 1 addition & 1 deletion assets/maps/prefabs/planet/prefab_planet_bear_den.dmm
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
/turf/variableTurf/clear,
/area/allowGenerate)
"Q" = (
/obj/item/fish/salmon,
/obj/item/reagent_containers/food/fish/salmon,
/turf/variableTurf/clear,
/area/allowGenerate)

Expand Down
10 changes: 5 additions & 5 deletions assets/maps/prefabs/space/prefab_adrift_cargo_router.dmm
View file
Open in desktop
Expand Up @@ -516,11 +516,11 @@
},
/obj/item/raw_material/ice,
/obj/item/raw_material/ice,
/obj/item/fish/bass,
/obj/item/fish/carp,
/obj/item/fish/herring,
/obj/item/fish/mahimahi,
/obj/item/fish/salmon,
/obj/item/reagent_containers/food/fish/bass,
/obj/item/reagent_containers/food/fish/carp,
/obj/item/reagent_containers/food/fish/herring,
/obj/item/reagent_containers/food/fish/mahimahi,
/obj/item/reagent_containers/food/fish/salmon,
/obj/item/reagent_containers/food/snacks/swedish_fish,
/turf/simulated/floor/orangeblack/side{
dir = 4
Expand Down
2 changes: 1 addition & 1 deletion assets/maps/random_rooms/3x5/beachroom.dmm
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@
/area/dmm_suite/clear_area)
"R" = (
/obj/machinery/drainage,
/obj/item/fish/herring{
/obj/item/reagent_containers/food/fish/herring{
pixel_x = -14;
pixel_y = 13
},
Expand Down
2 changes: 1 addition & 1 deletion assets/maps/random_rooms/5x3/cats.dmm
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@
},
/area/space)
"H" = (
/obj/item/fish/salmon,
/obj/item/reagent_containers/food/fish/salmon,
/turf/simulated/floor/plating/random,
/area/space)
"M" = (
Expand Down
29 changes: 29 additions & 0 deletions code/modules/chemistry/Reagents-FoodDrink.dm
View file
Open in desktop
Expand Up @@ -3144,6 +3144,35 @@ datum
if(method == INGEST)
boutput(M, "<span class='notice'>That tasted amazing!</span>")

fooddrink/fishoil
name = "fish oil"
id = "fishoil"
description = "A clear and slightly viscous oil isolated out of fish."
reagent_state = LIQUID
fluid_r = 180
fluid_g = 200
fluid_b = 60
transparency = 140
hunger_value = 0.8
taste = "fishy"

on_mob_life(var/mob/M, var/mult = 1)
if(!M) M = holder.my_atom
//unsaturated fatty acids help correcting your blood pressure :)
if (blood_system && isliving(M) && prob(25))
var/mob/living/H = M
if (H.blood_volume < 500)
H.blood_volume += 1 * mult
else
if (H.blood_volume > 500)
H.blood_volume -= 1 * mult

if(prob(4))
M.reagents.add_reagent("cholesterol", rand(1,2) * mult)
..()



fooddrink/egg
name = "egg"
id = "egg"
Expand Down
6 changes: 4 additions & 2 deletions code/modules/chemistry/tools/food_and_drink.dm
View file
Open in desktop
Expand Up @@ -84,8 +84,10 @@ ABSTRACT_TYPE(/obj/item/reagent_containers/food)
var/amount_to_transfer = round(src.reagents.total_volume / src.slice_amount)
src.reagents?.inert = 1 // If this would be missing, the main food would begin reacting just after the first slice received its chems
for (var/i in 1 to src.slice_amount)
var/obj/item/reagent_containers/food/slice = new src.slice_product(T)
src.process_sliced_products(slice, amount_to_transfer)
var/atom/slice_result = new src.slice_product(T)
if(istype(slice_result, /obj/item/reagent_containers/food))
var/obj/item/reagent_containers/food/slice = slice_result
src.process_sliced_products(slice, amount_to_transfer)
qdel (src)
else
..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/economy/commodity.dm
View file
Open in desktop
Expand Up @@ -67,7 +67,7 @@

/datum/commodity/fish
comname = "Fish"
comtype = /obj/item/fish
comtype = /obj/item/reagent_containers/food/fish
onmarket = 1
price = 50
baseprice = 50
Expand Down