cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

sort cyborg modules (#18206)

Browse Source 
* sort cyborg modules

* .

* bunch of runtimes

---------

Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
This commit is contained in:
Kashargul
2025-08-11 12:21:13 +02:00
committed by GitHub
parent c53c6bc7de
commit 867fec60bc
8 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
+1 -1
View File
@@ -364,7 +364,7 @@ ADMIN_VERB(stealth, R_STEALTH, "Stealth Mode", "Toggle stealth.", "Admin.Game")
log_admin("[key_name(usr)] used 'kill air'.")
message_admins(span_blue("[key_name_admin(usr)] used 'kill air'."), 1)
ADMIN_VERB(deadmin, R_NONE, "DeAdmin", "Shed your admin powers.", ADMIN_CATEGORY_MAIN)
ADMIN_VERB(deadmin, R_NONE, "DeAdmin", "Shed your admin powers.", ADMIN_CATEGORY_MISC)
user.holder.deactivate()
to_chat(user, span_interface("You are now a normal player."))
log_admin("[key_name(user)] deadminned themselves.")
code/modules/admin/verbs/getlogs.dm
+2 -2
View File
@@ -1,7 +1,7 @@
ADMIN_VERB(get_server_logs, (R_ADMIN | R_SERVER), "Get Server Logs", "View or retrieve logfiles.", ADMIN_CATEGORY_MAIN)
ADMIN_VERB(get_server_logs, (R_ADMIN | R_SERVER), "Get Server Logs", "View or retrieve logfiles.", ADMIN_CATEGORY_LOGS)
user.browseserverlogs()
ADMIN_VERB(get_current_logs, (R_ADMIN | R_SERVER), "Get Current Logs", "View or retrieve logfiles for the current round.", ADMIN_CATEGORY_MAIN)
ADMIN_VERB(get_current_logs, (R_ADMIN | R_SERVER), "Get Current Logs", "View or retrieve logfiles for the current round.", ADMIN_CATEGORY_LOGS)
user.browseserverlogs(current=TRUE)
/client/proc/browseserverlogs(current=FALSE)
code/modules/mob/living/silicon/robot/robot_simple_items.dm
+3 -5
View File
@@ -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
code/modules/mob/login.dm
+1
View File
@@ -87,3 +87,4 @@
SEND_SIGNAL(client, COMSIG_CLIENT_MOB_LOGIN, src)
set_listening(LISTENING_PLAYER)
GLOB.tickets.ClientLogin(client, TRUE)
code/modules/research/tg/designs/prosfab_designs.dm
+25 -1
View File
@@ -333,7 +333,7 @@
//////////////////// Cyborg Modules ////////////////////
/datum/design_techweb/prosfab/robot_upgrade
category = list(
RND_CATEGORY_MECHFAB_CYBORG_MODULES
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_UTILITY
)
build_type = PROSFAB
materials = list(MAT_STEEL = 7500)
@@ -360,6 +360,10 @@
build_path = /obj/item/borg/upgrade/utility/restart
// Section for basic upgrades for all cyborgs
/datum/design_techweb/prosfab/robot_upgrade/basic
category = list(
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_BASIC
)
/datum/design_techweb/prosfab/robot_upgrade/basic/sizeshift
name = "Size Alteration Module"
@@ -392,6 +396,10 @@
build_path = /obj/item/borg/upgrade/basic/language
// Section for advanced upgrades for all cyborgs
/datum/design_techweb/prosfab/robot_upgrade/advanced
category = list(
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ADVANCED
)
/datum/design_techweb/prosfab/robot_upgrade/advanced/bellysizeupgrade
name = "Robohound Capacity Expansion Module"
@@ -424,6 +432,10 @@
/*
Some job related borg upgrade modules, adding useful items for puppers.
*/
/datum/design_techweb/prosfab/robot_upgrade/restricted
category = list(
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_RESTRICTED
)
/datum/design_techweb/prosfab/robot_upgrade/restricted/bellycapupgrade
name = "Robohound Capability Expansion Module"
@@ -433,6 +445,9 @@
build_path = /obj/item/borg/upgrade/restricted/bellycapupgrade
/datum/design_techweb/prosfab/robot_upgrade/restricted/advrped
category = list(
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_RESTRICTED + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SCIENCE
)
name = "Advanced Rapid Part Exchange Device"
desc = "Exactly the same as a standard Advanced RPED, but this one has mounting hardware for a Science Borg."
id = "borg_advrped_module"
@@ -441,6 +456,9 @@
build_path = /obj/item/borg/upgrade/restricted/advrped
/datum/design_techweb/prosfab/robot_upgrade/restricted/diamonddrill
category = list(
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_RESTRICTED + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MINING
)
name = "Diamond Drill"
desc = "A mining drill with a diamond tip, made for use by Mining Borgs."
id = "borg_ddrill_module"
@@ -449,6 +467,9 @@
build_path = /obj/item/borg/upgrade/restricted/diamonddrill
/datum/design_techweb/prosfab/robot_upgrade/restricted/pka
category = list(
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_RESTRICTED + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MINING
)
name = "Proto-Kinetic Accelerator"
desc = "A mining weapon designed for clearing rocks and hostile wildlife. This model is equiped with a self upgrade system, allowing it to attach modules hands free."
id = "borg_pka_module"
@@ -457,6 +478,9 @@
build_path = /obj/item/borg/upgrade/restricted/pka
/datum/design_techweb/prosfab/robot_upgrade/restricted/tasercooler
category = list(
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_RESTRICTED + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SECURITY
)
name = "Rapid Taser Cooling Module"
desc = "Used to cool a mounted taser, increasing the potential current in it and thus its recharge rate."
id = "borg_taser_module"
code/modules/tickets/tickets.dm
+5 -4
View File
@@ -157,19 +157,20 @@ GLOBAL_DATUM_INIT(tickets, /datum/tickets, new)
return L
//Reassociate still open ticket if one exists
/datum/tickets/proc/ClientLogin(client/C)
/datum/tickets/proc/ClientLogin(client/C, only_alert = FALSE)
C.current_ticket = CKey2ActiveTicket(C.ckey)
if(C.current_ticket)
C.current_ticket.AddInteraction("Client reconnected.")
if(!only_alert)
C.current_ticket.AddInteraction("Client reconnected.")
C.current_ticket.initiator = C
C.current_ticket.initiator.mob.throw_alert("open ticket", /obj/screen/alert/open_ticket)
C.current_ticket.initiator.mob?.throw_alert("open ticket", /obj/screen/alert/open_ticket)
//Dissasociate ticket
/datum/tickets/proc/ClientLogout(client/C)
if(C.current_ticket)
var/datum/ticket/T = C.current_ticket
T.AddInteraction("Client disconnected.")
T.initiator.mob?.clear_alert("open ticket")
T.initiator?.mob?.clear_alert("open ticket")
T.initiator = null
T = null