shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1047 from Citadel-Station-13/upstream-merge-27343

Browse Source 
[MIRROR] Fixes custom slices not inheriting name
This commit is contained in:
LetterJay
2017-05-18 23:46:20 -04:00
committed by GitHub
parent 96710c56e1 fa1b651799
commit 1b4d2b330f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/food/customizables.dm
-1
View File
@@ -135,7 +135,6 @@
/obj/item/weapon/reagent_containers/food/snacks/customizable/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/slice, reagents_per_slice)
..()
slice.name = "[customname] [initial(slice.name)]"
slice.filling_color = filling_color
slice.update_overlays(src)
code/modules/food_and_drinks/food/snacks.dm
+3 -2
View File
@@ -215,8 +215,9 @@
/obj/item/weapon/reagent_containers/food/snacks/proc/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/slice, reagents_per_slice)
slice.create_reagents(slice.volume)
reagents.trans_to(slice,reagents_per_slice)
if( name != initial(name) || desc != initial(desc) )
slice.name = "slice of [src]"
if(name != initial(name))
slice.name = "slice of [name]"
if(desc != initial(desc))
slice.desc = "[desc]"
/obj/item/weapon/reagent_containers/food/snacks/proc/generate_trash(atom/location)