cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6580 from PsiOmegaDelta/Detomax

Browse Source 
Fixes #6546
This commit is contained in:
Mloc
2014-10-02 21:21:44 +01:00
parent 5d664fe2dc fd060cc5fe
commit 87a0b4b6c7
3 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/game/objects/items/devices/PDA/PDA.dm
View File

@@ -367,12 +367,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
data["cart_loaded"] = cartridge ? 1:0 data["cart_loaded"] = cartridge ? 1:0
if(cartridge) if(cartridge)
var/cartdata[0] 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_security" = cartridge.access_security,\
"access_engine" = cartridge.access_engine,\ "access_engine" = cartridge.access_engine,\
@@ -385,8 +379,15 @@ var/global/list/obj/item/device/pda/PDAs = list()
"access_hydroponics" = cartridge.access_hydroponics,\ "access_hydroponics" = cartridge.access_hydroponics,\
"access_reagent_scanner" = cartridge.access_reagent_scanner,\ "access_reagent_scanner" = cartridge.access_reagent_scanner,\
"access_remote_door" = cartridge.access_remote_door,\ "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)) if(isnull(cartridge.radio))
cartdata["radio"] = 0 cartdata["radio"] = 0
else else
@@ -398,7 +399,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
cartdata["radio"] = 3 cartdata["radio"] = 3
if(mode == 2) if(mode == 2)
cartdata["type"] = cartridge.type
cartdata["charges"] = cartridge.charges ? cartridge.charges : 0 cartdata["charges"] = cartridge.charges ? cartridge.charges : 0
data["cartridge"] = cartdata data["cartridge"] = cartdata

4
code/game/objects/items/devices/PDA/cart.dm
View File

@@ -16,10 +16,11 @@
var/access_janitor = 0 var/access_janitor = 0
// var/access_flora = 0 // var/access_flora = 0
var/access_reagent_scanner = 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/remote_door_id = ""
var/access_status_display = 0 var/access_status_display = 0
var/access_quartermaster = 0 var/access_quartermaster = 0
var/access_detonate_pda = 0
var/access_hydroponics = 0 var/access_hydroponics = 0
var/charges = 0 var/charges = 0
var/mode = null var/mode = null
@@ -200,6 +201,7 @@
name = "Detomatix Cartridge" name = "Detomatix Cartridge"
icon_state = "cart" icon_state = "cart"
access_remote_door = 1 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. remote_door_id = "smindicate" //Make sure this matches the syndicate shuttle's shield/door id!! //don't ask about the name, testing.
charges = 4 charges = 4

20
nano/templates/pda.tmpl
View File

@@ -219,8 +219,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
{{if data.cartridge.charges}} {{if data.cartridge.charges}}
<div class="item"> <div class="item">
<b>{{:data.cartridge.charges}} <b>{{:data.cartridge.charges}}
{{if data.cartridge.type == "/obj/item/weapon/cartridge/syndicate"}} detonation charges left. {{/if}} {{if data.cartridge.access.access_detonate_pda}} 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_clown || data.cartridge.access.access_mime}} viral files left. {{/if}}
</b> </b>
<br><br> <br><br>
</div> </div>
@@ -234,14 +234,14 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
{{for data.convopdas}} {{for data.convopdas}}
<div class="item"> <div class="item">
{{:helper.link(value.Name, 'circle-arrow-s', {'choice' : "Select Conversation", 'convo' : value.Reference } , null, value.fixedLeftWider)}} {{:helper.link(value.Name, 'circle-arrow-s', {'choice' : "Select Conversation", 'convo' : value.Reference } , null, value.fixedLeftWider)}}
{{if value.cartridge}} {{if data.cartridge}}
{{if value.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && value.Detonate == 1}} {{if data.cartridge.access.access_detonate_pda && value.Detonate}}
{{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : value.Reference}, null, 'fixedLeft')}} {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : value.Reference}, null, 'fixedLeft')}}
{{/if}} {{/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')}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : value.Reference}, null, 'fixedLeft')}}
{{/if}} {{/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')}} {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : value.Reference}, null, 'fixedLeft')}}
{{/if}} {{/if}}
{{/if}} {{/if}}
@@ -251,10 +251,10 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
{{for data.pdas}} {{for data.pdas}}
<div class="item"> <div class="item">
{{:helper.link(value.Name, 'circle-arrow-s', {'choice' : "Message", 'target' : value.Reference}, null, value.fixedLeftWider)}} {{:helper.link(value.Name, 'circle-arrow-s', {'choice' : "Message", 'target' : value.Reference}, null, value.fixedLeftWider)}}
{{if value.cartridge}} {{if data.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 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"}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", '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 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.access.access_mime}} {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}}
{{/if}} {{/if}}
</div> </div>
{{/for}} {{/for}}