cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 09:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MODULAR] Lets cyborgs move dragged objects around (#4561)

Browse Source 
* cyborg drag

* tfw forget to commit

* move to modular

* fuck off linter

* imagine modularising properly
This commit is contained in:
Tom
2021-04-03 16:54:30 +01:00
committed by GitHub
parent 86fea27813
commit 897c02e9f3
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/_onclick/cyborg.dm
View File

@@ -92,13 +92,13 @@
//Give cyborgs hotkey clicks without breaking existing uses of hotkey clicks
// for non-doors/apcs
/mob/living/silicon/robot/CtrlShiftClickOn(atom/A) // Procs overridden in skyrat_modular/modules/Silicon_QoL
A.BorgCtrlShiftClick(src)
A.BorgCtrlShiftClick(src)
/mob/living/silicon/robot/ShiftClickOn(atom/A)
A.BorgShiftClick(src)
A.BorgShiftClick(src)
/mob/living/silicon/robot/CtrlClickOn(atom/A)
A.BorgCtrlClick(src)
/mob/living/silicon/robot/AltClickOn(atom/A)
A.BorgAltClick(src)
A.BorgAltClick(src)
/atom/proc/BorgCtrlShiftClick(mob/living/silicon/robot/user) //forward to human click if not overridden
CtrlShiftClick(user)
@@ -173,9 +173,11 @@
/mob/living/silicon/robot/RangedAttack(atom/A)
A.attack_robot(src)
/* //SKYRAT EDIT - MOVED TO modular_skyrat/master_files/code/_onclick/cyborg.dm
/atom/proc/attack_robot(mob/user)
attack_ai(user)
return
*/ //SKYRAT EDIT END
/**
* What happens when the cyborg without active module holds right-click on an item. Returns a SECONDARY_ATTACK_* value.

7
modular_skyrat/master_files/code/_onclick/cyborg.dm Normal file
View File

@@ -0,0 +1,7 @@
//Lets cyborgs drag pulled objects
/atom/proc/attack_robot(mob/user)
if((isturf(src) || istype(src, /obj/structure/table) || istype(src, /obj/machinery/conveyor)) && get_dist(user, src) <= 1)
user.Move_Pulled(src)
return
attack_ai(user)
return

3
modular_skyrat/master_files/code/game/objects/structures/tables_racks.dm Normal file
View File

@@ -0,0 +1,3 @@
//Lets cyborgs move dragged objects onto tables
/obj/structure/table/attack_robot(mob/user, list/modifiers)
return attack_hand(user, modifiers)

2
tgstation.dme
View File

@@ -3522,6 +3522,7 @@
#include "modular_skyrat\master_files\code\_globalvars\maint_loot_uncommon.dm"
#include "modular_skyrat\master_files\code\_globalvars\~maint_loot.dm"
#include "modular_skyrat\master_files\code\_globalvars\lists\ambience.dm"
#include "modular_skyrat\master_files\code\_onclick\cyborg.dm"
#include "modular_skyrat\master_files\code\controllers\configuration\entries\skryat_config_entries.dm"
#include "modular_skyrat\master_files\code\controllers\processing\circuit.dm"
#include "modular_skyrat\master_files\code\controllers\subsystem\statpanel.dm"
@@ -3542,6 +3543,7 @@
#include "modular_skyrat\master_files\code\game\objects\items\devices\radio\headset.dm"
#include "modular_skyrat\master_files\code\game\objects\items\storage\boxes.dm"
#include "modular_skyrat\master_files\code\game\objects\structures\sauna_oven.dm"
#include "modular_skyrat\master_files\code\game\objects\structures\tables_racks.dm"
#include "modular_skyrat\master_files\code\game\objects\structures\trash_pile.dm"
#include "modular_skyrat\master_files\code\modules\antagonists\ert\ert.dm"
#include "modular_skyrat\master_files\code\modules\antagonists\nukeop\equipment\nuclearbomb.dm"