mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
[MIRROR] Ports tgstation/tgstation/pull/15673 (#9270)
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
@@ -67,7 +67,7 @@
|
||||
desc = "A suction cupped mass of flesh, shaped like a foot."
|
||||
name = "fleshy grippers"
|
||||
icon_state = "lingspacesuit"
|
||||
action_button_name = "Toggle Grippers"
|
||||
actions_types = list(/datum/action/item_action/toggle_grippers)
|
||||
canremove = FALSE
|
||||
|
||||
/obj/item/clothing/shoes/magboots/changeling/set_slowdown()
|
||||
@@ -124,7 +124,7 @@
|
||||
desc = "A tough, hard mass of chitin, with long talons for digging into terrain."
|
||||
name = "chitinous talons"
|
||||
icon_state = "lingarmor"
|
||||
action_button_name = "Toggle Talons"
|
||||
actions_types = list(/datum/action/item_action/toggle_talons)
|
||||
|
||||
/obj/item/clothing/gloves/combat/changeling //Combined insulated/fireproof gloves
|
||||
name = "chitinous gauntlets"
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
blood_overlay_type = "armor"
|
||||
slowdown = 0
|
||||
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||
action_button_name = "Toggle Shield Projector"
|
||||
actions_types = list(/datum/action/item_action/toggle_shield_projector)
|
||||
var/active = 0
|
||||
var/damage_to_energy_multiplier = 50.0 //Determines how much energy to charge for blocking, e.g. 20 damage attack = 750 energy cost
|
||||
var/datum/effect/effect/system/spark_spread/spark_system = null
|
||||
@@ -78,7 +78,7 @@
|
||||
to_chat(user, span_notice("You [active ? "" : "de"]activate \the [src]."))
|
||||
update_icon()
|
||||
user.update_inv_wear_suit()
|
||||
user.update_action_buttons()
|
||||
user.update_action_buttons_icon()
|
||||
|
||||
/obj/item/clothing/suit/armor/shield/update_icon()
|
||||
icon_state = "shield_armor_[active]"
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
blood_overlay_type = "armor"
|
||||
slowdown = 0.5
|
||||
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||
action_button_name = "Toggle Tesla Armor"
|
||||
actions_types = list(/datum/action/item_action/toggle_tesla_armor)
|
||||
var/active = 1 //Determines if the armor will zap or block
|
||||
var/ready = 1 //Determines if the next attack will be blocked, as well if a strong lightning bolt is sent out at the attacker.
|
||||
var/ready_icon_state = "tesla_armor_1" //also wip
|
||||
@@ -57,7 +57,7 @@
|
||||
to_chat(user, span_notice("You [active ? "" : "de"]activate \the [src]."))
|
||||
update_icon()
|
||||
user.update_inv_wear_suit()
|
||||
user.update_action_buttons()
|
||||
user.update_action_buttons_icon()
|
||||
|
||||
/obj/item/clothing/suit/armor/tesla/update_icon()
|
||||
if(active && ready)
|
||||
@@ -72,7 +72,7 @@
|
||||
if(ishuman(loc))
|
||||
var/mob/living/carbon/human/H = loc
|
||||
H.update_inv_wear_suit(0)
|
||||
H.update_action_buttons()
|
||||
H.update_action_buttons_icon()
|
||||
..()
|
||||
|
||||
/obj/item/clothing/suit/armor/tesla/proc/shoot_lightning(mob/target, power)
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
capabilities. The lens appear to be multiple optical matrices layered together, allowing the wearer to see almost anything \
|
||||
across physical barriers."
|
||||
icon_state = "uzenwa_sissra_1"
|
||||
action_button_name = "Toggle Goggles"
|
||||
actions_types = list(/datum/action/item_action/toggle_goggles)
|
||||
origin_tech = list(TECH_MAGNET = 6, TECH_ENGINEERING = 6)
|
||||
toggleable = 1
|
||||
vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
name = "The Monocoole"
|
||||
desc = "One heck of a stylish monocle. This one lets you see a little farther..."
|
||||
icon_state = "monocle"
|
||||
action_button_name = "Toggle Goggles"
|
||||
actions_types = list(/datum/action/item_action/toggle_goggles)
|
||||
origin_tech = list(TECH_MAGNET = 6, TECH_ENGINEERING = 6)
|
||||
toggleable = 1
|
||||
vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS
|
||||
prescription = 1 // So two versions of these aren't needed.
|
||||
prescription = 1 // So two versions of these aren't needed.
|
||||
|
||||
Reference in New Issue
Block a user