mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-25 21:19:44 +01:00
sort cyborg modules (#18206)
* sort cyborg modules * . * bunch of runtimes --------- Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
This commit is contained in:
co-authored by
ShadowLarkens
parent
c53c6bc7de
commit
867fec60bc
@@ -596,9 +596,9 @@
|
||||
///Allows use of the gripper (and clears the weakref) after do_after is completed. Clears the weakref if the wrapped item is no longer in our borg's contents (items get moved into the borgs contents when using the gripper)
|
||||
/obj/item/gripper/proc/end_using()
|
||||
gripper_in_use = FALSE
|
||||
if(!WR)
|
||||
return
|
||||
var/obj/item/wrapped = get_current_pocket()
|
||||
if(!wrapped)
|
||||
return
|
||||
//Checks two things:
|
||||
//Is our wrapped object currently in our borg still?
|
||||
//AND Is it not a gripper pocket? If not, reset WR.
|
||||
@@ -883,9 +883,7 @@
|
||||
//HELPER PROCS
|
||||
///Use this to get what the current pocket is. Returns NULL if no
|
||||
/obj/item/gripper/proc/get_current_pocket() //done as a proc so snowflake code can be found later down the line and consolidated.
|
||||
if(!WR)
|
||||
return null
|
||||
var/obj/item/wrapped = WR.resolve()
|
||||
var/obj/item/wrapped = WR?.resolve()
|
||||
return wrapped
|
||||
|
||||
/// Consolidates material stacks by searching our pockets to see if we currently have any stacks. Done in /obj/item/stack/attackby
|
||||
|
||||
@@ -87,3 +87,4 @@
|
||||
SEND_SIGNAL(client, COMSIG_CLIENT_MOB_LOGIN, src)
|
||||
|
||||
set_listening(LISTENING_PLAYER)
|
||||
GLOB.tickets.ClientLogin(client, TRUE)
|
||||
|
||||
Reference in New Issue
Block a user