From 6cf06cc9acbbd41a5dab0de27440396ed71155f0 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Sat, 23 Jun 2012 15:49:05 +0100 Subject: [PATCH] TG: - Added a cookie food type, which cannot be made ingame - slightly altered the pray format to include a (SC) link, which stands for 'spawn cookie'. This attempts to spawn a cookie in the hands of the person who prayed. It's intent is to be a consolation prize when the prayer cannot be answered, due to it ruining the round. Only humans will get a cookie. Screenshot: http://www.kamletos.si/cookie%20spawner.PNG Revision: r3766 Author: baloh.matevz --- code/modules/admin/admin.dm | 20 ++++++++++++++++++++ code/modules/admin/verbs/pray.dm | 2 +- code/modules/food/food.dm | 9 +++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 659bbf362e4..a79d4714f81 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1422,6 +1422,26 @@ var/global/BSACooldown = 0 else alert("You cannot perform this action. You must be of a higher administrative rank!") + + if (href_list["adminspawncookie"]) + var/mob/M = locate(href_list["adminspawncookie"]) + if(M && ishuman(M)) + var/mob/living/carbon/human/H = M + H.equip_if_possible( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), H.slot_l_hand ) + if(!(istype(H.l_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie))) + H.equip_if_possible( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), H.slot_r_hand ) + if(!(istype(H.r_hand,/obj/item/weapon/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 + log_admin("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]") + message_admins("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]") + feedback_inc("admin_cookies_spawned",1) + H << "\blue Your prayers have been answered!! You received the best cookie!" + else + src << "\blue The person who prayed is not a human. Cookies cannot be spawned." + + if (href_list["traitor_panel_pp"]) if(rank in list("Admin Observer", "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master")) var/mob/M = locate(href_list["traitor_panel_pp"]) diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index a4eb0ed0582..37b487d0783 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -14,7 +14,7 @@ for (var/mob/M in world) if (M.client && M.client.holder && M.client.seeprayers) - M << "\blue \icon[cross] PRAY: [key_name(src, M)] (PP) (VV) (SM) (JMP) (CA): [msg]" + M << "\blue \icon[cross] PRAY: [key_name(src, M)] (PP) (VV) (SM) (JMP) (CA) (SC): [msg]" usr << "Your prayers have been received by the gods." //feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index 774c5c457d2..2dd5500e760 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -74,6 +74,15 @@ reagents.add_reagent("nutriment", 3) bitesize = 1 +/obj/item/weapon/reagent_containers/food/snacks/cookie + name = "cookie" + desc = "COOKIE!!!" + icon_state = "COOKIE!!!" + New() + ..() + reagents.add_reagent("nutriment", 5) + bitesize = 1 + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar name = "Chocolate Bar" desc = "Such, sweet, fattening food."