cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix cookie having no icon (convert everything to cookiesnack)

Browse Source
This commit is contained in:
ShadowLarkens
2021-05-21 20:06:31 -07:00
parent 5e671acf04
commit 2847ea4bbd
8 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+4 -4
View File
@@ -1390,10 +1390,10 @@
to_chat(usr, "<span class='filter_adminlog'>This can only be used on instances of type /mob/living/carbon/human</span>")
return
H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_l_hand )
if(!(istype(H.l_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie)))
H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_r_hand )
if(!(istype(H.r_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie)))
H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookiesnack(H), slot_l_hand )
if(!(istype(H.l_hand,/obj/item/weapon/reagent_containers/food/snacks/cookiesnack)))
H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookiesnack(H), slot_r_hand )
if(!(istype(H.r_hand,/obj/item/weapon/reagent_containers/food/snacks/cookiesnack)))
log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].")
message_admins("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].")
return
code/modules/awaymissions/loot_vr.dm
+1 -1
View File
@@ -268,7 +268,7 @@
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen, \
/obj/item/weapon/reagent_containers/food/snacks/candiedapple, \
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar, \
/obj/item/weapon/reagent_containers/food/snacks/cookie, \
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack, \
/obj/item/weapon/reagent_containers/food/snacks/meatball, \
/obj/item/weapon/reagent_containers/food/snacks/plump_pie, \
/obj/item/weapon/reagent_containers/food/snacks/liquidfood)
code/modules/economy/price_list.dm
+1 -1
View File
@@ -612,7 +612,7 @@
// Cookies and Candies //
/obj/item/weapon/reagent_containers/food/snacks/cookie
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack
price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
code/modules/food/food/snacks.dm
+1 -1
View File
@@ -6120,7 +6120,7 @@
reagents.add_reagent("sugar", 5)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/cookie/Initialize()
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack/Initialize()
. = ..()
bitesize = 1
code/modules/food/recipes_oven.dm
+1 -1
View File
@@ -299,7 +299,7 @@
/obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
)
result = /obj/item/weapon/reagent_containers/food/snacks/cookie
result = /obj/item/weapon/reagent_containers/food/snacks/cookiesnack
result_quantity = 4
reagent_mix = RECIPE_REAGENT_REPLACE