TG Update: Quarxink fixing invisible fried eggs and fixing an earlier derp with supplyshuttle.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2701 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
ryantennessee@yahoo.com
2011-12-16 15:19:15 +00:00
committed by Hawk-v3
parent 8484107225
commit ef93358b40
2 changed files with 47 additions and 36 deletions
+47 -36
View File
@@ -93,7 +93,7 @@ var/list/supply_groups = new()
icon_state = "request"
circuit = "/obj/item/weapon/circuitboard/ordercomp"
var/temp = null
var/reqtime = 0 //Cooldown for requisitions - Quarxink
/obj/machinery/computer/ordercomp/New()
// add the supply pack groups, if they haven't already been added
if(supply_groups.len == 0)
@@ -304,44 +304,55 @@ var/list/supply_groups = new()
src.temp += "<BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
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.overlays += "paper_words"
reqform.info += "<h3>[station_name] Supply Requisition Form</h3><hr>"
reqform.name = "Requisition Form - [P.name]"
reqform.overlays += "paper_words"
reqform.info += "<h3>[station_name] Supply Requisition Form</h3><hr>"
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]<br>"
reqform.info += "RANK: [idrank]<br>"
reqform.info += "REASON: [reason]<br>"
reqform.info += "SUPPLY CRATE TYPE: [P.name]<br>"
reqform.info += "Contents:<br><ul>"
for(var/B in P.contains)
var/thepath = text2path(B)
var/atom/B2 = new thepath ()
reqform.info += "<li>[B2.name]</li>"
reqform.info += "</ul><hr>"
reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:<br>"
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]<br>"
reqform.info += "RANK: [idrank]<br>"
reqform.info += "REASON: [reason]<br>"
reqform.info += "SUPPLY CRATE TYPE: [P.name]<br>"
reqform.info += "Contents:<br><ul>"
for(var/B in P.contains)
var/thepath = text2path(B)
var/atom/B2 = new thepath ()
reqform.info += "<li>[B2.name]</li>"
reqform.info += "</ul><hr>"
reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:<br>"
for (var/mob/V in hearers(src))
V.show_message("<b>[src]</b>'s monitor flashes, \"[reqtime] seconds remaining until another requisition form may be printed.\"")
else if (href_list["vieworders"])
src.temp = "Current approved orders: <BR><BR>"
for(var/S in supply_shuttle_shoppinglist)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 75 KiB