cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 08:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks

Browse Source
This commit is contained in:
Fox-McCloud
2015-09-21 00:25:27 -04:00
parent 263c67ea2e
commit 4e9befc310
4 changed files with 31 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+7 -19
View File
@@ -180,7 +180,7 @@
if(user in contents) //to prevent self-teleporting.
return
var/obj/item/weapon/rcs/E = W
if(E.rcharges != 0)
if(E.rcell && (E.rcell.charge >= E.chargecost))
if(!(src.z in config.contact_levels))
user << "<span class='warning'>The rapid-crate-sender can't locate any telepads!</span>"
return
@@ -210,14 +210,8 @@
s.set_up(5, 1, src)
s.start()
do_teleport(src, E.pad, 0)
E.rcharges--
if(E.rcharges != 1)
user << "\blue Teleport successful. [E.rcharges] charges left."
E.desc = "Use this to send crates and closets to cargo telepads. There are [E.rcharges] charges left."
return
else
user << "\blue Teleport successful. [E.rcharges] charge left."
E.desc = "Use this to send crates and closets to cargo telepads. There is [E.rcharges] charge left."
E.rcell.use(E.chargecost)
user << "<span class='notice'>Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.</span>"
return
else
E.rand_x = rand(50,200)
@@ -234,17 +228,11 @@
s.set_up(5, 1, src)
s.start()
do_teleport(src, L)
E.rcharges--
if(E.rcharges != 1)
user << "\blue Teleport successful. [E.rcharges] charges left."
E.desc = "Use this to send crates and closets to cargo telepads. There are [E.rcharges] charges left."
return
else
user << "\blue Teleport successful. [E.rcharges] charge left."
E.desc = "Use this to send crates and closets to cargo telepads. There is [E.rcharges] charge left."
return
E.rcell.use(E.chargecost)
user << "<span class='notice'>Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.</span>"
return
else
user << "\red Out of charges."
user << "<span class='warning'>Out of charges.</span>"
return
if(src.opened)
code/game/objects/structures/crates_lockers/crates.dm
+7 -19
View File
@@ -81,7 +81,7 @@
/obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/rcs) && !src.opened)
var/obj/item/weapon/rcs/E = W
if(E.rcharges != 0)
if(E.rcell && (E.rcell.charge >= E.chargecost))
if(!(src.z in config.player_levels))
user << "<span class='warning'>The rapid-crate-sender can't locate any telepads!</span>"
return
@@ -111,14 +111,8 @@
s.set_up(5, 1, src)
s.start()
do_teleport(src, E.pad, 0)
E.rcharges--
if(E.rcharges != 1)
user << "\blue Teleport successful. [E.rcharges] charges left."
E.desc = "Use this to send crates and closets to cargo telepads. There are [E.rcharges] charges left."
return
else
user << "\blue Teleport successful. [E.rcharges] charge left."
E.desc = "Use this to send crates and closets to cargo telepads. There is [E.rcharges] charge left."
E.rcell.use(E.chargecost)
user << "<span class='notice'>Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.</span>"
return
else
E.rand_x = rand(50,200)
@@ -135,17 +129,11 @@
s.set_up(5, 1, src)
s.start()
do_teleport(src, L)
E.rcharges--
if(E.rcharges != 1)
user << "\blue Teleport successful. [E.rcharges] charges left."
E.desc = "Use this to send crates and closets to cargo telepads. There are [E.rcharges] charges left."
return
else
user << "\blue Teleport successful. [E.rcharges] charge left."
E.desc = "Use this to send crates and closets to cargo telepads. There is [E.rcharges] charge left."
return
E.rcell.use(E.chargecost)
user << "<span class='notice'>Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.</span>"
return
else
user << "\red Out of charges."
user << "<span class='warning'>Out of charges.</span>"
return
if(opened)