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

Compile issues with the merge. PDA tapping may be broken for pAIs.

Browse Source
This commit is contained in:
Zuhayr
2014-11-10 13:17:17 +10:30
parent b4ea25d064
commit e80d294aa5
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1026,12 +1026,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
L << reception_message L << reception_message
nanomanager.update_user_uis(L, src) // Update the receiving user's PDA UI so that they can see the new message nanomanager.update_user_uis(L, src) // Update the receiving user's PDA UI so that they can see the new message
if(L)
L << "\icon[P] <b>Message from [src.owner] ([ownjob]), </b>\"[t]\" (<a href='byond://?src=\ref[P];choice=Message;notap=[istype(L, /mob/living/silicon)];skiprefresh=1;target=\ref[src]'>Reply</a>)"
nanomanager.update_user_uis(L, P) // Update the receiving user's PDA UI so that they can see the new message
/obj/item/device/pda/proc/new_news(var/message) /obj/item/device/pda/proc/new_news(var/message)
new_info(news_silent, newstone, news_silent ? "" : "\icon[src] <b>[message]</b>") new_info(news_silent, newstone, news_silent ? "" : "\icon[src] <b>[message]</b>")
new_news = 1 new_news = 1
update_icon() update_icon()
@@ -1042,7 +1039,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
new_message(sending_device.name, sending_device.owner, sending_device.ownjob, message) new_message(sending_device.name, sending_device.owner, sending_device.ownjob, message)
/obj/item/device/pda/proc/new_message(var/sending_unit, var/sender, var/sender_job, var/message) /obj/item/device/pda/proc/new_message(var/sending_unit, var/sender, var/sender_job, var/message)
var/reception_message = "\icon[src] <b>Message from [sender] ([sender_job]), </b>\"[message]\" (<a href='byond://?src=\ref[src];choice=Message;skiprefresh=1;target=\ref[src]'>Reply</a>)" var/reception_message = "\icon[src] <b>Message from [sender] ([sender_job]), </b>\"[message]\" (<a href='byond://?src=\ref[src];choice=Message;notap=[istype(loc, /mob/living/silicon)];skiprefresh=1;target=\ref[src]'>Reply</a>)"
new_info(news_silent, newstone, reception_message) new_info(news_silent, newstone, reception_message)
log_pda("[usr] (PDA: [sending_unit]) sent \"[message]\" to [name]") log_pda("[usr] (PDA: [sending_unit]) sent \"[message]\" to [name]")

2
code/modules/power/breaker_box.dm
View File

@@ -8,7 +8,7 @@
name = "Breaker Box" name = "Breaker Box"
icon = 'icons/obj/power.dmi' icon = 'icons/obj/power.dmi'
icon_state = "bbox_off" icon_state = "bbox_off"
directwired = 0 //directwired = 0
var/icon_state_on = "bbox_on" var/icon_state_on = "bbox_on"
var/icon_state_off = "bbox_off" var/icon_state_off = "bbox_off"
flags = FPRINT flags = FPRINT

2
code/modules/power/smes.dm
View File

@@ -11,7 +11,7 @@
density = 1 density = 1
anchored = 1 anchored = 1
use_power = 0 use_power = 0
directwired = 0 //directwired = 0
var/output = 50000 //Amount of power it tries to output var/output = 50000 //Amount of power it tries to output
var/lastout = 0 //Amount of power it actually outputs to the powernet var/lastout = 0 //Amount of power it actually outputs to the powernet
var/loaddemand = 0 //For use in restore() var/loaddemand = 0 //For use in restore()