cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-31 00:59:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Banish Cookie Monster

Browse Source
This commit is contained in:
Cerebulon
2022-12-21 23:20:53 +00:00
parent 9e28caf95c
commit cbfc447234
5 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+4 -4
View File
@@ -1351,10 +1351,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/reagent_containers/food/snacks/cookiesnack(H), slot_l_hand )
if(!(istype(H.l_hand,/obj/item/reagent_containers/food/snacks/cookiesnack)))
H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookiesnack(H), slot_r_hand )
if(!(istype(H.r_hand,/obj/item/reagent_containers/food/snacks/cookiesnack)))
H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), slot_l_hand )
if(!(istype(H.l_hand,/obj/item/reagent_containers/food/snacks/cookie)))
H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), slot_r_hand )
if(!(istype(H.r_hand,/obj/item/reagent_containers/food/snacks/cookie)))
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/food/food/lunch.dm
+1
View File
@@ -66,6 +66,7 @@ var/global/list/lunchables_snacks_ = list(/obj/item/reagent_containers/food/snac
/obj/item/reagent_containers/food/snacks/honeybun,
/obj/item/reagent_containers/food/snacks/custardbun,
/obj/item/reagent_containers/food/snacks/honeytoast,
/obj/item/reagent_containers/food/snacks/cookie,
/obj/item/reagent_containers/food/snacks/cookiesnack,
/obj/item/reagent_containers/food/snacks/fruitbar,
/obj/item/reagent_containers/food/snacks/semki,
code/modules/food/food/snacks.dm
+13
View File
@@ -6172,6 +6172,19 @@
. = ..()
reagents.add_reagent("sugar", 5)
/obj/item/reagent_containers/food/snacks/cookie
name = "cookie"
desc = "COOKIE!!!"
icon_state = "COOKIE!!!"
filling_color = "#DBC94F"
center_of_mass = list("x"=17, "y"=18)
nutriment_amt = 5
nutriment_desc = list("sweetness" = 3, "cookie" = 2)
/obj/item/reagent_containers/food/snacks/cookie/Initialize()
. = ..()
bitesize = 1
/obj/item/reagent_containers/food/snacks/cookiesnack
name = "Carps Ahoy! miniature cookies"
desc = "Now 100% carpotoxin free!"
code/modules/food/recipes_oven.dm
+2 -2
View File
@@ -299,7 +299,7 @@
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/chocolatebar
)
result = /obj/item/reagent_containers/food/snacks/cookiesnack
result = /obj/item/reagent_containers/food/snacks/cookie
result_quantity = 4
reagent_mix = RECIPE_REAGENT_REPLACE
@@ -724,4 +724,4 @@
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
)
result = /obj/item/reagent_containers/food/snacks/sharkmeatcooked
result = /obj/item/reagent_containers/food/snacks/sharkmeatcooked