cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 23:21:53 +00: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

6
code/modules/computer3/bios.dm
View File

@@ -25,17 +25,14 @@
if(istype(user,/mob/living/silicon))
if(!program.ai_allowed)
to_chat(user, "\blue You are forbidden from accessing this program.")
return 0
else
if(program.human_controls)
if(!ishuman(user))
to_chat(user, "\red Your body can't work the controls!")
return 0
if(user.restrained())
to_chat(user, "\red You need a free hand!")
return 0
if(!in_range(src,user))
@@ -43,7 +40,6 @@
if(ishuman(user) && istype(user.get_active_hand(),/obj/item/tk_grab))
if(program.human_controls)
to_chat(user, "\red It's too complicated to work at a distance!")
return 0
add_fingerprint(user)
user.set_machine(src)
@@ -120,7 +116,6 @@
if(PROG_CRASH)
if(usr)
to_chat(usr, "\red The program crashed!")
usr << browse(null,"\ref[src]")
Reset()
@@ -154,7 +149,6 @@
else
if(usr)
to_chat(usr, "\red The program crashed!")
usr << browse(null,"\ref[src]")
testing("computer/Crash() - unknown error code [errorcode]")
Reset()

27
code/modules/computer3/buildandrepair.dm
View File

@@ -83,20 +83,17 @@
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 20, target = src))
to_chat(user, "\blue You wrench the frame into place.")
src.anchored = 1
src.state = 1
if(istype(P, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = P
if(!WT.remove_fuel(0, user))
to_chat(user, "The welding tool must be on to complete this task.")
return
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
if(do_after(user, 20, target = src))
if(!src || !WT.isOn()) return
to_chat(user, "\blue You deconstruct the frame.")
new /obj/item/stack/sheet/metal( src.loc, 5 )
qdel(src)
if(1)
@@ -104,7 +101,6 @@
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 20, target = src))
to_chat(user, "\blue You unfasten the frame.")
src.anchored = 0
src.state = 0
if(istype(P, /obj/item/weapon/circuitboard) && !circuit)
@@ -112,24 +108,20 @@
if(B.board_type == "computer")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
to_chat(user, "\blue You place the circuit board inside the frame.")
src.icon_state = "1"
src.circuit = P
user.drop_item()
P.loc = src
else
to_chat(user, "\red This frame does not accept circuit boards of this type!")
if(istype(P, /obj/item/weapon/screwdriver) && circuit)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
to_chat(user, "\blue You screw the circuit board into place.")
src.state = 2
src.icon_state = "2"
if(istype(P, /obj/item/weapon/crowbar) && circuit)
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
to_chat(user, "\blue You remove the circuit board.")
src.state = 1
src.icon_state = "0"
circuit.loc = src.loc
@@ -138,7 +130,6 @@
if(istype(P, /obj/item/weapon/screwdriver) && circuit)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
to_chat(user, "\blue You unfasten the circuit board.")
src.state = 1
src.icon_state = "1"
@@ -148,12 +139,10 @@
if(do_after(10, target = src))
battery.loc = loc
to_chat(user, "\blue You remove [battery].")
battery = null
else
to_chat(user, "\red There's no battery to remove!")
if(istype(P, /obj/item/weapon/stock_parts/cell))
if(!battery)
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
@@ -161,12 +150,10 @@
battery = P
P.loc = src
to_chat(user, "\blue You insert [battery].")
else
to_chat(user, "\red There's already \an [battery] in [src]!")
if(istype(P, /obj/item/stack/cable_coil))
if(P:amount >= 5)
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
@@ -175,18 +162,15 @@
P:amount -= 5
if(!P:amount) qdel(P)
to_chat(user, "\blue You add cables to the frame.")
src.state = 3
src.icon_state = "3"
if(3)
if(istype(P, /obj/item/weapon/wirecutters))
if(components.len)
to_chat(user, "There are parts in the way!")
return
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
to_chat(user, "\blue You remove the cables.")
src.state = 2
src.icon_state = "2"
var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc )
@@ -202,21 +186,18 @@
if(P)
P:use(2)
to_chat(user, "\blue You put in the glass panel.")
src.state = 4
src.icon_state = "4"
if(4)
if(istype(P, /obj/item/weapon/crowbar))
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
to_chat(user, "\blue You remove the glass panel.")
src.state = 3
src.icon_state = "3"
new /obj/item/stack/sheet/glass( src.loc, 2 )
if(istype(P, /obj/item/weapon/screwdriver))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
to_chat(user, "\blue You connect the monitor.")
var/obj/machinery/computer3/B = new src.circuit.build_path ( src.loc, built=1 )
/*if(circuit.powernet) B:powernet = circuit.powernet
if(circuit.id) B:id = circuit.id
@@ -240,7 +221,6 @@
/obj/structure/computer3frame/proc/remove_peripheral(var/obj/item/I = null)
if(!components || !components.len)
to_chat(usr, "\red There are no components in [src] to take out!")
return 0
if(!I)
I = input(usr, "Remove which component?","Remove component", null) as null|obj in components
@@ -280,19 +260,16 @@
warning("Erronous component in computerframe/remove_peripheral: [I]")
I.loc = loc
to_chat(usr, "\blue You remove [I]")
return 1
return 0
/obj/structure/computer3frame/proc/insert_peripheral(var/obj/item/I)
if(components.len >= max_components)
to_chat(usr, "There isn't room in [src] for another component!")
return 0
switch(I.type)
if(/obj/item/part/computer/storage/hdd)
if(hdd)
to_chat(usr, "There is already \an [hdd] in [src]!")
return 0
hdd = I
components += hdd
@@ -300,7 +277,6 @@
if(/obj/item/part/computer/storage/removable)
if(floppy)
to_chat(usr, "There is already \an [floppy] in [src]!")
return 0
floppy = I
components += floppy
@@ -308,7 +284,6 @@
if(/obj/item/part/computer/networking/radio)
if(radio)
to_chat(usr, "There is already \an [radio] in [src]!")
return 0
radio = I
components += radio
@@ -316,7 +291,6 @@
if(/obj/item/part/computer/networking/cameras)
if(camnet)
to_chat(usr, "There is already \an [camnet] in [src]!")
return 0
camnet = I
components += camnet
@@ -326,4 +300,3 @@
to_chat(usr, "There is already \an [net] in [src]!")

26
code/modules/computer3/component.dm
View File

@@ -78,12 +78,10 @@
emag_act(user as mob)
if(!writer)
to_chat(usr, "You insert \the card, and the computer grinds, sparks, and beeps. After a moment, the card ejects itself.")
computer.emagged = 1
return 1
else
to_chat(usr, "You are unable to insert \the card, as the reader slot is occupied")
return 0
attackby(var/obj/item/I as obj, var/mob/user as mob, params)
@@ -101,7 +99,6 @@
// This shouldn't happen, just in case..
if(slot == 2 && !dualslot)
to_chat(usr, "This device has only one card slot")
return 0
var/mob/living/L = usr
@@ -109,31 +106,23 @@
if(1)
if(equip_to_reader(card, L))
to_chat(usr, "You insert the card into reader slot")
else
to_chat(usr, "There is already something in the reader slot.")
if(2)
if(equip_to_writer(card, L))
to_chat(usr, "You insert the card into writer slot")
else
to_chat(usr, "There is already something in the reader slot.")
if(3)
if(equip_to_reader(card, L))
to_chat(usr, "You insert the card into reader slot")
else if (equip_to_writer(card, L) && dualslot)
to_chat(usr, "You insert the card into writer slot")
else if (dualslot)
to_chat(usr, "There is already something in both slots.")
else
to_chat(usr, "There is already something in the reader slot.")
// Usage of insert() preferred, as it also tells result to the user.
proc/equip_to_reader(var/obj/item/weapon/card/card, var/mob/living/L)
if(!reader)
@@ -159,48 +148,36 @@
if(1)
if (remove_reader(L))
to_chat(L, "You remove the card from reader slot")
else
to_chat(L, "There is no card in the reader slot")
if(2)
if (remove_writer(L))
to_chat(L, "You remove the card from writer slot")
else
to_chat(L, "There is no card in the writer slot")
if(3)
if (remove_reader(L))
if (remove_writer(L))
to_chat(L, "You remove cards from both slots")
else
to_chat(L, "You remove the card from reader slot")
else
if(remove_writer(L))
to_chat(L, "You remove the card from writer slot")
else
to_chat(L, "There are no cards in both slots")
if(4)
if (!remove_reader(L))
if (remove_writer(L))
to_chat(L, "You remove the card from writer slot")
else if (!dualslot)
to_chat(L, "There is no card in the reader slot")
else
to_chat(L, "There are no cards in both slots")
else
to_chat(L, "You remove the card from reader slot")
proc/remove_reader(var/mob/living/L)
if(reader)
reader.loc = loc
@@ -263,7 +240,6 @@
if(slot == 1) // 1: writer
if(writer != null)
to_chat(usr, "There's already a card in that slot!")
return 0
var/mob/living/L = usr
L.drop_item()
@@ -273,7 +249,6 @@
else if(slot == 2) // 2: reader
if(reader != null)
to_chat(usr, "There's already a card in that slot!")
return 0
var/mob/living/L = usr
L.drop_item()
@@ -283,7 +258,6 @@
else // 0: auto
if(reader && writer)
to_chat(usr, "Both slots are full!")
return 0
var/mob/living/L = usr
L.drop_item()

4
code/modules/computer3/computer.dm
View File

@@ -78,12 +78,10 @@
if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living))
to_chat(usr, "\red You can't do that.")
return
if(!Adjacent(usr))
to_chat(usr, "You can't reach it.")
return
Reset()
@@ -369,7 +367,6 @@
to_chat(user, "\The [src] won't boot!")
attack_ai(var/mob/user as mob) // copypasta because server racks lose attack_hand()
if(stat)
Reset()
@@ -395,7 +392,6 @@
to_chat(user, "\The [src] won't boot!")
interact()
if(stat)
Reset()

2
code/modules/computer3/computers/atmos_alert.dm
View File

@@ -98,7 +98,6 @@
for(var/zone in priority_alarms)
if(ckey(zone) == removing_zone)
to_chat(usr, "\green Priority Alert for area [zone] cleared.")
priority_alarms -= zone
if("minor_clear" in href_list)
@@ -106,7 +105,6 @@
for(var/zone in minor_alarms)
if(ckey(zone) == removing_zone)
to_chat(usr, "\green Minor Alert for area [zone] cleared.")
minor_alarms -= zone
computer.updateUsrDialog()

1
code/modules/computer3/computers/camera.dm
View File

@@ -317,7 +317,6 @@
interact()
else
to_chat(usr, "The screen turns to static.")
return
// Atlantis: Required for camnetkeys to work.

2
code/modules/computer3/computers/cloning.dm
View File

@@ -80,7 +80,6 @@
proc/RecordsList()
var/dat = "<h3>Current records</h3>"
to_chat(dat += topic_link(src,"menu=1",", Back") + "<br><br>")
for(var/datum/data/record/R in records)
dat += "<h4>[R.fields["name"]]</h4>Scan ID [R.fields["id"]] " + topic_link(src,"view_rec=\ref[R]","View Record")
return dat
@@ -89,7 +88,6 @@
var/dat = "<h3>Selected Record</h3>"
to_chat(dat += topic_link(src,"menu=2",", Back") + "<br><br>")
if (!active_record)
dat += "<font class='bad'>Record not found.</font>"
else

9
code/modules/computer3/computers/communications.dm
View File

@@ -61,7 +61,6 @@
return
if (!(computer.z in config.station_levels))
to_chat(usr, "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!")
return
if("main" in href_list)
@@ -105,17 +104,14 @@
tmp_alertlevel = 0
else:
to_chat(usr, "You are not authorized to do this.")
tmp_alertlevel = 0
state = STATE_DEFAULT
else
to_chat(usr, "You need to swipe your ID.")
if("announce" in href_list)
if(authenticated==2)
if(message_cooldown)
to_chat(usr, "Please allow at least one minute to pass between announcements")
return
var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement")
if(!input || !interactable())
@@ -197,14 +193,12 @@
if(authenticated==2)
if(centcomm_message_cooldown)
to_chat(usr, "Arrays recycling. Please stand by.")
return
var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")
if(!input || !interactable())
return
Centcomm_announce(input, usr)
to_chat(usr, "Message transmitted.")
log_say("[key_name(usr)] has made a Centcomm announcement: [input]")
centcomm_message_cooldown = 1
spawn(600)//10 minute cooldown
@@ -216,14 +210,12 @@
if((authenticated==2) && (computer.emagged))
if(centcomm_message_cooldown)
to_chat(usr, "Arrays recycling. Please stand by.")
return
var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")
if(!input || !interactable())
return
Syndicate_announce(input, usr)
to_chat(usr, "Message transmitted.")
log_say("[key_name(usr)] has made a Syndicate announcement: [input]")
centcomm_message_cooldown = 1
spawn(600)//10 minute cooldown
@@ -231,7 +223,6 @@
if("RestoreBackup" in href_list)
to_chat(usr, "Backup routing data restored!")
computer.emagged = 0
computer.updateDialog()

11
code/modules/computer3/computers/law.dm
View File

@@ -18,17 +18,14 @@
opened = !opened
if(opened)
to_chat(usr, "\blue The access panel is now open.")
else
to_chat(usr, "\blue The access panel is now closed.")
return
attackby(obj/item/weapon/aiModule/module as obj, mob/user as mob, params)
if (user.z > 6)
to_chat(user, "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!")
return
if(istype(module, /obj/item/weapon/aiModule))
module.install(src)
@@ -39,21 +36,17 @@
attack_hand(var/mob/user as mob)
if(src.stat & NOPOWER)
to_chat(usr, "The upload computer has no power!")
return
if(src.stat & BROKEN)
to_chat(usr, "The upload computer is broken!")
return
src.current = select_active_ai(user)
if (!src.current)
to_chat(usr, "No active AIs detected.")
else
to_chat(usr, "[src.current.name] selected for law changes.")
return
@@ -75,19 +68,15 @@
attack_hand(var/mob/user as mob)
if(src.stat & NOPOWER)
to_chat(usr, "The upload computer has no power!")
return
if(src.stat & BROKEN)
to_chat(usr, "The upload computer is broken!")
return
src.current = freeborg()
if (!src.current)
to_chat(usr, "No free cyborgs detected.")
else
to_chat(usr, "[src.current.name] selected for law changes.")
return

1
code/modules/computer3/computers/medical.dm
View File

@@ -51,7 +51,6 @@
return
if (computer.z > 6)
to_chat(usr, "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!")
return
var/dat

5
code/modules/computer3/computers/message.dm
View File

@@ -221,11 +221,9 @@
proc/BruteForce(mob/usr as mob)
if(isnull(linkedServer))
to_chat(usr, "<span class='warning'>Could not complete brute-force: Linked Server Disconnected!</span>")
else
var/currentKey = src.linkedServer.decryptkey
to_chat(usr, "<span class='warning'>Brute-force completed! The key is '[currentKey]'.</span>")
src.hacking = 0
src.active_state = normal_icon
src.screen = 0 // Return the screen back to normal
@@ -418,7 +416,6 @@
var/mob/living/carbon/human/H = customrecepient.loc
to_chat(H, "\icon[customrecepient] <b>Message from [customsender] ([customjob]), </b>\"[custommessage]\" (<a href='byond:)//?src=\ref[src];choice=Message;skiprefresh=1;target=\ref[src]'>Reply</a>)"
log_pda("[usr] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]")
customrecepient.overlays.Cut()
customrecepient.overlays += image('icons/obj/pda.dmi', "pda-r")
@@ -434,7 +431,6 @@
var/mob/living/carbon/human/H = customrecepient.loc
to_chat(H, "\icon[customrecepient] <b>Message from [PDARec.owner] ([customjob]), </b>\"[custommessage]\" (<a href='byond:)//?src=\ref[customrecepient];choice=Message;skiprefresh=1;target=\ref[PDARec]'>Reply</a>)"
log_pda("[usr] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]")
customrecepient.overlays.Cut()
customrecepient.overlays += image('icons/obj/pda.dmi', "pda-r")
@@ -451,7 +447,6 @@
// to_chat(usr, href_list["select"])
if ("back" in href_list)
src.screen = 0
interact()

1
code/modules/computer3/computers/prisoner.dm
View File

@@ -96,7 +96,6 @@
log_say("PrisonComputer3 message: [key_name(usr)]->[key_name(R)] : [warning]")
to_chat(R, "\green You hear a voice in your head saying: '[warning]'")
interact()
return

11
code/modules/computer3/computers/prisonshuttle.dm
View File

@@ -47,13 +47,11 @@ var/prison_shuttle_timeleft = 0
if (src.stat & BROKEN)
to_chat(user, "\blue The broken glass falls out.")
new /obj/item/trash/shard( src.loc )
A.state = 3
A.icon_state = "3"
else
to_chat(user, "\blue You disconnect the monitor.")
A.state = 4
A.icon_state = "4"
@@ -61,7 +59,6 @@ var/prison_shuttle_timeleft = 0
else if(istype(I,/obj/item/card/emag) && (!hacked))
hacked = 1
to_chat(user, "\blue You disable the lock.")
else
return src.attack_hand(user)
@@ -69,11 +66,9 @@ var/prison_shuttle_timeleft = 0
attack_hand(var/mob/user as mob)
if(!src.allowed(user) && (!hacked))
to_chat(user, "\red Access Denied.")
return
if(prison_break)
to_chat(user, "\red Unable to locate shuttle.")
return
if(..())
return
@@ -106,12 +101,10 @@ var/prison_shuttle_timeleft = 0
if (href_list["sendtodock"])
if (!prison_can_move())
to_chat(usr, "\red The prison shuttle is unable to leave.")
return
if(!prison_shuttle_at_station|| prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return
post_signal("prison")
to_chat(usr, "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.")
src.temp += "Shuttle sent.<BR><BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
src.updateUsrDialog()
prison_shuttle_moving_to_prison = 1
@@ -122,12 +115,10 @@ var/prison_shuttle_timeleft = 0
else if (href_list["sendtostation"])
if (!prison_can_move())
to_chat(usr, "\red The prison shuttle is unable to leave.")
return
if(prison_shuttle_at_station || prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return
post_signal("prison")
to_chat(usr, "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.")
src.temp += "Shuttle sent.<BR><BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
src.updateUsrDialog()
prison_shuttle_moving_to_station = 1
@@ -196,7 +187,6 @@ var/prison_shuttle_timeleft = 0
if (!prison_can_move())
to_chat(usr, "\red The prison shuttle is unable to leave.")
return
var/area/start_location = locate(/area/shuttle/prison/prison)
@@ -226,7 +216,6 @@ var/prison_shuttle_timeleft = 0
if (!prison_can_move())
to_chat(usr, "\red The prison shuttle is unable to leave.")
return
var/area/start_location = locate(/area/shuttle/prison/station)

6
code/modules/computer3/computers/robot.dm
View File

@@ -127,7 +127,6 @@
else
to_chat(usr, "\red Access Denied.")
if ("stop" in href_list)
src.temp = {"
Stop Robot Destruction Sequence?<BR>
@@ -161,7 +160,6 @@
if(R && istype(R))
if(R.mind && R.mind.special_role && R.emagged)
to_chat(R, "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered.")
R.ResetSecurityCodes()
else
@@ -171,7 +169,6 @@
else
to_chat(usr, "\red Access Denied.")
if ("stopbot" in href_list)
if(computer.allowed(usr))
var/mob/living/silicon/robot/R = locate(href_list["stopbot"])
@@ -186,17 +183,14 @@
// R.cell.charge = R.lockcharge
R.lockcharge = !R.lockcharge
to_chat(R, "Your lockdown has been lifted!")
else
R.lockcharge = !R.lockcharge
// R.cell.charge = 0
to_chat(R, "You have been locked down!")
else
to_chat(usr, "\red Access Denied.")
if ("magbot" in href_list)
if(computer.allowed(usr))
var/mob/living/silicon/robot/R = locate(href_list["magbot"])

4
code/modules/computer3/computers/scanconsole.dm
View File

@@ -359,7 +359,6 @@
if(!viable)
return "No viable occupant detected."
to_chat(var/dat = topic_link(src,"mode=0",", Main Menu") + "<br>")
dat += "<h3>Modify Unique Identifier</h3>"
dat += "<div align='center'>Unique Identifier:<br />[getblockstring(ui=1)]<br /><br />"
@@ -374,7 +373,6 @@
if(!viable)
return "No viable occupant detected."
to_chat(var/dat = topic_link(src,"mode=0",", Main Menu") + "<br>")
dat += "<h3>Modify Structural Enzymes</h3>"
dat += "<div align='center'>Structural Enzymes: [getblockstring(ui=0)]<br /><br />"
dat += "Selected Block: " + block_plus_minus("seblock",se_block,1,MAX_SEBLOCK) + "<br /><br />"
@@ -385,7 +383,6 @@
proc/emitter_menu()
to_chat(var/dat = topic_link(src,"mode=0",", Main Menu") + "<br>")
dat += "<h3>Radiation Emitter Settings</h3>"
if (viable)
dat += topic_link(src,"pulse","Pulse Radiation")
@@ -746,7 +743,6 @@
human_occupant.reagents.add_reagent("inaprovaline", round(REJUVENATORS_MAX - human_occupant.reagents.get_reagent_amount("inaprovaline")))
// to_chat(usr, text("Occupant now has [] units of rejuvenation in his/her bloodstream.", human_occupant.reagents.get_reagent_amount("inaprovaline")))
////////////////////////////////////////////////////////
if (href_list["strucmenuplus"])
if (se_block < 14)

1
code/modules/computer3/computers/security.dm
View File

@@ -59,7 +59,6 @@
if (computer.z > 6)
to_chat(usr, "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!")
return
var/dat

8
code/modules/computer3/computers/shuttle.dm
View File

@@ -20,18 +20,15 @@
W = pda.id
if (!W:access) //no access
to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
return
var/list/cardaccess = W:access
if(!istype(cardaccess, /list) || !cardaccess.len) //no access
to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
return
if(!(access_heads in W:access)) //doesn't have this access
to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
return 0
var/choice = alert(user, text("Would you like to (un)authorize a shortened launch time? [] authorization\s are still needed. Use abort to cancel all authorizations.", src.auth_need - src.authorized.len), "Shuttle Launch", "Authorize", "Repeal", "Abort")
@@ -45,12 +42,10 @@
message_admins("[key_name_admin(user)] has authorized early shuttle launch")
log_game("[user.ckey] has authorized early shuttle launch")
to_chat(world, text("\blue <B>Alert: [] authorizations needed until shuttle is launched early</B>", src.auth_need - src.authorized.len))
else
message_admins("[key_name_admin(user)] has launched the shuttle")
log_game("[user.ckey] has launched the shuttle early")
to_chat(world, "\blue <B>Alert: Shuttle launch time shortened to 10 seconds!</B>")
emergency_shuttle.online = 1
emergency_shuttle.settimeleft(10)
//src.authorized = null
@@ -61,10 +56,8 @@
src.authorized -= W:registered_name
to_chat(world, text("\blue <B>Alert: [] authorizations needed until shuttle is launched early</B>", src.auth_need - src.authorized.len))
if("Abort")
to_chat(world, "\blue <B>All authorizations to shorting time for shuttle launch have been revoked!</B>")
src.authorized.len = 0
src.authorized = list( )
return
@@ -77,7 +70,6 @@
switch(choice)
if("Launch")
to_chat(world, "\blue <B>Alert: Shuttle launch time shortened to 10 seconds!</B>")
emergency_shuttle.settimeleft( 10 )
emagged = 1
if("Cancel")

8
code/modules/computer3/computers/specops_shuttle.dm
View File

@@ -59,7 +59,6 @@ var/specops_shuttle_timeleft = 0
if (!specops_can_move())
to_chat(usr, "\red The Special Operations shuttle is unable to leave.")
return
//Begin Marauder launchpad.
@@ -156,7 +155,6 @@ var/specops_shuttle_timeleft = 0
var/mob/M = locate(/mob) in T
to_chat(M, "\red You have arrived to [station_name]. Commence operation!")
/proc/specops_can_move()
if(specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return 0
else return 1
@@ -173,19 +171,16 @@ var/specops_shuttle_timeleft = 0
/obj/machinery/computer3/specops_shuttle/attackby(I as obj, user as mob, params)
if(istype(I,/obj/item/card/emag))
to_chat(user, "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals.")
else
return attack_hand(user)
/obj/machinery/computer3/specops_shuttle/attack_hand(var/mob/user as mob)
if(!allowed(user))
to_chat(user, "\red Access Denied.")
return
if (sent_strike_team == 0)
to_chat(usr, "\red The strike team has not yet deployed.")
return
if(..())
@@ -220,7 +215,6 @@ var/specops_shuttle_timeleft = 0
if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
to_chat(usr, "\blue Central Command will not allow the Special Operations shuttle to return.")
return
else if (href_list["sendtostation"])
@@ -228,12 +222,10 @@ var/specops_shuttle_timeleft = 0
if (!specops_can_move())
to_chat(usr, "\red The Special Operations shuttle is unable to leave.")
return
to_chat(usr, "\blue The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds.")
temp += "Shuttle departing.<BR><BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
updateUsrDialog()

1
code/modules/computer3/computers/syndicate_shuttle.dm
View File

@@ -48,7 +48,6 @@
/obj/machinery/computer3/syndicate_station/attack_hand(mob/user as mob)
if(!allowed(user))
to_chat(user, "\red Access Denied")
return
user.set_machine(src)

8
code/modules/computer3/computers/syndicate_specops_shuttle.dm
View File

@@ -59,7 +59,6 @@ var/syndicate_elite_shuttle_timeleft = 0
if (!syndicate_elite_can_move())
to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.")
return
sleep(600)
@@ -169,7 +168,6 @@ var/syndicate_elite_shuttle_timeleft = 0
var/mob/M = locate(/mob) in T
to_chat(M, "\red You have arrived to [station_name]. Commence operation!")
/proc/syndicate_elite_can_move()
if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0
else return 1
@@ -186,19 +184,16 @@ var/syndicate_elite_shuttle_timeleft = 0
/obj/machinery/computer3/syndicate_elite_shuttle/attackby(I as obj, user as mob, params)
if(istype(I,/obj/item/card/emag))
to_chat(user, "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals.")
else
return attack_hand(user)
/obj/machinery/computer3/syndicate_elite_shuttle/attack_hand(var/mob/user as mob)
if(!allowed(user))
to_chat(user, "\red Access Denied.")
return
// if (sent_syndicate_strike_team == 0)
// to_chat(usr, "\red The strike team has not yet deployed.")
// return
if(..())
@@ -232,7 +227,6 @@ var/syndicate_elite_shuttle_timeleft = 0
if(!syndicate_elite_shuttle_at_station|| syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
to_chat(usr, "\blue The Syndicate will not allow the Elite Squad shuttle to return.")
return
else if (href_list["sendtostation"])
@@ -240,12 +234,10 @@ var/syndicate_elite_shuttle_timeleft = 0
if (!specops_can_move())
to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.")
return
to_chat(usr, "\blue The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.")
temp = "Shuttle departing.<BR><BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
updateUsrDialog()

13
code/modules/computer3/laptop.dm
View File

@@ -36,17 +36,14 @@
if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living))
to_chat(usr, "\red You can't do that.")
return
if(!Adjacent(usr))
to_chat(usr, "You can't reach it.")
return
if(!istype(loc,/turf))
to_chat(usr, "[src] is too bulky! You'll have to set it down.")
return
if(!stored_computer)
@@ -54,7 +51,6 @@
for(var/obj/O in contents)
O.forceMove(loc)
to_chat(usr, "\The [src] crumbles to pieces.")
spawn(5)
qdel(src)
return
@@ -67,7 +63,6 @@
loc = null
to_chat(usr, "You open \the [src].")
spawn(5)
stored_computer.manipulating = 0
qdel(src)
@@ -75,7 +70,6 @@
to_chat(usr, "\red You are already opening the computer!")
AltClick()
if(Adjacent(usr))
open_computer()
@@ -102,7 +96,6 @@
if(!C)
to_chat(usr, "There is no card port on the laptop.")
return
var/obj/item/weapon/card/id/card
@@ -112,11 +105,9 @@
card = C.writer
else
to_chat(usr, "There is nothing to remove from the laptop card port.")
return
to_chat(usr, "You remove [card] from the laptop.")
C.remove(card)
@@ -145,12 +136,10 @@
if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living))
to_chat(usr, "\red You can't do that.")
return
if(!Adjacent(usr))
to_chat(usr, "You can't reach it.")
return
if(istype(loc,/obj/item/device/laptop))
@@ -162,7 +151,6 @@
if(stat&BROKEN)
to_chat(usr, "\The [src] is broken! You can't quite get it closed.")
return
if(!portable)
@@ -175,7 +163,6 @@
stat |= MAINT
to_chat(usr, "You close \the [src].")
auto_use_power()
if(stat&MAINT)
return

6
code/modules/computer3/lapvend.dm
View File

@@ -57,7 +57,6 @@
L.loc = src
vendmode = 3
to_chat(usr, "<span class='notice'>You slot your [L.name] into \The [src.name]</span>")
else
..()
@@ -264,14 +263,11 @@
power = 0
else
to_chat(usr, "\icon[src]<span class='warning'>You don't have that much money!</span>")
else
to_chat(usr, "\icon[src]<span class='warning'>Unable to access account. Check security settings and try again.</span>")
else
to_chat(usr, "\icon[src]<span class='warning'>Unable to access vendor account. Please record the machine ID and call CentComm Support.</span>")
/obj/machinery/lapvend/proc/total()
var/total = 0
@@ -410,7 +406,5 @@
else
to_chat(usr, "\icon[src]<span class='warning'>Unable to access account. Check security settings and try again.</span>")
else
to_chat(usr, "\icon[src]<span class='warning'>Unable to access vendor account. Please record the machine ID and call CentComm Support.</span>")

3
code/modules/computer3/storage.dm
View File

@@ -117,18 +117,15 @@
attackby(obj/O as obj, mob/user as mob, params)
if(inserted && istype(O,/obj/item/weapon/pen))
to_chat(usr, "You use [O] to carefully pry [inserted] out of [src].")
eject_disk(forced = 1)
return
if(istype(O,/obj/item/weapon/disk/file))
if(inserted)
to_chat(usr, "There's already a disk in [src]!")
return
to_chat(usr, "You insert [O] into [src].")
usr.drop_item()
O.loc = src
inserted = O

1
code/modules/computer3/upload/programs.dm
View File

@@ -9,6 +9,5 @@
return 0
if(!computer.net)
to_chat(usr, "An indecipherable set of code flicks across the screen. Nothing else happens.")
return
var/list/results = computer.net.get_machines