cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

PDA Fix

Browse Source
This commit is contained in:
Fox-McCloud
2014-11-10 20:53:38 -05:00
parent b5a0d26450
commit be3e2740c5
4 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/uplink_item.dm
+2 -2
View File
@@ -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
code/game/objects/items/devices/PDA/PDA.dm
+9 -8
View File
@@ -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()
code/game/objects/items/devices/PDA/cart.dm
+3 -1
View File
@@ -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
nano/templates/pda.tmpl
+10 -10
View File
@@ -219,8 +219,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
{{if data.cartridge.charges}}
<div class="item">
<b>{{: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}}
</b>
<br><br>
</div>
@@ -234,14 +234,14 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
{{for data.convopdas}}
<div class="item">
{{: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}}
<div class="item">
{{: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}}
</div>
{{/for}}