mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
- 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 git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3766 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -1230,6 +1230,24 @@ var/global/BSACooldown = 0
|
|||||||
sleep(2)
|
sleep(2)
|
||||||
cl.jumptomob(M)
|
cl.jumptomob(M)
|
||||||
|
|
||||||
|
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)]")
|
||||||
|
H << "\blue Your prayers have been answered!! You received the <b>best cookie</b>!"
|
||||||
|
else
|
||||||
|
src << "\blue The person who prayed is not a human. Cookies cannot be spawned."
|
||||||
|
|
||||||
|
|
||||||
if (href_list["traitor_panel_pp"])
|
if (href_list["traitor_panel_pp"])
|
||||||
var/mob/M = locate(href_list["traitor_panel_pp"])
|
var/mob/M = locate(href_list["traitor_panel_pp"])
|
||||||
if(isnull(M))
|
if(isnull(M))
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
for (var/mob/M in world)
|
for (var/mob/M in world)
|
||||||
if (M.client && M.client.holder && M.client.seeprayers)
|
if (M.client && M.client.holder && M.client.seeprayers)
|
||||||
M << "\blue \icon[cross] <b><font color=purple>PRAY: </font>[key_name(src, M)] (<A HREF='?src=\ref[M.client.holder];adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?src=\ref[M.client.holder];adminplayervars=\ref[src]'>VV</A>) (<A HREF='?src=\ref[M.client.holder];adminplayersubtlemessage=\ref[src]'>SM</A>) (<A HREF='?src=\ref[M.client.holder];adminplayerobservejump=\ref[src]'>JMP</A>) (<A HREF='?src=\ref[M.client.holder];secretsadmin=check_antagonist'>CA</A>):</b> [msg]"
|
M << "\blue \icon[cross] <b><font color=purple>PRAY: </font>[key_name(src, M)] (<A HREF='?src=\ref[M.client.holder];adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?src=\ref[M.client.holder];adminplayervars=\ref[src]'>VV</A>) (<A HREF='?src=\ref[M.client.holder];adminplayersubtlemessage=\ref[src]'>SM</A>) (<A HREF='?src=\ref[M.client.holder];adminplayerobservejump=\ref[src]'>JMP</A>) (<A HREF='?src=\ref[M.client.holder];secretsadmin=check_antagonist'>CA</A>) (<A HREF='?src=\ref[M.client.holder];adminspawncookie=\ref[src]'>SC</a>):</b> [msg]"
|
||||||
|
|
||||||
usr << "Your prayers have been received by the gods."
|
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!
|
feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||||
|
|||||||
@@ -69,6 +69,15 @@
|
|||||||
reagents.add_reagent("nutriment", 3)
|
reagents.add_reagent("nutriment", 3)
|
||||||
bitesize = 1
|
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
|
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
|
||||||
name = "Chocolate Bar"
|
name = "Chocolate Bar"
|
||||||
desc = "Such, sweet, fattening food."
|
desc = "Such, sweet, fattening food."
|
||||||
|
|||||||
Reference in New Issue
Block a user