From 4b42fe2b97500a12bf30df28375f9ab9ea6b98c5 Mon Sep 17 00:00:00 2001 From: "ryantennessee@yahoo.com" Date: Fri, 16 Dec 2011 15:19:15 +0000 Subject: [PATCH] Quarxink fixing invisible fried ex and fixing an earlier derp with supplyshuttle.dm git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2701 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/supplyshuttle.dm | 81 +++++++++++++++++++++---------------- icons/obj/food.dmi | Bin 76780 -> 76779 bytes 2 files changed, 46 insertions(+), 35 deletions(-) diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index c69f9e59f85..833e84245fa 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -84,7 +84,7 @@ var/ordernum=0 icon_state = "request" circuit = "/obj/item/weapon/circuitboard/ordercomp" var/temp = null - + var/reqtime = 0 //Cooldown for requisitions - Quarxink /obj/effect/marker/supplymarker icon_state = "X" icon = 'mark.dmi' @@ -273,43 +273,54 @@ var/ordernum=0 src.temp += "
OK" else if (href_list["printform"]) - var/supplytype = href_list["printform"] - var/datum/supply_packs/P = new supplytype () - var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(src.loc) - var/idname = "Unknown" - var/idrank = "Unknown" - var/reason = input(usr,"Reason:","Why do you require this item?","") + if (!reqtime) + var/supplytype = href_list["printform"] + var/datum/supply_packs/P = new supplytype () + var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(src.loc) + var/idname = "Unknown" + var/idrank = "Unknown" + var/reason = input(usr,"Reason:","Why do you require this item?","") - reqform.name = "Requisition Form - [P.name]" - reqform.info += "

[station_name] Supply Requisition Form

" + reqform.name = "Requisition Form - [P.name]" + reqform.info += "

[station_name] Supply Requisition Form

" + + if (istype(usr:wear_id, /obj/item/weapon/card/id)) + if(usr:wear_id.registered) + idname = usr:wear_id.registered + if(usr:wear_id.assignment) + idrank = usr:wear_id.assignment + if (istype(usr:wear_id, /obj/item/device/pda)) + var/obj/item/device/pda/pda = usr:wear_id + if(pda.owner) + idname = pda.owner + if(pda.ownjob) + idrank = pda.ownjob + else + idname = usr.name + + reqform.info += "REQUESTED BY: [idname]
" + reqform.info += "RANK: [idrank]
" + reqform.info += "REASON: [reason]
" + reqform.info += "SUPPLY CRATE TYPE: [P.name]
" + reqform.info += "Contents:
" + reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:
" + + reqtime = 5 //5 second cooldown initiated after each printed req, change the number to change the cooldown (in seconds) - Quarxink + spawn(0) + while(reqtime >=1 && src) + sleep(10) + reqtime -- + reqtime = 0 - if (istype(usr:wear_id, /obj/item/weapon/card/id)) - if(usr:wear_id.registered) - idname = usr:wear_id.registered - if(usr:wear_id.assignment) - idrank = usr:wear_id.assignment - if (istype(usr:wear_id, /obj/item/device/pda)) - var/obj/item/device/pda/pda = usr:wear_id - if(pda.owner) - idname = pda.owner - if(pda.ownjob) - idrank = pda.ownjob else - idname = usr.name - - reqform.info += "REQUESTED BY: [idname]
" - reqform.info += "RANK: [idrank]
" - reqform.info += "REASON: [reason]
" - reqform.info += "SUPPLY CRATE TYPE: [P.name]
" - reqform.info += "Contents:
" - reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:
" - + for (var/mob/V in hearers(src)) + V.show_message("[src]'s monitor flashes, \"[reqtime] seconds remaining until another requisition form may be printed.\"") else if (href_list["vieworders"]) src.temp = "Current approved orders:

" for(var/S in supply_shuttle_shoppinglist) diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 503f50351819f5bdf6c6020fcbd240a2a559678d..453c925bf66906c9f63c752bff95bd31a82a1788 100644 GIT binary patch delta 613 zcmV-r0-F8o*97a=1dt>F!jUB@0icmj6(t0LzBv?onFW5LDUzZ-)33X~KmYUPTleYf zm*WGMDw?|c?)~qPiLM8KfZU%T_ZPE10ipqai(`+dncNnn=VF^*hT#_r?v4k~fwu0x zd-K~*e^+x9DT&c{4&fJa?c>$bhr6qZyW^qoD#`zJn(~$l+Y{1QHF!5k5aa~`10$35 z6hc)%`X@FE456#k2?8%Uh3KA~wp&jQOUx%kXgsGAVtb|n-5ND>22Dy8Ha?Q}^lXm*c-KquWlT5K5ba@C3K;1OfaeEP5{8 delta 614 zcmV-s0-62m*97d>1dt>F!;vK^0kn}%6(tmbzBv?onFW5LDUzZ-)33WfKmYyZTleYf zm*WGMDw?|c?)|TkiLM8~f!yyP_Xo2+0ipqajbo3fncNnn=VF^*hT$g*?v4k~fwu0x zd-KbG{;uXIQWB%@9KuiJ+Q+M<4|i7+cgI8FRg(YDY06tJY)?pI)!^MEL68>&42(?H zQwUW7>7UpvFodpBCkVXc6ry`_+HO5LEHR%Dq4Atfi0zpQbZgYiA)LD@^5XRZZ~GvB zV=sm(Q%-J@K%Oe%$CYjuVquEsYaSCMKP~|KkEU6;dJZy9hV0=y6x>$;c2XK9VVPu!{~uV0hMVyaKJwii$U- z3XHv}6g5nor%u~CZCXa&)gb!j6v?o6GRm2gm-d)?2PF-GB2XB8Q1#G%!G3Nn za3g%?!2+t8YYo)yaF^6!vznJQIQ9qGC#vy3CR{H|a6!$tszOz>i#Oi9&t3v&p#{_z3x7L`_z5<`sMf!B*WV-k