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

Map changes, bug fixes

Browse Source
This commit is contained in:
Markolie
2014-11-30 20:10:34 +01:00
parent 02f56a72f9
commit 0bf46a71b1
10 changed files with 184 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot_modules.dm
+1
View File
@@ -342,6 +342,7 @@
name = "syndicate robot module"
/obj/item/weapon/robot_module/syndicate/New()
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/device/flashlight(src)
src.modules += new /obj/item/weapon/melee/energy/sword/cyborg(src)
src.modules += new /obj/item/weapon/gun/energy/crossbow/cyborg(src)
code/modules/paperwork/paper.dm
+7 -6
View File
@@ -62,19 +62,20 @@
return
icon_state = "paper"
/obj/item/weapon/paper/examine(mob/user)
if(in_range(user, src) || istype(user, /mob/dead/observer))
/obj/item/weapon/paper/examine()
if(in_range(usr, src) || istype(usr, /mob/dead/observer))
show_content(usr)
else
user << "<span class='notice'>You have to go closer if you want to read it.</span>"
usr << "<span class='notice'>You have to go closer if you want to read it.</span>"
return
/obj/item/weapon/paper/proc/show_content(var/mob/user, var/forceshow=0)
if(!(istype(user, /mob/living/carbon/human) || istype(user, /mob/dead/observer) || istype(user, /mob/living/silicon)) && !forceshow)
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)][stamps]</BODY></HTML>", "window=[name]")
set src in oview(1)
if(!(istype(usr, /mob/living/carbon/human) || istype(usr, /mob/dead/observer) || istype(usr, /mob/living/silicon)) && !forceshow)
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)][stamps]</BODY></HTML>", "window=[name]")
onclose(usr, "[name]")
else
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info][stamps]</BODY></HTML>", "window=[name]")
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info][stamps]</BODY></HTML>", "window=[name]")
onclose(usr, "[name]")
/obj/item/weapon/paper/verb/rename()
code/modules/paperwork/paper_bundle.dm
+8 -8
View File
@@ -94,10 +94,10 @@
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)
if(in_range(usr, src))
src.show_content(usr)
else
user << "<span class='notice'>It is too far away.</span>"
usr << "<span class='notice'>It is too far away.</span>"
return
/obj/item/weapon/paper_bundle/proc/show_content(mob/user as mob)
@@ -122,14 +122,14 @@
dat+= "<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY>[stars(P.info)][P.stamps]</BODY></HTML>"
else
dat+= "<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY>[P.info][P.stamps]</BODY></HTML>"
user << browse(dat, "window=[name]")
usr << browse(dat, "window=[name]")
else if(istype(src[page], /obj/item/weapon/photo))
var/obj/item/weapon/photo/P = W
user << browse_rsc(P.img, "tmp_photo.png")
user << browse(dat + "<html><head><title>[P.name]</title></head>" \
usr << browse_rsc(P.img, "tmp_photo.png")
usr << browse(dat + "<html><head><title>[P.name]</title></head>" \
+ "<body style='overflow:hidden'>" \
+ "<div> <img src='tmp_photo.png' width = '180'" \
+ "[P.scribble ? "<div> Written on the back:<br><i>[P.scribble]</i>" : ]"\
+ "[P.scribble ? "<div><br> Written on the back:<br><i>[P.scribble]</i>" : ]"\
+ "</body></html>", "window=[name]")
/obj/item/weapon/paper_bundle/attack_self(mob/user as mob)
@@ -177,7 +177,7 @@
amount--
update_icon()
else
usr << "<span class='notice'>You need to hold it in hands!</span>"
usr << "<span class='notice'>You need to hold it in your hands to change pages.</span>"
if (istype(src.loc, /mob) ||istype(src.loc.loc, /mob))
src.attack_self(src.loc)
updateUsrDialog()
code/modules/paperwork/photography.dm
+5 -6
View File
@@ -44,15 +44,14 @@
..()
/obj/item/weapon/photo/examine(mob/user)
if(in_range(user, src))
show(user)
user << desc
if(in_range(usr, src))
show(usr)
else
user << "<span class='notice'>It is too far away.</span>"
usr << "<span class='notice'>It is too far away.</span>"
/obj/item/weapon/photo/proc/show(mob/user as mob)
user << browse_rsc(img, "tmp_photo.png")
user << browse("<html><head><title>[name]</title></head>" \
usr << browse_rsc(img, "tmp_photo.png")
usr << browse("<html><head><title>[name]</title></head>" \
+ "<body style='overflow:hidden;margin:0;text-align:center'>" \
+ "<img src='tmp_photo.png' width='[64*photo_size]' style='-ms-interpolation-mode:nearest-neighbor' />" \
+ "[scribble ? "<br>Written on the back:<br><i>[scribble]</i>" : ""]"\