-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
[FIX] Better slices #27807
[FIX] Better slices #27807
Conversation
This line
Also there is steal some slices that are used by maps, but don't have a reagent list. For example:
How this should be handled? |
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
Outdated
Show resolved
Hide resolved
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Needs those two files reverted, otherwise seems fine.
Done |
code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
Show resolved
Hide resolved
/obj/item/food/sliceable/Initialize(mapload) | ||
if(!ispath(slice_path, /obj/item/food/sliced)) | ||
CRASH("Invalid type assigned to slice_path: [slice_path]") | ||
return ..() | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please remove this, in case someone wants to add a non-sliced food as a result
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will remove this
if(made_by_sliceable) | ||
return ..() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if(made_by_sliceable) | |
return ..() | |
if(made_by_sliceable) | |
list_reagents = list() | |
return ..() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will be called from here -> var/obj/slice = new slice_path (loc, TRUE)
That means we are sliced normally and we have a 'parent', all reagents calculations were handled.
This is why we return.
if(made_by_sliceable)
return ..()
Anyway, we have var/list/list_reagents = list()
from /obj/item/food
.
So what was the reason for changes? What do you want to change?
@DGamerL How do i handle changes after PR got merged? Do i create a new one? |
What Does This PR Do
/obj/item/food/slice
to ensure similar slice behaviorfood/margaritapizzaslice
tofood/slice/margarita_pizza
Why It's Good For The Game
There will not be a slices with 0 reagents on maps
Testing
Built and runed.
Declaration
Changelog
🆑
Fix: All food slices on maps have nutritional values.
Tweak: Some sliceable food nutritional values have been increased, so the slices contain a whole amount of reagents.
/:cl: