mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 04:28:12 +01:00
Ports tgstation/tgstation/pull/15673 (#16495)
* Ports tgstation/tgstation/pull/15673 * Add a small delay to icon updating to cover up SSoverlays * Fix actions on robot modules
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
w_class = ITEMSIZE_LARGE
|
||||
unacidable = TRUE
|
||||
origin_tech = list(TECH_BIO = 4, TECH_POWER = 2)
|
||||
action_button_name = "Remove/Replace Paddles"
|
||||
actions_types = list(/datum/action/item_action/remove_replace_paddles)
|
||||
|
||||
var/obj/item/shockpaddles/linked/paddles
|
||||
var/obj/item/cell/bcell = null
|
||||
@@ -64,7 +64,7 @@
|
||||
else
|
||||
add_overlay("[initial(icon_state)]-nocell")
|
||||
|
||||
/obj/item/defib_kit/ui_action_click()
|
||||
/obj/item/defib_kit/ui_action_click(mob/user, actiontype)
|
||||
toggle_paddles()
|
||||
|
||||
/obj/item/defib_kit/attack_hand(mob/user)
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
w_class = ITEMSIZE_SMALL
|
||||
slot_flags = SLOT_BELT
|
||||
matter = list(MAT_STEEL = 50,MAT_GLASS = 20)
|
||||
action_button_name = "Toggle Flashlight"
|
||||
actions_types = list(/datum/action/item_action/toggle_flashlight)
|
||||
|
||||
light_system = MOVABLE_LIGHT_DIRECTIONAL
|
||||
light_range = 4 //luminosity when on
|
||||
@@ -102,7 +102,7 @@
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
playsound(src, 'sound/weapons/empty.ogg', 15, 1, -3) // VOREStation Edit
|
||||
update_brightness()
|
||||
user.update_action_buttons()
|
||||
user.update_action_buttons_icon()
|
||||
return 1
|
||||
|
||||
/obj/item/flashlight/emp_act(severity)
|
||||
@@ -355,7 +355,7 @@
|
||||
light_color = LIGHT_COLOR_FLARE
|
||||
icon_state = "flare"
|
||||
item_state = "flare"
|
||||
action_button_name = null //just pull it manually, neckbeard.
|
||||
actions_types = list() //just pull it manually, neckbeard.
|
||||
var/fuel = 0
|
||||
var/on_damage = 7
|
||||
var/produce_heat = 1500
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
w_class = ITEMSIZE_HUGE //It's a giant shield generator!!!
|
||||
unacidable = TRUE
|
||||
origin_tech = list(TECH_MATERIAL = 6, TECH_COMBAT = 8, TECH_POWER = 6, TECH_DATA = 4) //These are limited AND high tech. Breaking one of them down is massive.
|
||||
action_button_name = "Toggle Shield"
|
||||
actions_types = list(/datum/action/item_action/toggle_shield)
|
||||
var/obj/item/gun/energy/gun/generator/active_weapon
|
||||
var/obj/item/cell/device/bcell = null
|
||||
var/upgraded = 0 // If the PSG has been upgraded by some method or not. Only used for the mining belt ATM.
|
||||
@@ -138,7 +138,7 @@
|
||||
bcell.emp_act(severity)
|
||||
..()
|
||||
|
||||
/obj/item/personal_shield_generator/ui_action_click()
|
||||
/obj/item/personal_shield_generator/ui_action_click(mob/user, actiontype)
|
||||
toggle_shield()
|
||||
|
||||
/obj/item/personal_shield_generator/attack_hand(mob/user)
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
throwforce = 6
|
||||
preserve_item = 1
|
||||
w_class = ITEMSIZE_LARGE
|
||||
action_button_name = "Remove/Replace Handset"
|
||||
actions_types = list(/datum/action/item_action/remove_replace_handset)
|
||||
|
||||
var/obj/item/radio/bluespacehandset/linked/handset = /obj/item/radio/bluespacehandset/linked
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
. = ..()
|
||||
QDEL_NULL(handset)
|
||||
|
||||
/obj/item/bluespaceradio/ui_action_click()
|
||||
/obj/item/bluespaceradio/ui_action_click(mob/user, actiontype)
|
||||
toggle_handset()
|
||||
|
||||
/obj/item/bluespaceradio/attack_hand(var/mob/user)
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
throwforce = 10.0
|
||||
throw_speed = 1
|
||||
throw_range = 4
|
||||
action_button_name = "Toggle Heatsink"
|
||||
actions_types = list(/datum/action/item_action/toggle_heatsink)
|
||||
|
||||
matter = list(MAT_STEEL = 15000, MAT_GLASS = 3500)
|
||||
origin_tech = list(TECH_MAGNET = 2, TECH_MATERIAL = 2)
|
||||
@@ -28,8 +28,8 @@
|
||||
|
||||
//TODO: make it heat up the surroundings when not in space
|
||||
|
||||
/obj/item/suit_cooling_unit/ui_action_click()
|
||||
toggle(usr)
|
||||
/obj/item/suit_cooling_unit/ui_action_click(mob/user, actiontype)
|
||||
toggle(user)
|
||||
|
||||
/obj/item/suit_cooling_unit/Initialize()
|
||||
. = ..()
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
pickup_sound = 'sound/items/pickup/ring.ogg'
|
||||
throwforce = 0
|
||||
force = 0
|
||||
action_button_name = "Command"
|
||||
actions_types = list(/datum/action/item_action/command)
|
||||
|
||||
var/active = FALSE //Is it set up?
|
||||
var/mob/living/owner //Reference to the owner
|
||||
@@ -48,7 +48,7 @@
|
||||
. += span_deptradio("<a href='?src=\ref[bound_mob];vore_prefs=1'>\[Mechanical Vore Preferences\]</a>")
|
||||
|
||||
//Command! This lets the owner toggle hostile on AI controlled mobs, or send a silent command message to your bound mob, wherever they may be.
|
||||
/obj/item/capture_crystal/ui_action_click()
|
||||
/obj/item/capture_crystal/ui_action_click(mob/user, actiontype)
|
||||
if(!ismob(loc))
|
||||
return
|
||||
var/mob/living/M = src.loc
|
||||
@@ -67,7 +67,7 @@
|
||||
to_chat(M, span_notice("\The [bound_mob] is now [AI.hostile ? "hostile" : "passive"]."))
|
||||
log_admin("[key_name_admin(M)] set [bound_mob] to [AI.hostile].")
|
||||
else if(bound_mob.client)
|
||||
var/transmit_msg = tgui_input_text(usr, "What is your command?", "Command")
|
||||
var/transmit_msg = tgui_input_text(user, "What is your command?", "Command")
|
||||
if(length(transmit_msg) >= MAX_MESSAGE_LEN)
|
||||
to_chat(M, span_danger("Your message was TOO LONG!:[transmit_msg]"))
|
||||
return
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
set_light(0)
|
||||
light_applied = 0
|
||||
update_icon(user)
|
||||
user.update_action_buttons()
|
||||
user.update_action_buttons_icon()
|
||||
playsound(src, 'sound/weapons/empty.ogg', 15, 1, -3)
|
||||
|
||||
/obj/item/shield/riot/explorer/update_icon()
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
var/on = 0.0
|
||||
var/stabilization_on = 0
|
||||
var/volume_rate = 500 //Needed for borg jetpack transfer
|
||||
action_button_name = "Toggle Jetpack"
|
||||
actions_types = list(/datum/action/item_action/toggle_jetpack)
|
||||
|
||||
/obj/item/tank/jetpack/New()
|
||||
..()
|
||||
@@ -55,7 +55,7 @@
|
||||
if (ismob(usr))
|
||||
var/mob/M = usr
|
||||
M.update_inv_back()
|
||||
M.update_action_buttons()
|
||||
M.update_action_buttons_icon()
|
||||
|
||||
to_chat(usr, "You toggle the thrusters [on? "on":"off"].")
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
fuel.remove(num)
|
||||
return 1
|
||||
|
||||
/obj/item/tank/jetpack/ui_action_click()
|
||||
/obj/item/tank/jetpack/ui_action_click(mob/user, actiontype)
|
||||
toggle()
|
||||
|
||||
/obj/item/tank/jetpack/void
|
||||
|
||||
Reference in New Issue
Block a user