Skip to content

Commit

Permalink
Fixing desc and adding box
Browse files Browse the repository at this point in the history
  • Loading branch information
800maximum123 committed Jun 21, 2024
1 parent 8dd109a commit 42d027d
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 5 deletions.
18 changes: 15 additions & 3 deletions mods/_fd/fd_assets/customs/kanaris/item.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/obj/item/clothing/accessory/cloakspace/willheim
name = "cloak"
desc = "."
desc = "Durable cloak from SpaceFashion. Resistant to environmental hazards and physical impact. Pleasant to the touch."
icon = 'mods/_fd/fd_assets/customs/kanaris/willheim.dmi'
icon_state = "kanarys_cloak"

Expand Down Expand Up @@ -56,9 +56,9 @@
slot_r_hand_str = "syndicate-black-green"
)
equip_delay = 4 SECONDS
flags_inv = HIDEGLOVES | HIDESHOES | HIDEJUMPSUIT | HIDETAIL | CLOTHING_BULKY
flags_inv = HIDESHOES | HIDETAIL | CLOTHING_BULKY | HIDEJUMPSUIT
// slowdown = 1

valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA)
body_parts_covered = ARMS | FULL_TORSO | FULL_LEGS
cold_protection = ARMS | FULL_TORSO | FULL_LEGS
heat_protection = ARMS | FULL_TORSO | FULL_LEGS
Expand All @@ -69,3 +69,15 @@
energy = ARMOR_ENERGY_MINOR,
bomb = ARMOR_BOMB_MINOR
)

/obj/item/storage/box/willheim
name = "box"
desc = "It's just an ordinary box."

/obj/item/storage/box/willheim/New()
..()
new /obj/item/clothing/suit/armor/willheim(src)
new /obj/item/clothing/head/helmet/willheim(src)
new /obj/item/gun/energy/laser/lasgun/kanarys(src)
new /obj/item/cell/guncell/lasgun(src)
new /obj/item/cell/guncell/lasgun(src)
7 changes: 5 additions & 2 deletions mods/_fd/fd_assets/customs/kanaris/weapon.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

/obj/item/gun/energy/laser/lasgun/kanarys
name = "Lasgun"
desc = "Lasgun series D-99 designed specifically for the Fleet. Known for its devastating power, almost unique for lasers."
name = "SLR-98"
desc = "The SLR-98 (Sniper Laser Rifle) is an old, somewhat outdated, laser rifle that is heavily used by pirates and bounty hunters on Kabul. It has a shabby appearance, as well as desert camouflage, which is perfect for working on a desolate and godforsaken planet in the Pirx system. s."
icon = 'mods/_fd/fd_assets/customs/kanaris/willheim.dmi'
icon_state = "energy-rifle-s"
item_state = "rifle-scope"
Expand All @@ -28,3 +28,6 @@
list(mode_name = "semiauto", burst=1, fire_delay=2, move_delay=2, accuracy=0, charge_cost=200, projectile_type = /obj/item/projectile/lasbolt),
list(mode_name = "overcharge", burst=1, fire_delay=4, move_delay=6, accuracy=0, charge_cost=800, projectile_type = /obj/item/projectile/lasbolt/overcharge)
)

/obj/item/gun/energy/laser/lasgun/kanarys/on_update_icon()
..()
Binary file modified mods/_fd/fd_assets/customs/kanaris/willheim.dmi
Binary file not shown.

0 comments on commit 42d027d

Please sign in to comment.