[MIRROR] More Initialize() fixes, requires someone to test with DB (#2857)

* More Initialize() fixes, requires someone to test with DB

* fucking mirror failure
This commit is contained in:
CitadelStationBot
2017-09-22 23:35:22 -05:00
committed by Poojawa
parent 6717720356
commit 2a860d1954
45 changed files with 161 additions and 160 deletions
@@ -4,13 +4,13 @@
icon = 'icons/obj/radio.dmi'
icon_state = "electropack0"
item_state = "electropack"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
flags_1 = CONDUCT_1
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
flags_1 = CONDUCT_1
slot_flags = SLOT_BACK
w_class = WEIGHT_CLASS_HUGE
materials = list(MAT_METAL=10000, MAT_GLASS=2500)
var/on = TRUE
var/on = TRUE
var/code = 2
var/frequency = 1449
var/shock_cooldown = 0
@@ -20,11 +20,11 @@
return (FIRELOSS)
/obj/item/device/electropack/Initialize()
..()
. = ..()
SSradio.add_object(src, frequency, GLOB.RADIO_CHAT)
/obj/item/device/electropack/Destroy()
SSradio.remove_object(src, frequency)
SSradio.remove_object(src, frequency)
return ..()
/obj/item/device/electropack/attack_hand(mob/user)
@@ -52,8 +52,8 @@
user.put_in_hands(A)
A.add_fingerprint(user)
if(src.flags_1 & NODROP_1)
A.flags_1 |= NODROP_1
if(src.flags_1 & NODROP_1)
A.flags_1 |= NODROP_1
else
return ..()
@@ -108,7 +108,7 @@
spawn(100)
shock_cooldown = 0
var/mob/living/L = loc
step(L, pick(GLOB.cardinals))
step(L, pick(GLOB.cardinals))
to_chat(L, "<span class='danger'>You feel a sharp shock!</span>")
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
@@ -143,4 +143,4 @@ Code:
</TT>"}
user << browse(dat, "window=radio")
onclose(user, "radio")
return
return