cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5263 from Aranclanos/electropackrevamp

Browse Source 
Electropack fixes
This commit is contained in:
Cheridan
2014-10-16 08:08:57 -05:00
parent 53cb161add a1d49cfeb4
commit 17c9aaa6dd
8 changed files with 40 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/shock_kit.dm
+4 -8
View File
@@ -4,8 +4,7 @@
icon = 'icons/obj/assemblies.dmi'
icon_state = "shock_kit"
var/obj/item/clothing/head/helmet/part1 = null
var/obj/item/device/radio/electropack/part2 = null
var/status = 0
var/obj/item/device/electropack/part2 = null
w_class = 5.0
flags = CONDUCT
@@ -16,7 +15,7 @@
return
/obj/item/assembly/shock_kit/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/wrench) && !status)
if(istype(W, /obj/item/weapon/wrench))
var/turf/T = loc
if(ismob(T))
T = T.loc
@@ -28,15 +27,12 @@
part2 = null
qdel(src)
return
if(istype(W, /obj/item/weapon/screwdriver))
status = !status
user << "<span class='notice'>[src] is now [status ? "secured" : "unsecured"]!</span>"
add_fingerprint(user)
return
/obj/item/assembly/shock_kit/attack_self(mob/user as mob)
part1.attack_self(user, status)
part2.attack_self(user, status)
part1.attack_self(user)
part2.attack_self(user)
add_fingerprint(user)
return