cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-09 06:04:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1410 from comma/master

Browse Source 
Small things
This commit is contained in:
Albert Iordache
2012-07-03 02:38:51 -07:00
parent 70f7dc7341 d93705aa73
commit ca09b7774c
6 changed files with 68 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Ported/Bureaucracy/copier.dm
+1
View File
@@ -134,6 +134,7 @@
P.name = template.name
P.desc = template.desc
P.icon = template.icon
P.img = template:img
sleep(30)
job_num_copies -= 1
code/game/objects/items/weapons/cameras.dm
+6 -2
View File
@@ -103,7 +103,8 @@
var/n_name = input(usr, "What would you like to label the photo?", "Photo Labelling", src.name) as text
n_name = copytext(n_name, 1, 32)
if ((loc == usr && usr.stat == 0))
//loc.loc check is for making possible renaming photos in clipboards
if (( (src.loc == usr || (src.loc.loc && src.loc.loc == usr)) && usr.stat == 0))
name = "photo[(n_name ? text("- '[n_name]'") : null)]"
add_fingerprint(usr)
return
@@ -203,7 +204,10 @@
y_c--
x_c = x_c - 3
var/obj/item/weapon/photo/P = new/obj/item/weapon/photo( get_turf(src) )
var/obj/item/weapon/photo/P = new/obj/item/weapon/photo()
P.loc = usr.loc
if(!user.get_inactive_hand())
usr.put_in_inactive_hand(P)
var/icon/small_img = icon(temp)
var/icon/ic = icon('items.dmi',"photo")
small_img.Scale(8,8)
code/game/objects/items/weapons/papers_bins.dm
+50 -11
View File
@@ -101,7 +101,8 @@ NOTEBOOK
return
var/n_name = input(usr, "What would you like to label the paper?", "Paper Labelling", null) as text
n_name = copytext(n_name, 1, 32)
if ((src.loc == usr && usr.stat == 0))
//loc.loc check is for making possible renaming papers in clipboards
if ((src.loc == usr || (src.loc.loc && src.loc.loc == usr) && usr.stat == 0))
src.name = n_name && n_name != "" ? n_name : "Untitled paper"
src.add_fingerprint(usr)
return
@@ -633,8 +634,24 @@ NOTEBOOK
var/dat = "<B>Clipboard</B><BR>"
if (src.pen)
dat += text("<A href='?src=\ref[];pen=1'>Remove Pen</A><BR><HR>", src)
for(var/obj/item/weapon/paper/P in src)
dat += text("<A href='?src=\ref[];read=\ref[]'>[]</A> <A href='?src=\ref[];write=\ref[]'>Write</A> <A href='?src=\ref[];remove=\ref[]'>Remove</A><BR>", src, P, P.name, src, P, src, P)
dat += "<table>"
for(var/obj/item/weapon/W in src)
dat += "<tr>"
if (istype(W, /obj/item/weapon/paper))
var/obj/item/weapon/paper/P = W
dat += text("<td><A href='?src=\ref[];read=\ref[]'>[]</A></td><td> \
<A href='?src=\ref[];write=\ref[]'>Write</A></td><td> \
<A href='?src=\ref[];rname=\ref[]'>Rename</A></td><td> \
<A href='?src=\ref[];remove=\ref[]'>Remove</A><BR></td>", \
src, P, P.name, src, P, src, P, src, P)
if (istype(W, /obj/item/weapon/photo))
var/obj/item/weapon/photo/P = W
dat += text("<td><A href='?src=\ref[];read=\ref[]'>[]</A></td><td> \
<A href='?src=\ref[];rname=\ref[]'>Rename</A></td><td> \
<A href='?src=\ref[];remove=\ref[]'>Remove</A><BR></td>" \
, src, P, P.name, src, P, src, P)
dat += "</tr>"
dat += "</table>"
user << browse(dat, "window=clipboard")
onclose(user, "clipboard")
return
@@ -679,6 +696,16 @@ NOTEBOOK
usr.update_clothing()
P.add_fingerprint(usr)
src.add_fingerprint(usr)
if (href_list["rname"])
var/obj/item/I = locate(href_list["rname"])
if ((I && I.loc == src))
if (istype(I, /obj/item/weapon/paper))
var/obj/item/weapon/paper/P = I
P.rename()
if (istype(I, /obj/item/weapon/photo))
var/obj/item/weapon/photo/P = I
P.rename()
src.add_fingerprint(usr)
if (href_list["write"])
var/obj/item/P = locate(href_list["write"])
if ((P && P.loc == src))
@@ -692,13 +719,25 @@ NOTEBOOK
P.attackby(src.pen, usr)
src.add_fingerprint(usr)
if (href_list["read"])
var/obj/item/weapon/paper/P = locate(href_list["read"])
if ((P && P.loc == src))
if (!( istype(usr, /mob/living/carbon/human) ))
usr << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", P.name, stars(P.info)), text("window=[]", P.name))
onclose(usr, "[P.name]")
else
usr << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", P.name, P.info), text("window=[]", P.name))
var/obj/item/I = locate(href_list["read"])
if ((I && I.loc == src))
if (istype(I, /obj/item/weapon/paper))
var/obj/item/weapon/paper/P = I
if (!( istype(usr, /mob/living/carbon/human) ))
usr << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", P.name, stars(P.info)), text("window=[]", P.name))
onclose(usr, "[P.name]")
else
var/t = dd_replacetext(P.info, "\n", "<BR>")
usr << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", P.name, t), text("window=[]", P.name))
onclose(usr, "[P.name]")
if (istype(I, /obj/item/weapon/photo))
var/obj/item/weapon/photo/P = I
usr << browse_rsc(P.img, "tmp_photo.png")
usr << browse("<html><head><title>Photo</title></head>" \
+ "<body style='overflow:hidden'>" \
+ "<div> <img src='tmp_photo.png' width = '180'" \
+ "[P.scribble ? "<div> Writings on the back:<br><i>[P.scribble]</i>" : ]"\
+ "</body></html>", "window=book;size=200x[P.scribble ? 400 : 200]")
onclose(usr, "[P.name]")
if (ismob(src.loc))
var/mob/M = src.loc
@@ -733,7 +772,7 @@ NOTEBOOK
/obj/item/weapon/clipboard/attackby(obj/item/weapon/P as obj, mob/user as mob)
..()
if (istype(P, /obj/item/weapon/paper))
if (istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/photo))
if (src.contents.len < 15)
user.drop_item()
P.loc = src
code/game/objects/storage/briefcase.dm
-7
View File
@@ -1,12 +1,5 @@
/obj/item/weapon/storage/briefcase/New()
..()
new /obj/item/weapon/paper(src)
new /obj/item/weapon/paper(src)
new /obj/item/weapon/paper(src)
new /obj/item/weapon/paper(src)
new /obj/item/weapon/paper(src)
new /obj/item/weapon/paper(src)
new /obj/item/weapon/pen(src)
/obj/item/weapon/storage/briefcase/attack(mob/M as mob, mob/living/user as mob)
//..()
html/changelog.html
+11 -3
View File
@@ -57,14 +57,23 @@ Stuff which is in development and not yet visible to players or just code relate
should be listed in the changelog upon commit though. Thanks. -->
<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
<div class="commit sansserif">
<div class="commit sansserif">
<h2 class="date">29 June 2012</h2>
<h3 class="author">Erthilo updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Raises job limits for Botanists, Atmospheric Technicnians, Roboticists, Chemists, and Geneticists.</li>
</ul>
</div>
<div class="commit sansserif">
<h2 class="date">28 June 2012</h2>
<h3 class="author">Chinsky updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">'Rename' function for clipboards</li>
<li class="rscadd">Can add photos to clipboards</li>
<li class="bugfix">Fixed troubles with formatting when reading from clipboard (linebreaks not being properly placed)</li>
<li class="bugfix">Fixed photocopiers not copying photos properly</li>
</ul>
</div>
<div class="commit sansserif">
<h2 class="date">27 June 2012</h2>
<h3 class="author">Erthilo updated:</h3>
@@ -82,7 +91,6 @@ should be listed in the changelog upon commit though. Thanks. -->
<li class="bugfix">Fixes medical items. Gauze/kits/ointment can now be applied correctly again.</li>
</ul>
</div>
<div class="commit sansserif">
<h2 class="date">25 June 2012</h2>
<h3 class="author">Erthilo updated:</h3>
icons/obj/contraband.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 38 KiB