mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-17 18:13:34 +01:00
Merge pull request #8312 from Kyep/ert_borg_fix
Tweaks/Improves ERT borgs
This commit is contained in:
@@ -50,6 +50,12 @@ var/list/robot_verbs_default = list(
|
||||
|
||||
var/opened = 0
|
||||
var/emagged = 0
|
||||
|
||||
var/list/force_modules = list()
|
||||
var/allow_rename = TRUE
|
||||
var/weapons_unlock = FALSE
|
||||
var/static_radio_channels = FALSE
|
||||
|
||||
var/wiresexposed = 0
|
||||
var/locked = 1
|
||||
var/list/req_access = list(access_robotics)
|
||||
@@ -215,7 +221,9 @@ var/list/robot_verbs_default = list(
|
||||
set category = "Robot Commands"
|
||||
if(custom_name)
|
||||
return 0
|
||||
|
||||
if(!allow_rename)
|
||||
to_chat(src, "<span class='warning'>Rename functionality is not enabled on this unit.</span>");
|
||||
return 0
|
||||
rename_self(braintype, 1)
|
||||
|
||||
/mob/living/silicon/robot/proc/sync()
|
||||
@@ -271,6 +279,8 @@ var/list/robot_verbs_default = list(
|
||||
modules += "Security"
|
||||
if(!config.forbid_peaceborg)
|
||||
modules += "Peacekeeper"
|
||||
if(islist(force_modules) && force_modules.len)
|
||||
modules = force_modules.Copy()
|
||||
if(security_level == (SEC_LEVEL_GAMMA || SEC_LEVEL_EPSILON) || crisis)
|
||||
to_chat(src, "<span class='warning'>Crisis mode active. Combat module available.</span>")
|
||||
modules += "Combat"
|
||||
@@ -405,7 +415,8 @@ var/list/robot_verbs_default = list(
|
||||
status_flags &= ~CANPUSH
|
||||
|
||||
choose_icon(6,module_sprites)
|
||||
radio.config(module.channels)
|
||||
if(!static_radio_channels)
|
||||
radio.config(module.channels)
|
||||
notify_ai(2)
|
||||
|
||||
//for borg hotkeys, here module refers to borg inv slot, not core module
|
||||
@@ -1012,7 +1023,7 @@ var/list/robot_verbs_default = list(
|
||||
dat += text("<tr><td>[obj]</td><td><B>Activated</B></td></tr>")
|
||||
else
|
||||
dat += text("<tr><td>[obj]</td><td><A HREF=?src=[UID()];act=\ref[obj]>Activate</A></td></tr>")
|
||||
if(emagged)
|
||||
if(emagged || weapons_unlock)
|
||||
if(activated(module.emag))
|
||||
dat += text("<tr><td>[module.emag]</td><td><B>Activated</B></td></tr>")
|
||||
else
|
||||
@@ -1461,6 +1472,12 @@ var/list/robot_verbs_default = list(
|
||||
req_access = list(access_cent_specops)
|
||||
ionpulse = 1
|
||||
|
||||
force_modules = list("Engineering", "Medical", "Security")
|
||||
static_radio_channels = 1
|
||||
allow_rename = FALSE
|
||||
weapons_unlock = TRUE
|
||||
|
||||
|
||||
/mob/living/silicon/robot/ert/init()
|
||||
laws = new /datum/ai_laws/ert_override
|
||||
radio = new /obj/item/device/radio/borg/ert(src)
|
||||
|
||||
Reference in New Issue
Block a user