A few more items consolidated

This commit is contained in:
SatinIsle
2023-09-22 22:47:06 +01:00
parent ff5c25b61b
commit 1479907300
5 changed files with 71 additions and 65 deletions
@@ -232,21 +232,3 @@
flick("harpoon-1-change",src)
icon_state = "harpoon-2"
transforming = 0
/obj/item/weapon/bluespace_harpoon/wand
name = "teleportation wand"
desc = "An odd wand that weighs more than it looks like it should. It has a wire protruding from it and a glass-like tip, suggesting there may be more tech behind this than magic."
icon = 'icons/obj/gun_vr.dmi'
icon_state = "harpoonwand-2"
/obj/item/weapon/bluespace_harpoon/wand/update_icon()
if(transforming)
switch(mode)
if(0)
flick("harpoonwand-2-change", src)
icon_state = "harpoonwand-1"
if(1)
flick("harpoonwand-1-change",src)
icon_state = "harpoonwand-2"
transforming = 0
@@ -210,14 +210,3 @@
item_state = "stunrevolver"
w_class = ITEMSIZE_SMALL //small pistol is small
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
/*
* magic orb
*/
/obj/item/weapon/gun/energy/taser/magic
name = "orb of lightning"
desc = "An orb filled with electrical energy, it looks oddly like a toy plasma orb..."
description_fluff = ""
icon_state = "orb"