From be3e2740c5da8ed39ae59283eb873f230f21bbb4 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 10 Nov 2014 20:53:38 -0500 Subject: [PATCH] PDA Fix --- code/datums/uplink_item.dm | 4 ++-- code/game/objects/items/devices/PDA/PDA.dm | 17 +++++++++-------- code/game/objects/items/devices/PDA/cart.dm | 4 +++- nano/templates/pda.tmpl | 20 ++++++++++---------- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 9123843cb17..7aa4804b361 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -357,11 +357,11 @@ var/list/uplink_items = list() item = /obj/item/weapon/soap/syndie cost = 1 -/*/datum/uplink_item/stealthy_weapons/detomatix +/datum/uplink_item/stealthy_weapons/detomatix name = "Detomatix PDA Cartridge" desc = "When inserted into a personal digital assistant, this cartridge gives you five opportunities to detonate PDAs of crewmembers who have their message feature enabled. The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer. It has a chance to detonate your PDA." item = /obj/item/weapon/cartridge/syndicate - cost = 6 */ + cost = 6 // Commented out until a fix can be found, currently doesn't work with the PDA NanoUI and people keep wasting Telecrystals on it. -- Dave diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 25e678d11e0..e77b37afbf7 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -358,12 +358,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(cartridge) var/cartdata[0] - if(mode in cartmodes) - data["records"] = cartridge.create_NanoUI_values() - - if(mode == 0) - cartdata["name"] = cartridge.name - cartdata["access"] = list(\ + cartdata["access"] = list(\ "access_security" = cartridge.access_security,\ "access_engine" = cartridge.access_engine,\ "access_atmos" = cartridge.access_atmos,\ @@ -375,8 +370,15 @@ var/global/list/obj/item/device/pda/PDAs = list() "access_hydroponics" = cartridge.access_hydroponics,\ "access_reagent_scanner" = cartridge.access_reagent_scanner,\ "access_remote_door" = cartridge.access_remote_door,\ - "access_status_display" = cartridge.access_status_display\ + "access_status_display" = cartridge.access_status_display,\ + "access_detonate_pda" = cartridge.access_detonate_pda\ ) + + if(mode in cartmodes) + data["records"] = cartridge.create_NanoUI_values() + + if(mode == 0) + cartdata["name"] = cartridge.name if(isnull(cartridge.radio)) cartdata["radio"] = 0 else @@ -388,7 +390,6 @@ var/global/list/obj/item/device/pda/PDAs = list() cartdata["radio"] = 3 if(mode == 2) - cartdata["type"] = cartridge.type cartdata["charges"] = cartridge.charges ? cartridge.charges : 0 data["cartridge"] = cartdata data["stationTime"] = worldtime2text() diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index c97c7b975ce..336567aeadf 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -16,10 +16,11 @@ var/access_janitor = 0 // var/access_flora = 0 var/access_reagent_scanner = 0 - var/access_remote_door = 0 //Control some blast doors remotely!! + var/access_remote_door = 0 // Control some blast doors remotely!! var/remote_door_id = "" var/access_status_display = 0 var/access_quartermaster = 0 + var/access_detonate_pda = 0 var/access_hydroponics = 0 var/charges = 0 var/mode = null @@ -200,6 +201,7 @@ name = "Detomatix Cartridge" icon_state = "cart" access_remote_door = 1 + access_detonate_pda = 1 remote_door_id = "smindicate" //Make sure this matches the syndicate shuttle's shield/door id!! //don't ask about the name, testing. charges = 4 diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl index b88dda25c61..684c52afc5c 100644 --- a/nano/templates/pda.tmpl +++ b/nano/templates/pda.tmpl @@ -219,8 +219,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{if data.cartridge.charges}}
{{:data.cartridge.charges}} - {{if data.cartridge.type == "/obj/item/weapon/cartridge/syndicate"}} detonation charges left. {{/if}} - {{if data.cartridge.type == "/obj/item/weapon/cartridge/clown" || data.cartridge.type == "/obj/item/weapon/cartridge/mime"}} viral files left. {{/if}} + {{if data.cartridge.access.access_detonate_pda}} detonation charges left. {{/if}} + {{if data.cartridge.access.access_clown || data.cartridge.access.access_mime}} viral files left. {{/if}}

@@ -234,14 +234,14 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{for data.convopdas}}
{{:helper.link(value.Name, 'circle-arrow-s', {'choice' : "Select Conversation", 'convo' : value.Reference } , null, value.fixedLeftWider)}} - {{if value.cartridge}} - {{if value.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && value.Detonate == 1}} + {{if data.cartridge}} + {{if data.cartridge.access.access_detonate_pda && value.Detonate}} {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} - {{if value.cartridge.type == "/obj/item/weapon/cartridge/clown"}} + {{if data.cartridge.access.access_clown}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} - {{if value.cartridge.type == "/obj/item/weapon/cartridge/mime"}} + {{if data.cartridge.access.access_mime}} {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} {{/if}} @@ -251,10 +251,10 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{for data.pdas}}
{{:helper.link(value.Name, 'circle-arrow-s', {'choice' : "Message", 'target' : value.Reference}, null, value.fixedLeftWider)}} - {{if value.cartridge}} - {{if value.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && value.Detonate == 1}} {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} - {{if value.cartridge.type == "/obj/item/weapon/cartridge/clown"}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} - {{if value.cartridge.type == "/obj/item/weapon/cartridge/mime"}} {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} + {{if data.cartridge}} + {{if data.cartridge.access.access_detonate_pda && value.Detonate}} {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} + {{if data.cartridge.access.access_clown}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} + {{if data.cartridge.access.access_mime}} {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} {{/if}}
{{/for}}