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

Reduce lines by removing blank lines added by PJ's script

Browse Source
This commit is contained in:
Tigercat2000
2016-04-05 08:25:57 -07:00
parent 9d430844c3
commit 78f53553f8
1049 changed files with 3 additions and 8630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/pda/PDA.dm
-16
View File
@@ -297,18 +297,15 @@ var/global/list/obj/item/device/pda/PDAs = list()
notifying_programs.Cut()
overlays.Cut()
to_chat(usr, "<span class='notice'>You press the reset button on \the [src].</span>")
else
to_chat(usr, "<span class='notice'>You cannot do this while restrained.</span>")
/obj/item/device/pda/proc/remove_id()
if (id)
if (ismob(loc))
var/mob/M = loc
M.put_in_hands(id)
to_chat(usr, "<span class='notice'>You remove the ID from the [name].</span>")
else
id.forceMove(get_turf(src))
id = null
@@ -326,12 +323,10 @@ var/global/list/obj/item/device/pda/PDAs = list()
remove_id()
else
to_chat(usr, "<span class='notice'>This PDA does not have an ID in it.</span>")
else
to_chat(usr, "<span class='notice'>You cannot do this while restrained.</span>")
/obj/item/device/pda/verb/verb_remove_pen()
set category = "Object"
set name = "Remove pen"
@@ -348,17 +343,14 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(M.get_active_hand() == null)
M.put_in_hands(O)
to_chat(usr, "<span class='notice'>You remove \the [O] from \the [src].</span>")
return
O.forceMove(get_turf(src))
else
to_chat(usr, "<span class='notice'>This PDA does not have a pen in it.</span>")
else
to_chat(usr, "<span class='notice'>You cannot do this while restrained.</span>")
/obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use.
if(choice == 1)
if (id)
@@ -388,7 +380,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
cartridge.update_programs(src)
update_shortcuts()
to_chat(user, "<span class='notice'>You insert [cartridge] into [src].</span>")
if(cartridge.radio)
cartridge.radio.hostpda = src
@@ -396,7 +387,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
var/obj/item/weapon/card/id/idcard = C
if(!idcard.registered_name)
to_chat(user, "<span class='notice'>\The [src] rejects the ID.</span>")
return
if(!owner)
owner = idcard.registered_name
@@ -404,31 +394,26 @@ var/global/list/obj/item/device/pda/PDAs = list()
ownrank = idcard.rank
name = "PDA-[owner] ([ownjob])"
to_chat(user, "<span class='notice'>Card scanned.</span>")
else
//Basic safety check. If either both objects are held by user or PDA is on ground and card is in hand.
if(((src in user.contents) && (C in user.contents)) || (istype(loc, /turf) && in_range(src, user) && (C in user.contents)) )
if( can_use(user) )//If they can still act.
id_check(user, 2)
to_chat(user, "<span class='notice'>You put the ID into \the [src]'s slot.</span>")
else if(istype(C, /obj/item/device/paicard) && !src.pai)
user.drop_item()
C.forceMove(src)
pai = C
to_chat(user, "<span class='notice'>You slot \the [C] into [src].</span>")
else if(istype(C, /obj/item/weapon/pen))
var/obj/item/weapon/pen/O = locate() in src
if(O)
to_chat(user, "<span class='notice'>There is already a pen in \the [src].</span>")
else
user.drop_item()
C.forceMove(src)
to_chat(user, "<span class='notice'>You slide \the [C] into \the [src].</span>")
/obj/item/device/pda/attack(mob/living/C as mob, mob/living/user as mob)
if (istype(C, /mob/living/carbon) && scanmode)
scanmode.scan_mob(C, user)
@@ -491,7 +476,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
if (t)
if(hidden_uplink && hidden_uplink.check_trigger(usr, lowertext(t), lowertext(lock_code)))
to_chat(usr, "The PDA softly beeps.")
close(usr)
else
t = sanitize(copytext(t, 1, 20))
code/modules/pda/ai.dm
-4
View File
@@ -23,7 +23,6 @@
var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger)
if(!M)
to_chat(usr, "<span class='warning'>Cannot use messenger!</span>")
var/list/plist = M.available_pdas()
if (plist)
var/c = input(usr, "Please select a PDA") as null|anything in sortList(plist)
@@ -42,7 +41,6 @@
var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger)
if(!M)
to_chat(usr, "<span class='warning'>Cannot use messenger!</span>")
var/HTML = "<html><head><title>AI PDA Message Log</title></head><body>"
for(var/index in M.tnote)
if(index["sent"])
@@ -64,7 +62,6 @@
to_chat(usr, "<span class='notice'>PDA sender/receiver toggled [(M.toff ? "Off" : "On")]!</span>")
/obj/item/device/pda/ai/verb/cmd_toggle_pda_silent()
set category = "AI IM"
set name = "Toggle Ringer"
@@ -76,7 +73,6 @@
M.notify_silent = !M.notify_silent
to_chat(usr, "<span class='notice'>PDA ringer toggled [(M.notify_silent ? "Off" : "On")]!</span>")
/obj/item/device/pda/ai/can_use()
var/mob/living/silicon/ai/AI = usr
if(!istype(AI))
code/modules/pda/app.dm
-1
View File
@@ -25,7 +25,6 @@
if(L)
to_chat(L, "\icon[pda] [message]")
nanomanager.update_user_uis(L, pda) // Update the receiving user's PDA UI so that they can see the new message
if(!notify_silent)
code/modules/pda/chatroom.dm
-1
View File
@@ -141,7 +141,6 @@ var/list/chatrooms = list(new /datum/chatroom("General Discussion"))
if(!.)
to_chat(usr, "<span class='notice'>ERROR: Messaging server is not responding.</span>")
/datum/data/pda/app/chatroom/Topic(href, list/href_list)
if(!pda.can_use())
return
code/modules/pda/messenger.dm
-4
View File
@@ -107,7 +107,6 @@
if(!P)
to_chat(usr, "PDA not found.")
var/datum/data/pda/messenger_plugin/plugin = locate(href_list["plugin"])
if(plugin && (plugin in pda.cartridge.messenger_plugins))
plugin.messenger = src
@@ -168,7 +167,6 @@
if(useMS && useTC) // only send the message if it's stable
if(useTC != 2) // Does our recipient have a broadcaster on their level?
to_chat(U, "ERROR: Cannot reach recipient.")
return
useMS.send_pda_message("[P.owner]","[pda.owner]","[t]")
tnote.Add(list(list("sent" = 1, "owner" = "[P.owner]", "job" = "[P.ownjob]", "message" = "[t]", "target" = "\ref[P]")))
@@ -185,7 +183,6 @@
else
to_chat(U, "<span class='notice'>ERROR: Messaging server is not responding.</span>")
/datum/data/pda/app/messenger/proc/available_pdas()
var/list/names = list()
var/list/plist = list()
@@ -193,7 +190,6 @@
if (toff)
to_chat(usr, "Turn on your receiver in order to send messages.")
return
for(var/A in PDAs)
code/modules/pda/radio.dm
-1
View File
@@ -32,7 +32,6 @@
/obj/item/radio/integrated/proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3,var/key4, var/value4, s_filter)
// to_chat(world, "Post: [freq]: [key]=[value], [key2]=[value2]")
var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
if(!frequency)
code/modules/pda/utilities.dm
-11
View File
@@ -69,10 +69,8 @@
var/mob/living/carbon/human/H = C
if (!istype(H.dna, /datum/dna))
to_chat(user, "<span class=notice>No fingerprints found on [H]</span>")
else
to_chat(user, "<span class=notice>[H]'s Fingerprints: [md5(H.dna.uni_identity)]</span>")
scan_blood(C, user)
/datum/data/pda/utility/scanmode/dna/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob)
@@ -81,17 +79,14 @@
/datum/data/pda/utility/scanmode/dna/proc/scan_blood(atom/A, mob/user)
if (!A.blood_DNA)
to_chat(user, "<span class=notice>No blood found on [A]</span>")
if(A.blood_DNA)
qdel(A.blood_DNA)
else
to_chat(user, "<span class=notice>Blood found on [A]. Analysing...</span>")
spawn(15)
for(var/blood in A.blood_DNA)
to_chat(user, "<span class=notice>Blood type: [A.blood_DNA[blood]]\nDNA: [blood]</span>")
/datum/data/pda/utility/scanmode/halogen
base_name = "Halogen Counter"
icon = "exclamation-circle"
@@ -114,17 +109,13 @@
if(A.reagents.reagent_list.len > 0)
var/reagents_length = A.reagents.reagent_list.len
to_chat(user, "<span class='notice'>[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found.</span>")
for(var/re in A.reagents.reagent_list)
to_chat(user, "<span class='notice'>\t [re]</span>")
else
to_chat(user, "<span class='notice'>No active chemical agents found in [A].</span>")
else
to_chat(user, "<span class='notice'>No significant chemical agents found in [A].</span>")
/datum/data/pda/utility/scanmode/gas
base_name = "Gas Scanner"
icon = "tachometer"
@@ -205,7 +196,5 @@
// Inform the user
to_chat(user, "<span class=notice>Paper scanned and OCRed to notekeeper.</span>")//concept of scanning paper copyright brainoblivion 2009
else
to_chat(user, "<span class=warning>Error scanning [A].</span>")