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

Fixes

Browse Source
This commit is contained in:
Markolie
2015-03-16 18:49:47 +01:00
parent d266436143
commit cacc2bf917
21 changed files with 90 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+3
View File
@@ -186,6 +186,9 @@
if(istype(W, /obj/item/weapon/rcs) && !src.opened)
var/obj/item/weapon/rcs/E = W
if(E.rcharges != 0)
if(!(src.z in config.contact_levels))
user << "<span class='warning'>The rapid-crate-sender can't locate any telepads!</span>"
return
if(E.mode == 0)
if(!E.teleporting)
var/list/L = list()
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+2 -2
View File
@@ -87,8 +87,8 @@
src.desc = "Owned by [I.registered_name]."
else
user << "\red Access Denied"
else if((istype(W, /obj/item/weapon/card/emag)) && !src.broken)
emag_act()
else if((istype(W, /obj/item/weapon/card/emag) || istype(W, /obj/item/weapon/melee/energy/blade)) && !broken)
emag_act(user)
else
user << "\red Access Denied"
return
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+10 -9
View File
@@ -77,20 +77,21 @@
user.drop_item()
if(W)
W.loc = src.loc
else if((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken)
emag_act()
else if((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !broken)
emag_act(user)
else if(istype(W,/obj/item/stack/packageWrap) || istype(W,/obj/item/weapon/weldingtool))
return ..(W,user)
else
togglelock(user)
/obj/structure/closet/secure_closet/emag_act()
broken = 1
locked = 0
desc = "It appears to be broken."
icon_state = icon_off
flick(icon_broken, src)
usr<< "<span class='notice'>You unlock \the [src].</span>"
/obj/structure/closet/secure_closet/emag_act(user as mob)
if(!broken)
broken = 1
locked = 0
desc = "It appears to be broken."
icon_state = icon_off
flick(icon_broken, src)
user << "<span class='notice'>You unlock \the [src].</span>"
/obj/structure/closet/secure_closet/attack_hand(mob/user as mob)
src.add_fingerprint(user)
code/game/objects/structures/crates_lockers/crates.dm
+15 -11
View File
@@ -82,6 +82,9 @@
if(istype(W, /obj/item/weapon/rcs) && !src.opened)
var/obj/item/weapon/rcs/E = W
if(E.rcharges != 0)
if(!(src.z in config.player_levels))
user << "<span class='warning'>The rapid-crate-sender can't locate any telepads!</span>"
return
if(E.mode == 0)
if(!E.teleporting)
var/list/L = list()
@@ -294,23 +297,24 @@
/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(is_type_in_list(W, list(/obj/item/stack/packageWrap, /obj/item/stack/cable_coil, /obj/item/device/radio/electropack, /obj/item/weapon/wirecutters)))
return ..()
if(locked && (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)))
emag_act()
if((istype(W, /obj/item/weapon/card/emag) || istype(W, /obj/item/weapon/melee/energy/blade)))
emag_act(user)
return
if(!opened)
src.togglelock(user)
return
return ..()
/obj/structure/closet/crate/secure/emag_act()
overlays += sparks
spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface*
playsound(src.loc, "sparks", 60, 1)
src.locked = 0
src.broken = 1
update_icon()
usr << "<span class='notice'>You unlock \the [src].</span>"
return
/obj/structure/closet/crate/secure/emag_act(user as mob)
if(locked)
overlays += sparks
spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface*
playsound(src.loc, "sparks", 60, 1)
src.locked = 0
src.broken = 1
update_icon()
user << "<span class='notice'>You unlock \the [src].</span>"
return
/obj/structure/closet/crate/secure/emp_act(severity)
for(var/obj/O in src)