cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 06:57:42 +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/WorkInProgress/ZomgPonies/karma.dm
-15
View File
@@ -146,7 +146,6 @@ You've gained <b>[totalkarma]</b> total karma in your time here.<br>"}
var/dat = "<html><body><center>"
dat += "<a href='?src=\ref[src];karmashop=tab;tab=0' [karma_tab == 0 ? "class='linkOn'" : ""]>Job Unlocks</a>"
dat += "<a href='?src=\ref[src];karmashop=tab;tab=1' [karma_tab == 1 ? "class='linkOn'" : ""]>Species Unlocks</a>"
dat += "<a href='?src=\ref[src];karmashop=tab;tab=2' [karma_tab == 2 ? "class='linkOn'" : ""]>Ambassador Unlocks</a>"
dat += "</center>"
dat += "<HR>"
@@ -173,20 +172,6 @@ You've gained <b>[totalkarma]</b> total karma in your time here.<br>"}
<a href='?src=\ref[src];karmashop=shop;KarmaBuy2=5'>Unlock Slime People -- 45KP</a><br>
"}
if (2) // Ambassador Unlocks
dat += {"
<a href='?src=\ref[src];karmashop=shop;KarmaBuy3=1'>Unlock Tajaran Ambassador -- 30KP</a><br>
<a href='?src=\ref[src];karmashop=shop;KarmaBuy3=2'>Unlock Unathi Ambassador -- 30KP</a><br>
<a href='?src=\ref[src];karmashop=shop;KarmaBuy3=3'>Unlock Skrell Ambassador -- 30KP</a><br>
<a href='?src=\ref[src];karmashop=shop;KarmaBuy3=4'>Unlock Diona Ambassador -- 30KP</a><br>
<a href='?src=\ref[src];karmashop=shop;KarmaBuy3=5'>Unlock Kidan Ambassador -- 30KP</a><br>
<a href='?src=\ref[src];karmashop=shop;KarmaBuy3=6'>Unlock Slime People Ambassador -- 30KP</a><br>
<a href='?src=\ref[src];karmashop=shop;KarmaBuy3=7'>Unlock Grey Ambassador -- 30KP</a><br>
<a href='?src=\ref[src];karmashop=shop;KarmaBuy3=8'>Unlock Vox Ambassador -- 30KP</a><br>
<B> You need to have unlocked the relevant species before being able to purchase this job. </B><br><br>
<span class='danger'>Ambassadors can be bought but are not yet spawnable in-game. Soon!</span><br><br>
"}
dat += "<B>PLEASE NOTE THAT PEOPLE WHO TRY TO GAME THE KARMA SYSTEM WILL END UP ON THE WALL OF SHAME. THIS INCLUDES BUT IS NOT LIMITED TO TRADES, OOC KARMA BEGGING, CODE EXPLOITS, ETC.</B>"
dat += "</center></body></html>"
code/game/machinery/syndicatebomb.dm
+1 -1
View File
@@ -106,7 +106,7 @@
return
/obj/machinery/syndicatebomb/interact(var/mob/user)
if(wires)
if(wires && open_panel)
wires.Interact(user)
if(!open_panel)
if(!active)
code/game/machinery/turrets.dm
+2 -2
View File
@@ -375,7 +375,7 @@
if ( !issilicon(user) )
user << "<span class='notice'>You are too far away.</span>"
user.unset_machine()
user << browse(null, "window=turretid")
user << browse(null, "window=turretid;size=500x250")
return
user.set_machine(src)
@@ -396,7 +396,7 @@
t += text("Turrets [] - <A href='?src=\ref[];toggleOn=1'>[]?</a><br>\n", src.enabled?"activated":"deactivated", src, src.enabled?"Disable":"Enable")
t += text("Currently set for [] - <A href='?src=\ref[];toggleLethal=1'>Change to []?</a><br>\n", src.lethal?"lethal":"stun repeatedly", src, src.lethal?"Stun repeatedly":"Lethal")
//user << browse(t, "window=turretid")
//user << browse(t, "window=turretid;size=500x250")
//onclose(user, "turretid")
var/datum/browser/popup = new(user, "turretid", "Turret Control Panel ([area.name])")
popup.set_content(t)
code/game/objects/items/weapons/melee/energy.dm
+1 -1
View File
@@ -59,7 +59,7 @@
attack_self()
R << "<span class='notice'>It's out of charge!</span>"
return
C.use(hitcost)
//C.use(hitcost)
..()
return
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>" : ""]"\