cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 15:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports tgstation/tgstation/pull/15673 (#16495)

Browse Source 
* 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:
ShadowLarkens
2024-10-20 17:12:24 +02:00
committed by GitHub
parent 37891ba647
commit bcc107c7cd
67 changed files with 562 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/capture_crystal.dm
+3 -3
View File
@@ -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
code/game/objects/items/weapons/shields_vr.dm
+1 -1
View File
@@ -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()
code/game/objects/items/weapons/tanks/jetpack.dm
+3 -3
View File
@@ -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