diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm index 7ac52ee11ed..89c2b18f7f5 100644 --- a/code/defines/obj/vending.dm +++ b/code/defines/obj/vending.dm @@ -276,8 +276,8 @@ icon_state = "tool" icon_deny = "tool-deny" //req_access_txt = "12" //Maintenance access - product_paths = "/obj/item/weapon/cable_coil/random;/obj/item/weapon/crowbar;/obj/item/weapon/weldingtool;/obj/item/weapon/wirecutters;/obj/item/weapon/wrench;/obj/item/device/analyzer;/obj/item/device/t_scanner" - product_amounts = "10;5;3;5;5;5;5" + product_paths = "/obj/item/weapon/cable_coil/random;/obj/item/weapon/crowbar;/obj/item/weapon/weldingtool;/obj/item/weapon/wirecutters;/obj/item/weapon/wrench;/obj/item/device/analyzer;/obj/item/device/t_scanner;/obj/item/weapon/screwdriver" + product_amounts = "10;5;3;5;5;5;5;5" product_hidden = "/obj/item/weapon/weldingtool/hugeetank;/obj/item/clothing/gloves/fyellow" product_hideamt = "2;2" product_coin = "/obj/item/clothing/gloves/yellow" diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index d800ef38053..82011652145 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -405,7 +405,7 @@ //Get out list of viable PDAs var/list/obj/item/device/pda/sendPDAs = list() for(var/obj/item/device/pda/P in PDAs) - if(!P.owner || P.toff) continue + if(!P.owner || P.toff || P.hidden) continue sendPDAs += P if(PDAs && PDAs.len > 0) customrecepient = input(usr, "Select a PDA from the list.") as null|anything in sortAtom(sendPDAs) @@ -437,7 +437,7 @@ var/obj/item/device/pda/PDARec = null for (var/obj/item/device/pda/P in PDAs) - if (!P.owner||P.toff) continue + if (!P.owner || P.toff || P.hidden) continue if(P.owner == customsender) PDARec = P //Sender isn't faking as someone who exists diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 7721c6f7c02..bd3d299edad 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -37,6 +37,7 @@ var/global/list/obj/item/device/pda/PDAs = list() var/notehtml = "" var/cart = "" //A place to stick cartridge menu information var/detonate = 1 // Can the PDA be blown up? + var/hidden = 0 // Is the PDA hidden from the PDA list? var/obj/item/weapon/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both. var/ownjob = null //related to above @@ -130,7 +131,7 @@ var/global/list/obj/item/device/pda/PDAs = list() icon_state = "pda-syn" name = "Military PDA" owner = "John Doe" - toff = 1 + hidden = 1 /obj/item/device/pda/chaplain icon_state = "pda-holy" @@ -360,7 +361,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if (!toff) for (var/obj/item/device/pda/P in sortAtom(PDAs)) - if (!P.owner||P.toff||P == src) continue + if (!P.owner||P.toff||P == src||P.hidden) continue dat += "
  • [P]" if (istype(cartridge, /obj/item/weapon/cartridge/syndicate) && P.detonate) dat += " (*Detonate*)" @@ -1019,6 +1020,8 @@ var/global/list/obj/item/device/pda/PDAs = list() for (var/obj/item/device/pda/P in PDAs) if (!P.owner) continue + else if(P.hidden) + continue else if (P == src) continue else if (P.toff) diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 44c6cf2f8ea..5472421557f 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -132,7 +132,7 @@ var/list/mechtoys = list( var/points_per_process = 1 var/points_per_slip = 2 var/points_per_crate = 5 - var/plasma_per_point = 3 // 3 plasma for 1 point + var/plasma_per_point = 2 // 2 plasma for 1 point //control var/ordernum var/list/shoppinglist = list() diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 92bf4130a5d..1b3318acbb8 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -240,8 +240,14 @@ var/global/floorIsLava = 0 if( isemptylist(src.admincaster_feed_channel.messages) ) dat+="No feed messages found in channel...
    " else + var/i = 0 for(var/datum/feed_message/MESSAGE in src.admincaster_feed_channel.messages) - dat+="-[MESSAGE.body]
    \[Story by [MESSAGE.author]\]

    " + i++ + dat+="-[MESSAGE.body]
    " + if(MESSAGE.img) + usr << browse_rsc(MESSAGE.img, "tmp_photo[i].png") + dat+="

    " + dat+="\[Story by [MESSAGE.author]\]
    " dat+="
    Refresh" dat+="
    Back" if(10) @@ -329,6 +335,12 @@ var/global/floorIsLava = 0 dat+="-- STATIONWIDE WANTED ISSUE --
    \[Submitted by: [news_network.wanted_issue.backup_author]\]
    " dat+="Criminal: [news_network.wanted_issue.author]
    " dat+="Description: [news_network.wanted_issue.body]
    " + dat+="Photo:: " + if(news_network.wanted_issue.img) + usr << browse_rsc(news_network.wanted_issue.img, "tmp_photow.png") + dat+="
    " + else + dat+="None" dat+="
    Back
    " if(19) dat+="Wanted issue for [src.admincaster_feed_message.author] successfully edited.

    " diff --git a/html/changelog.html b/html/changelog.html index 2352c7f9328..f109a2b253c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -52,8 +52,9 @@ should be listed in the changelog upon commit tho. Thanks. -->

    23 December 2012

    Giacom updated: