mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-26 21:49:11 +01:00
some more new to init (#17231)
* some more new to init * rigs * rigs * intellisense moment * telcoms and landmarks * fix that as well * some more minor things * re add missing message * fix trash eating...
This commit is contained in:
@@ -37,8 +37,8 @@
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
var/open = FALSE
|
||||
|
||||
/obj/item/melee/umbrella/New()
|
||||
..()
|
||||
/obj/item/melee/umbrella/Initialize(mapload)
|
||||
. = ..()
|
||||
update_icon()
|
||||
|
||||
/obj/item/melee/umbrella/attack_self()
|
||||
@@ -56,9 +56,9 @@
|
||||
H.update_inv_r_hand()
|
||||
|
||||
// Randomizes color
|
||||
/obj/item/melee/umbrella/random/New()
|
||||
/obj/item/melee/umbrella/random/Initialize(mapload)
|
||||
. = ..()
|
||||
color = get_random_colour()
|
||||
..()
|
||||
|
||||
/obj/item/melee/cursedblade
|
||||
name = "crystal blade"
|
||||
|
||||
@@ -71,10 +71,9 @@
|
||||
update_icon()
|
||||
..()
|
||||
|
||||
/obj/item/melee/shock_maul/New()
|
||||
..()
|
||||
/obj/item/melee/shock_maul/Initialize(mapload)
|
||||
. = ..()
|
||||
update_held_icon()
|
||||
return
|
||||
|
||||
/obj/item/melee/shock_maul/get_cell()
|
||||
return bcell
|
||||
@@ -111,11 +110,10 @@
|
||||
usr.put_in_l_hand(src)
|
||||
src.add_fingerprint(usr)
|
||||
|
||||
/obj/item/melee/shock_maul/loaded/New() //this one starts with a cell pre-installed.
|
||||
..()
|
||||
/obj/item/melee/shock_maul/loaded/Initialize(mapload) //this one starts with a cell pre-installed.
|
||||
. = ..()
|
||||
bcell = new/obj/item/cell/device/weapon(src)
|
||||
update_icon()
|
||||
return
|
||||
|
||||
/obj/item/melee/shock_maul/proc/deductcharge()
|
||||
if(status == 1) //Only deducts charge when it's on
|
||||
|
||||
Reference in New Issue
Block a user