cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +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/paperwork/carbonpaper.dm
-2
View File
@@ -42,11 +42,9 @@
copy.fields = c.fields
copy.updateinfolinks()
to_chat(usr, "<span class='notice'>You tear off the carbon-copy!</span>")
c.copied = 1
copy.iscopy = 1
copy.update_icon()
c.update_icon()
else
to_chat(usr, "There are no more carbon copies attached to this paper!")
code/modules/paperwork/clipboard.dm
-3
View File
@@ -50,7 +50,6 @@
if(istype(W, /obj/item/weapon/paper))
toppaper = W
to_chat(user, "<span class='notice'>You clip the [W] onto \the [src].</span>")
update_icon()
else if(istype(toppaper) && istype(W, /obj/item/weapon/pen))
@@ -105,7 +104,6 @@
haspen = W
to_chat(usr, "<span class='notice'>You slot the pen into \the [src].</span>")
else if(href_list["write"])
var/obj/item/weapon/P = locate(href_list["write"])
@@ -149,7 +147,6 @@
toppaper = P
to_chat(usr, "<span class='notice'>You move [P.name] to the top.</span>")
//Update everything
attack_self(usr)
update_icon()
code/modules/paperwork/faxmachine.dm
-5
View File
@@ -45,11 +45,9 @@ var/list/alldepartments = list()
if(!emagged)
emagged = 1
to_chat(user, "<span class='notice'>The transmitters realign to an unknown source!</span>")
else
to_chat(user, "<span class='warning'>You swipe the card through [src], but nothing happens.</span>")
/obj/machinery/photocopier/faxmachine/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
var/data[0]
if(scan)
@@ -103,7 +101,6 @@ var/list/alldepartments = list()
copyitem.loc = usr.loc
usr.put_in_hands(copyitem)
to_chat(usr, "<span class='notice'>You take \the [copyitem] out of \the [src].</span>")
copyitem = null
else
var/obj/item/I = usr.get_active_hand()
@@ -112,7 +109,6 @@ var/list/alldepartments = list()
copyitem = I
I.loc = src
to_chat(usr, "<span class='notice'>You insert \the [I] into \the [src].</span>")
flick(insert_anim, src)
if(href_list["scan"])
@@ -270,4 +266,3 @@ var/list/alldepartments = list()
for(var/client/C in admins)
if(R_EVENT & C.holder.rights)
to_chat(C, msg)
code/modules/paperwork/filingcabinet.dm
-6
View File
@@ -36,7 +36,6 @@
/obj/structure/filingcabinet/attackby(obj/item/P as obj, mob/user as mob, params)
if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder) || istype(P, /obj/item/weapon/photo) || istype(P, /obj/item/weapon/paper_bundle) || istype(P, /obj/item/documents))
to_chat(user, "<span class='notice'>You put [P] in [src].</span>")
user.drop_item()
P.loc = src
icon_state = "[initial(icon_state)]-open"
@@ -47,16 +46,13 @@
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
anchored = !anchored
to_chat(user, "<span class='notice'>You [anchored ? "wrench" : "unwrench"] \the [src].</span>")
else
to_chat(user, "<span class='notice'>You can't put [P] in [src]!</span>")
/obj/structure/filingcabinet/attack_hand(mob/user as mob)
if(contents.len <= 0)
to_chat(user, "<span class='notice'>\The [src] is empty.</span>")
return
user.set_machine(src)
@@ -82,11 +78,9 @@
if(prob(25))
step_rand(I)
to_chat(user, "<span class='notice'>You pull \a [I] out of [src] at random.</span>")
return
to_chat(user, "<span class='notice'>You find nothing in [src].</span>")
/obj/structure/filingcabinet/Topic(href, href_list)
if(href_list["retrieve"])
usr << browse("", "window=filingcabinet") // Close the menu
code/modules/paperwork/folders.dm
-1
View File
@@ -33,7 +33,6 @@
user.drop_item()
W.loc = src
to_chat(user, "<span class='notice'>You put the [W] into \the [src].</span>")
update_icon()
else if(istype(W, /obj/item/weapon/pen))
var/n_name = input(usr, "What would you like to label the folder?", "Folder Labelling", null) as text|null
code/modules/paperwork/frames.dm
-8
View File
@@ -71,7 +71,6 @@
update_icon()
else
to_chat(user, "<span class=notice>There is nothing to remove from \the [src].</span>")
else if(istype(I, /obj/item/weapon/crowbar))
playsound(src, 'sound/items/Crowbar.ogg', 100, 1)
user.visible_message("<span class=warning>[user] breaks down \the [src].</span>", "<span class=warning>You break down \the [src].</span>")
@@ -91,7 +90,6 @@
update_icon()
else
to_chat(user, "<span class=notice>\The [src] already contains \a [displayed].</span>")
else
return ..()
@@ -106,17 +104,14 @@
for(var/obj/O in user.loc.contents) //Let's see if it already has a poster on it or too much stuff
if(istype(O, /obj/structure/sign))
to_chat(user, "<span class='notice'>\The [T] is far too cluttered to place \a [src]!</span>")
return
stuff_on_wall++
if(stuff_on_wall >= 4)
to_chat(user, "<span class='notice'>\The [T] is far too cluttered to place \a [src]!</span>")
return
to_chat(user, "<span class='notice'>You start place \the [src] on \the [T].</span>")
var/px = 0
var/py = 0
var/newdir = getRelativeDirection(user, T)
@@ -132,7 +127,6 @@
px = -32
else
to_chat(user, "<span class='notice'>You cannot reach \the [T] from here!</span>")
return
user.unEquip(src)
@@ -233,11 +227,9 @@
if(istype(I, /obj/item/weapon/grenade) || istype(I, /obj/item/weapon/c4))
if(explosive)
to_chat(user, "<span class='warning'>There is already a device attached behind \the [src], remove it first.</span>")
return 1
if(!tilted)
to_chat(user, "<span class='warning'>\The [src] needs to be already tilted before being rigged with \the [I].</span>")
return 1
user.visible_message("<span class=warning>[user] is fiddling around behind \the [src].</span>", "<span class=warning>You begin to secure \the [I] behind \the [src].</span>")
if(do_after(user, 150, target = src))
code/modules/paperwork/handlabeler.dm
-10
View File
@@ -16,27 +16,21 @@
if(!labels_left)
to_chat(user, "<span class='notice'>No labels left.</span>")
return
if(!label || !length(label))
to_chat(user, "<span class='notice'>No text set.</span>")
return
if(length(A.name) + length(label) > 64)
to_chat(user, "<span class='notice'>Label too big.</span>")
return
if(ishuman(A))
to_chat(user, "<span class='notice'>You can't label humans.</span>")
return
if(issilicon(A))
to_chat(user, "<span class='notice'>You can't label cyborgs.</span>")
return
if(istype(A, /obj/item/weapon/reagent_containers/glass))
to_chat(user, "<span class='notice'>The label can't stick to the [A.name]. (Try using a pen)</span>")
return
user.visible_message("<span class='notice'>[user] labels [A] as [label].</span>", \
@@ -48,16 +42,12 @@
icon_state = "labeler[mode]"
if(mode)
to_chat(user, "<span class='notice'>You turn on \the [src].</span>")
//Now let them chose the text.
var/str = copytext(reject_bad_text(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
to_chat(user, "<span class='notice'>Invalid text.</span>")
return
label = str
to_chat(user, "<span class='notice'>You set the text to '[str]'.</span>")
else
to_chat(user, "<span class='notice'>You turn off \the [src].</span>")
code/modules/paperwork/paper.dm
-9
View File
@@ -58,7 +58,6 @@
else
to_chat(user, "<span class='notice'>You have to go closer if you want to read it.</span>")
/obj/item/weapon/paper/proc/show_content(var/mob/user, var/forceshow = 0, var/forcestars = 0, var/infolinks = 0, var/view = 1)
var/datum/asset/assets = get_asset_datum(/datum/asset/simple/paper)
assets.send(user)
@@ -83,7 +82,6 @@
if((CLUMSY in usr.mutations) && prob(50))
to_chat(usr, "<span class='warning'>You cut yourself on the paper.</span>")
return
var/n_name = sanitize(copytext(input(usr, "What would you like to label the paper?", "Paper Labelling", name) as text, 1, MAX_MESSAGE_LEN))
if((loc == usr && usr.stat == 0))
@@ -128,7 +126,6 @@
var/mob/living/carbon/human/H = M
if(H == user)
to_chat(user, "<span class='notice'>You wipe off your face with [src].</span>")
H.lip_style = null
H.update_body()
else
@@ -316,7 +313,6 @@
else
to_chat(user, "\red You must hold \the [P] steady to burn \the [src].")
/obj/item/weapon/paper/Topic(href, href_list)
..()
if(!usr || (usr.stat || usr.restrained()))
@@ -346,7 +342,6 @@
for(var/bad in paper_blacklist)
if(findtext(t,bad))
to_chat(usr, "\blue You think to yourself, \"Hm.. this is only paper...\"")
log_admin("PAPER: [key_name(usr)] tried to use forbidden word in [src]: [bad].")
message_admins("PAPER: [key_name_admin(usr)] tried to use forbidden word in [src]: [bad].")
return
@@ -383,7 +378,6 @@
var/obj/item/weapon/paper/carbon/C = P
if (!C.iscopy && !C.copied)
to_chat(user, "<span class='notice'>Take off the carbon copy first.</span>")
add_fingerprint(user)
return
var/obj/item/weapon/paper_bundle/B = new(src.loc)
@@ -420,7 +414,6 @@
if(h_user.client) h_user.client.screen -= src
h_user.put_in_hands(B)
to_chat(user, "<span class='notice'>You clip the [P.name] to [(src.name == "paper") ? "the paper" : src.name].</span>")
src.loc = B
P.loc = B
B.amount++
@@ -442,14 +435,12 @@
if(istype(P, /obj/item/weapon/stamp/clown))
if(!clown)
to_chat(user, "<span class='notice'>You are totally unable to use the stamp. HONK!</span>")
return
stamp(P)
to_chat(user, "<span class='notice'>You stamp the paper with your rubber stamp.</span>")
else if(istype(P, /obj/item/weapon/lighter))
burnpaper(P, user)
code/modules/paperwork/paper_bundle.dm
-9
View File
@@ -25,7 +25,6 @@
var/obj/item/weapon/paper/carbon/C = P
if (!C.iscopy && !C.copied)
to_chat(user, "<span class='notice'>Take off the carbon copy first.</span>")
add_fingerprint(user)
return
@@ -33,7 +32,6 @@
if(screen == 2)
screen = 1
to_chat(user, "<span class='notice'>You add [(P.name == "paper") ? "the paper" : P.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].</span>")
user.unEquip(P)
P.loc = src
if(istype(user,/mob/living/carbon/human))
@@ -45,7 +43,6 @@
if(screen == 2)
screen = 1
to_chat(user, "<span class='notice'>You add [(W.name == "photo") ? "the photo" : W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].</span>")
user.unEquip(W)
W.loc = src
else if(istype(W, /obj/item/weapon/lighter))
@@ -59,7 +56,6 @@
if(screen == 2)
screen = 1
to_chat(user, "<span class='notice'>You add \the [W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].</span>")
qdel(W)
else
if(istype(W, /obj/item/stack/tape_roll))
@@ -100,14 +96,12 @@
else
to_chat(user, "\red You must hold \the [P] steady to burn \the [src].")
/obj/item/weapon/paper_bundle/examine(mob/user)
if(..(user, 1))
src.show_content(user)
else
to_chat(user, "<span class='notice'>It is too far away.</span>")
/obj/item/weapon/paper_bundle/proc/show_content(mob/user as mob)
var/dat
var/obj/item/weapon/W = src[page]
@@ -169,7 +163,6 @@
var/obj/item/weapon/W = src[page]
usr.put_in_hands(W)
to_chat(usr, "<span class='notice'>You remove the [W.name] from the bundle.</span>")
if(amount == 1)
var/obj/item/weapon/paper/P = src[1]
usr.unEquip(src)
@@ -184,7 +177,6 @@
update_icon()
else
to_chat(usr, "<span class='notice'>You need to hold it in your hands to change pages.</span>")
if (istype(src.loc, /mob))
src.attack_self(src.loc)
updateUsrDialog()
@@ -209,7 +201,6 @@
set src in usr
to_chat(usr, "<span class='notice'>You loosen the bundle.</span>")
for(var/obj/O in src)
O.loc = usr.loc
O.layer = initial(O.layer)
code/modules/paperwork/paperbin.dm
-8
View File
@@ -55,7 +55,6 @@
temp = H.organs_by_name["l_hand"]
if(temp && !temp.is_usable())
to_chat(H, "<span class='notice'>You try to move your [temp.name], but cannot!")
return
if(amount >= 1)
amount--
@@ -77,11 +76,9 @@
P.loc = user.loc
user.put_in_hands(P)
to_chat(user, "<span class='notice'>You take [P] out of the [src].</span>")
else
to_chat(user, "<span class='notice'>[src] is empty!</span>")
add_fingerprint(user)
return
@@ -93,7 +90,6 @@
user.drop_item()
i.loc = src
to_chat(user, "<span class='notice'>You put [i] in [src].</span>")
papers.Add(i)
amount++
@@ -102,12 +98,10 @@
if(..(user, 1))
if(amount)
to_chat(usr, "<span class='notice'>There " + (amount > 1 ? "are [amount] papers" : "is one paper") + " in the bin.</span>")
else
to_chat(usr, "<span class='notice'>There are no papers in the bin.</span>")
/obj/item/weapon/paper_bin/update_icon()
if(amount < 1)
icon_state = "paper_bin0"
@@ -134,10 +128,8 @@
P.loc = user.loc
user.put_in_hands(P)
to_chat(user, "<span class='notice'>You take [P] out of the [src].</span>")
else
to_chat(user, "<span class='notice'>[src] is empty!</span>")
add_fingerprint(user)
return
code/modules/paperwork/pen.dm
-5
View File
@@ -26,7 +26,6 @@
/obj/item/weapon/pen/suicide_act(mob/user)
to_chat(viewers(user), "<span class='suicide'>[user] starts scribbling numbers over \himself with the [src.name]! It looks like \he's trying to commit sudoku.</span>")
return (BRUTELOSS)
/obj/item/weapon/pen/blue
@@ -112,9 +111,7 @@
if(!force)
if(M.can_inject(user, 1))
to_chat(user, "<span class='warning'>You stab [M] with the pen.</span>")
// to_chat(M, "<span class='danger'>You feel a tiny prick!</span>")
. = 1
add_logs(M, user, "stabbed", object="[name]")
@@ -165,7 +162,6 @@
throwforce = initial(throwforce)
playsound(user, 'sound/weapons/saberoff.ogg', 5, 1)
to_chat(user, "<span class='warning'>[src] can now be concealed.</span>")
else
on = 1
force = 18
@@ -177,7 +173,6 @@
throwforce = 35
playsound(user, 'sound/weapons/saberon.ogg', 5, 1)
to_chat(user, "<span class='warning'>[src] is now active.</span>")
update_icon()
/obj/item/weapon/pen/edagger/update_icon()
code/modules/paperwork/photocopier.dm
-8
View File
@@ -64,7 +64,6 @@
sleep(15)
else
to_chat(usr, "<span class='warning'>\The [copyitem] can't be copied by \the [src].</span>")
break
use_power(active_power_usage)
@@ -74,12 +73,10 @@
copyitem.loc = usr.loc
usr.put_in_hands(copyitem)
to_chat(usr, "<span class='notice'>You take \the [copyitem] out of \the [src].</span>")
copyitem = null
updateUsrDialog()
else if(check_ass())
to_chat(ass, "<span class='notice'>You feel a slight pressure on your ass.</span>")
updateUsrDialog()
else if(href_list["min"])
if(copies > 1)
@@ -121,29 +118,24 @@
copyitem = O
O.loc = src
to_chat(user, "<span class='notice'>You insert \the [O] into \the [src].</span>")
flick(insert_anim, src)
updateUsrDialog()
else
to_chat(user, "<span class='notice'>There is already something in \the [src].</span>")
else if(istype(O, /obj/item/device/toner))
if(toner <= 10) //allow replacing when low toner is affecting the print darkness
user.drop_item()
to_chat(user, "<span class='notice'>You insert the toner cartridge into \the [src].</span>")
var/obj/item/device/toner/T = O
toner += T.toner_amount
qdel(O)
updateUsrDialog()
else
to_chat(user, "<span class='notice'>This cartridge is not yet ready for replacement! Use up the rest of the toner.</span>")
else if(istype(O, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
anchored = !anchored
to_chat(user, "<span class='notice'>You [anchored ? "wrench" : "unwrench"] \the [src].</span>")
else if(istype(O, /obj/item/weapon/grab)) //For ass-copying.
var/obj/item/weapon/grab/G = O
if(ismob(G.affecting) && G.affecting != ass)
code/modules/paperwork/photography.dm
-15
View File
@@ -69,14 +69,12 @@
else
to_chat(user, "\red You must hold \the [P] steady to burn \the [src].")
/obj/item/weapon/photo/examine(mob/user)
if(..(user, 1) || isobserver(user))
show(user)
else
to_chat(user, "<span class='notice'>It is too far away.</span>")
/obj/item/weapon/photo/proc/show(mob/user as mob)
usr << browse_rsc(img, "tmp_photo.png")
usr << browse("<html><head><title>[name]</title></head>" \
@@ -179,7 +177,6 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
size = nsize
to_chat(usr, "<span class='notice'>Camera will now take [size]x[size] photos.</span>")
/obj/item/device/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob)
return
@@ -190,17 +187,14 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
else
src.icon_state = icon_off
to_chat(user, "You switch the camera [on ? "on" : "off"].")
return
/obj/item/device/camera/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/device/camera_film))
if(pictures_left)
to_chat(user, "<span class='notice'>[src] still has some film in it!</span>")
return
to_chat(user, "<span class='notice'>You insert [I] into [src].</span>")
user.drop_item()
qdel(I)
pictures_left = pictures_max
@@ -311,7 +305,6 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
pictures_left--
desc = "A polaroid camera. It has [pictures_left] photos left."
to_chat(user, "<span class='notice'>[pictures_left] photos left.</span>")
icon_state = icon_off
on = 0
if(user.mind && !(user.mind.assigned_role == "Chaplain"))
@@ -435,10 +428,8 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
/obj/item/device/camera/digital/captureimage(atom/target, mob/user, flag)
if(saved_pictures.len >= max_storage)
to_chat(user, "<span class='notice'>Maximum photo storage capacity reached.</span>")
return
to_chat(user, "Picture saved.")
var/x_c = target.x - (size-1)/2
var/y_c = target.y + (size-1)/2
var/z_c = target.z
@@ -464,11 +455,9 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
if(saved_pictures.len == 0)
to_chat(usr, "<span class='userdanger'>No images saved.</span>")
return
if(pictures_left == 0)
to_chat(usr, "<span class='userdanger'>There is no film left to print.</span>")
return
var/datum/picture/P = null
@@ -484,7 +473,6 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
if(saved_pictures.len == 0)
to_chat(usr, "<span class='userdanger'>No images saved</span>")
return
var/datum/picture/P = null
P = input("Select image to delete:",P) as null|anything in saved_pictures
@@ -530,12 +518,10 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
camera.c_tag = user.name
to_chat(user, "You switch the camera [on ? "on" : "off"].")
/obj/item/device/videocam/examine(mob/user)
if(..(user, 1))
to_chat(user, "This video camera can send live feeds to the entertainment network. It's [camera ? "" : "in"]active.")
/obj/item/device/videocam/hear_talk(mob/M as mob, msg)
if (camera && on)
if(get_dist(src, M) <= canhear_range)
@@ -560,4 +546,3 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\
'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg')
to_chat(user, pick(creepyasssounds))
code/modules/paperwork/silicon_photography.dm
-8
View File
@@ -32,12 +32,10 @@
to_chat(C.connected_ai, "<span class='unconscious'>Image recorded and saved by [name]</span>")
to_chat(usr, "<span class='unconscious'>Image recorded and saved to remote database</span>")//feedback to the Cyborg player that the picture was taken
else
injectaialbum(P)
to_chat(usr, "<span class='unconscious'>Image recorded</span>")
/obj/item/device/camera/siliconcam/proc/selectpicture(obj/item/device/camera/siliconcam/cam)
if(!cam)
cam = getsource()
@@ -46,7 +44,6 @@
var/find
if(cam.aipictures.len == 0)
to_chat(usr, "<span class='userdanger'>No images saved</span>")
return
for(var/datum/picture/t in cam.aipictures)
nametemp += t.fields["name"]
@@ -67,7 +64,6 @@
P.show(usr)
to_chat(usr, P.desc)
// TG uses a special garbage collector.. qdel(P)
qdel(P) //so 10 thousand pictures items are not left in memory should an AI take them and then view them all.
@@ -80,7 +76,6 @@
cam.aipictures -= selection
to_chat(usr, "<span class='unconscious'>Image deleted</span>")
/obj/item/device/camera/siliconcam/ai_camera/can_capture_turf(turf/T, mob/user)
var/mob/living/silicon/ai = user
return ai.TurfAdjacent(T)
@@ -95,17 +90,14 @@
src.in_camera_mode = 0
to_chat(usr, "<B>Camera Mode deactivated</B>")
/obj/item/device/camera/siliconcam/proc/camera_mode_on()
src.in_camera_mode = 1
to_chat(usr, "<B>Camera Mode activated</B>")
/obj/item/device/camera/siliconcam/ai_camera/printpicture(mob/user, datum/picture/P)
injectaialbum(P)
to_chat(usr, "<span class='unconscious'>Image recorded</span>")
/obj/item/device/camera/siliconcam/robot_camera/printpicture(mob/user, datum/picture/P)
injectmasteralbum(P)