cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Let admins allow ERT borgs to choose sec modules (#17874)

Browse Source 
* Let admins allow secborgs in ERT

* dont force them to be secborgs

* fixes up some logic

* remove this

* Update code/modules/tgui/modules/ert_manager.dm

* le indent

* deconflict

* tgui deconflict

* Update code/modules/tgui/modules/ert_manager.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
This commit is contained in:
S34N
2022-06-25 00:07:18 +01:00
committed by GitHub
co-authored by Charlie
parent d97c8cb6eb
commit 5f58a80d8a
4 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/response_team/ert.dm
+5 -1
View File
@@ -57,10 +57,11 @@ GLOBAL_VAR_INIT(ert_request_answered, FALSE)
return 1
/proc/trigger_armed_response_team(datum/response_team/response_team_type, commander_slots, security_slots, medical_slots, engineering_slots, janitor_slots, paranormal_slots, cyborg_slots)
/proc/trigger_armed_response_team(datum/response_team/response_team_type, commander_slots, security_slots, medical_slots, engineering_slots, janitor_slots, paranormal_slots, cyborg_slots, cyborg_security)
GLOB.response_team_members = list()
GLOB.active_team = response_team_type
GLOB.active_team.setSlots(commander_slots, security_slots, medical_slots, engineering_slots, janitor_slots, paranormal_slots, cyborg_slots)
GLOB.active_team.cyborg_security_permitted = cyborg_security
GLOB.send_emergency_team = TRUE
var/list/ert_candidates = shuffle(SSghost_spawns.poll_candidates("Join the Emergency Response Team?",, GLOB.responseteam_age, 60 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_ERT]))
@@ -136,6 +137,8 @@ GLOBAL_VAR_INIT(ert_request_answered, FALSE)
/client/proc/create_response_team(new_gender, role, turf/spawn_location)
if(role == "Cyborg")
var/mob/living/silicon/robot/ert/R = new GLOB.active_team.borg_path(spawn_location)
if(GLOB.active_team.cyborg_security_permitted)
R.force_modules = list("Security", "Engineering", "Medical")
return R
var/mob/living/carbon/human/M = new(null)
@@ -209,6 +212,7 @@ GLOBAL_VAR_INIT(ert_request_answered, FALSE)
var/janitor_outfit
var/paranormal_outfit
var/borg_path = /mob/living/silicon/robot/ert
var/cyborg_security_permitted = FALSE
/datum/response_team/proc/setSlots(com=1, sec=4, med=0, eng=0, jan=0, par=0, cyb=0)
slots["Commander"] = com