diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 636384f1d2..d3a907a40a 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -367,13 +367,7 @@ var/global/list/obj/item/device/pda/PDAs = list() data["cart_loaded"] = cartridge ? 1:0 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,\ @@ -385,8 +379,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 @@ -398,7 +399,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 diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 5024b2f056..0bf1bec2a0 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 9683c086b2..5df27d9efa 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}}