mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-27 23:14:18 +01:00
Adds some Skrell weapons/armour/uniforms for the Skrell team. (#14490)
This commit is contained in:
@@ -631,3 +631,11 @@
|
||||
desc = "A Vaurca cloak with storage pockets. This one has the security department design."
|
||||
icon_state = "seccape"
|
||||
item_state = "seccape"
|
||||
|
||||
/obj/item/storage/backpack/kala
|
||||
name = "skrell backpack"
|
||||
desc = "A lightly padded, waterproof backpack worn by Skrell."
|
||||
icon = 'icons/clothing/kit/skrell_armor.dmi'
|
||||
icon_state = "kala_backpack"
|
||||
item_state = "kala_backpack"
|
||||
contained_sprite = TRUE
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
icon = 'icons/obj/contained_items/weapons/telebaton.dmi'
|
||||
icon_state = "telebaton_0"
|
||||
item_state = "telebaton_0"
|
||||
var/state_extended = "telebaton_1"
|
||||
contained_sprite = TRUE
|
||||
slot_flags = SLOT_BELT
|
||||
w_class = ITEMSIZE_SMALL
|
||||
@@ -47,19 +48,22 @@
|
||||
pickup_sound = 'sound/items/pickup/crowbar.ogg'
|
||||
var/on = FALSE
|
||||
|
||||
/obj/item/melee/telebaton/proc/do_special_effects(var/mob/living/carbon/human/H)
|
||||
return
|
||||
|
||||
/obj/item/melee/telebaton/attack_self(mob/user)
|
||||
on = !on
|
||||
if(on)
|
||||
user.visible_message(SPAN_WARNING("With a flick of their wrist, [user] extends their telescopic baton."), SPAN_WARNING("You extend the baton."), SPAN_WARNING("You hear an ominous click."))
|
||||
icon_state = "telebaton_1"
|
||||
item_state = "telebaton_1"
|
||||
icon_state = state_extended
|
||||
item_state = state_extended
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
force = 15 //quite robust
|
||||
attack_verb = list("smacked", "struck", "slapped")
|
||||
else
|
||||
user.visible_message(SPAN_NOTICE("\The [user] collapses their telescopic baton."), SPAN_NOTICE("You collapse the baton."), SPAN_NOTICE("You hear a click."))
|
||||
icon_state = "telebaton_0"
|
||||
item_state = "telebaton_0"
|
||||
icon_state = initial(icon_state)
|
||||
item_state = initial(item_state)
|
||||
w_class = ITEMSIZE_SMALL
|
||||
force = 3 //not so robust now
|
||||
attack_verb = list("hit", "punched")
|
||||
@@ -86,6 +90,7 @@
|
||||
|
||||
/obj/item/melee/telebaton/attack(mob/target, mob/living/user, var/target_zone)
|
||||
if(on)
|
||||
do_special_effects(target)
|
||||
if(user.is_clumsy() && prob(50))
|
||||
to_chat(user, SPAN_WARNING("You club yourself over the head."))
|
||||
user.Weaken(3 * force)
|
||||
@@ -100,4 +105,16 @@
|
||||
var/mob/living/carbon/human/T = target
|
||||
T.apply_damage(40, PAIN, target_zone)
|
||||
return
|
||||
return ..()
|
||||
return ..()
|
||||
|
||||
/obj/item/melee/telebaton/nlom
|
||||
name = "nlomkala baton"
|
||||
icon = 'icons/obj/contained_items/skrell/skrell_weaponry.dmi'
|
||||
icon_state = "nlom_telebaton_0"
|
||||
item_state = "nlom_telebaton_0"
|
||||
state_extended = "nlom_telebaton_1"
|
||||
force = 5
|
||||
contained_sprite = TRUE
|
||||
|
||||
/obj/item/melee/telebaton/nlom/do_special_effects(var/mob/living/carbon/human/H)
|
||||
spark(H, 5)
|
||||
Reference in New Issue
Block a user