cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 08:01:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

TGUI fixes, part 3 (#16560)

Browse Source 
* a

* TGUI fixes part 3

* ugh

* bwuh

* ambiguous my ass

* AOAOAOAO

* pt 4

* extra foolproof

* a

* ok good thing i caught that

* enable that for AI

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
This commit is contained in:
Matt Atlas
2023-06-27 23:33:21 +02:00
committed by GitHub
parent 06f8ced03b
commit e237808ea9
25 changed files with 259 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
code/_onclick/ai.dm
View File

@@ -105,8 +105,8 @@
return
..()
/mob/living/silicon/ai/AltClickOn(var/atom/A)
if(!control_disabled && A.AIAltClick(src))
/mob/living/silicon/ai/AltClickOn(var/mob/living/silicon/user)
if(!control_disabled && user.AIAltClick(src))
return
/mob/living/silicon/ai/MiddleClickOn(var/atom/A)
@@ -122,64 +122,55 @@
/atom/proc/AICtrlShiftClick()
return
/atom/proc/AIShiftClick()
/atom/proc/AIShiftClick(var/mob/user)
return
/obj/machinery/door/airlock/AIShiftClick() // Opens and closes doors!
if(density)
Topic(src, list("command"="open", "activate" = "1"))
else
Topic(src, list("command"="open", "activate" = "0"))
return 1
/obj/machinery/door/airlock/AIShiftClick(var/mob/user) // Opens and closes doors!
open_interact(user, density)
return TRUE
/atom/proc/AICtrlClick(mob/user)
return
/obj/machinery/door/airlock/AICtrlClick(mob/user) // Bolts doors
var/command = player_is_antag(user.mind) ? "bolts_override" : "bolts"
if(locked)
Topic(src, list("command"=command, "activate" = "0"))
if(player_is_antag(user.mind))
bolts_override(user, !locked, FALSE, player_is_antag(user.mind))
else
Topic(src, list("command"=command, "activate" = "1"))
return 1
bolts_interact(user, !locked, FALSE, player_is_antag(user.mind))
return TRUE
/obj/machinery/power/apc/AICtrlClick() // turns off/on APCs.
Topic(src, list("breaker"="1"))
return 1
toggle_breaker()
return TRUE
/obj/machinery/turretid/AICtrlClick() //turns off/on Turrets
Topic(src, list("turret_ref" = "this", "command"="enable", "value"="[!enabled]"))
return 1
enabled = !enabled
updateTurrets()
return TRUE
/atom/proc/AIAltClick(var/atom/A)
return AltClick(A)
/atom/proc/AIAltClick(var/mob/living/silicon/user)
return AltClick(user)
/obj/machinery/door/airlock/AIAltClick() // Electrifies doors.
if(!electrified_until)
// permanent shock
Topic(src, list("command"="electrify_permanently", "activate" = "1"))
/obj/machinery/door/airlock/AIAltClick(var/mob/living/silicon/user) // Electrifies doors.
var/antag = player_is_antag(user.mind)
if(!antag && (electrified_until == 0))
to_chat(user, SPAN_WARNING("Your programming prevents you from electrifying the door."))
return FALSE
else
// disable/6 is not in Topic; disable/5 disables both temporary and permanent shock
Topic(src, list("command"="electrify_permanently", "activate" = "0"))
return 1
if(!electrified_until)
// permanent shock
electrify(-1, 1)
else
electrify(0)
return TRUE
/obj/machinery/turretid/AIAltClick() //toggles lethal on turrets
Topic(src, list("turret_ref" = "this", "command"="lethal", "value"="[!lethal]"))
return 1
/obj/machinery/turretid/AIAltClick(var/mob/living/silicon/user) //toggles lethal on turrets
lethal = !lethal
updateTurrets()
return TRUE
/atom/proc/AIMiddleClick(var/mob/living/silicon/user)
return 0
/obj/machinery/door/airlock/AIMiddleClick() // Toggles door bolt lights.
if(..())
return
if(!src.lights)
Topic(src, list("command"="lights", "activate" = "1"))
else
Topic(src, list("command"="lights", "activate" = "0"))
return 1
return FALSE
//
// Override AdjacentQuick for AltClicking
//

31
code/_onclick/cyborg.dm
View File

@@ -111,42 +111,39 @@
if (doClickAction)
A.BorgAltClick(src)
/atom/proc/BorgCtrlShiftClick(var/mob/living/silicon/robot/user) //forward to human click if not overriden
CtrlShiftClick(user)
/obj/machinery/door/airlock/BorgCtrlShiftClick()
AICtrlShiftClick()
/obj/machinery/door/airlock/BorgCtrlShiftClick(var/mob/living/silicon/robot/user)
AICtrlShiftClick(user)
/atom/proc/BorgShiftClick(var/mob/living/silicon/robot/user) //forward to human click if not overriden
ShiftClick(user)
/obj/machinery/door/airlock/BorgShiftClick() // Opens and closes doors! Forwards to AI code.
AIShiftClick()
/obj/machinery/door/airlock/BorgShiftClick(var/mob/living/silicon/robot/user) // Opens and closes doors! Forwards to AI code.
AIShiftClick(user)
/atom/proc/BorgCtrlClick(var/mob/living/silicon/robot/user) //forward to human click if not overriden
CtrlClick(user)
/obj/machinery/door/airlock/BorgCtrlClick(mob/user) // Bolts doors. Forwards to AI code.
/obj/machinery/door/airlock/BorgCtrlClick(var/mob/living/silicon/robot/user) // Bolts doors. Forwards to AI code.
AICtrlClick(user)
/obj/machinery/power/apc/BorgCtrlClick() // turns off/on APCs. Forwards to AI code.
AICtrlClick()
/obj/machinery/power/apc/BorgCtrlClick(var/mob/living/silicon/robot/user) // turns off/on APCs. Forwards to AI code.
AICtrlClick(user)
/obj/machinery/turretid/BorgCtrlClick() //turret control on/off. Forwards to AI code.
AICtrlClick()
/obj/machinery/turretid/BorgCtrlClick(var/mob/living/silicon/robot/user) //turret control on/off. Forwards to AI code.
AICtrlClick(user)
/atom/proc/BorgAltClick(var/mob/living/silicon/robot/user)
AltClick(user)
return
/obj/machinery/door/airlock/BorgAltClick() // Eletrifies doors. Forwards to AI code.
AIAltClick()
/obj/machinery/door/airlock/BorgAltClick(var/mob/living/silicon/robot/user) // Eletrifies doors. Forwards to AI code.
AIAltClick(user)
/obj/machinery/turretid/BorgAltClick() //turret lethal on/off. Forwards to AI code.
AIAltClick()
/obj/machinery/turretid/BorgAltClick(var/mob/living/silicon/robot/user) //turret lethal on/off. Forwards to AI code.
AIAltClick(user)
/*
As with AI, these are not used in click code,
@@ -163,4 +160,4 @@
/atom/proc/attack_robot(mob/user)
attack_ai(user)
return
return