cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16667 from Fox-McCloud/secborg-purge-borg-tweaks

Browse Source 
Removes Secborg, Tweaks Borgs: Combat Rework Edition
This commit is contained in:
variableundefined
2021-09-21 08:41:22 -05:00
committed by GitHub
parent b95bff0d12 b38a1e2fd7
commit b44432b8b8
5 changed files with 113 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot.dm
+2 -21
View File
@@ -300,7 +300,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
/mob/living/silicon/robot/proc/pick_module()
if(module)
return
var/list/modules = list("Generalist", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security")
var/list/modules = list("Engineering", "Medical", "Miner", "Janitor", "Service")
if(islist(force_modules) && force_modules.len)
modules = force_modules.Copy()
if(mmi != null && mmi.alien)
@@ -315,14 +315,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
return
switch(modtype)
if("Generalist")
module = new /obj/item/robot_module/standard(src)
module.channels = list("Engineering" = 1, "Medical" = 1, "Security" = 1, "Service" = 1, "Supply" = 1)
module_sprites["Basic"] = "robot_old"
module_sprites["Android"] = "droid"
module_sprites["Default"] = "Standard"
module_sprites["Noble-STD"] = "Noble-STD"
if("Service")
module = new /obj/item/robot_module/butler(src)
module.channels = list("Service" = 1)
@@ -365,17 +357,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
see_reagents = TRUE
if("Security")
if(!weapons_unlock)
var/count_secborgs = 0
for(var/mob/living/silicon/robot/R in GLOB.alive_mob_list)
if(R && R.stat != DEAD && R.module && istype(R.module, /obj/item/robot_module/security))
count_secborgs++
var/max_secborgs = 2
if(GLOB.security_level == SEC_LEVEL_GREEN)
max_secborgs = 1
if(count_secborgs >= max_secborgs)
to_chat(src, "<span class='warning'>There are too many Security cyborgs active. Please choose another module.</span>")
return
module = new /obj/item/robot_module/security(src)
module.channels = list("Security" = 1)
module_sprites["Basic"] = "secborg"
@@ -1349,7 +1330,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
scrambledcodes = 1
req_one_access = list(ACCESS_CENT_SPECOPS)
ionpulse = 1
force_modules = list("Engineering", "Medical", "Security")
force_modules = list("Engineering", "Medical")
static_radio_channels = 1
allow_rename = FALSE
weapons_unlock = TRUE
code/modules/mob/living/silicon/robot/robot_modules.dm
+1 -41
View File
@@ -265,47 +265,6 @@
/obj/item/robot_module/proc/handle_death(mob/living/silicon/robot/R, gibbed)
return
// Standard cyborg module.
/obj/item/robot_module/standard
// if station is fine, assist with constructing station goal room, cleaning, and repairing cables chewed by rats
// if medical crisis, assist by providing basic healthcare, retrieving corpses, and monitoring crew lifesigns
// if eng crisis, assist by helping repair hull breaches
// if sec crisis, assist by opening doors for sec and providing backup zipties on patrols
name = "generalist robot module"
module_type = "Standard"
subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor, /mob/living/silicon/proc/subsystem_crew_monitor)
basic_modules = list(
// sec
/obj/item/flash/cyborg,
/obj/item/restraints/handcuffs/cable/zipties/cyborg,
// janitorial
/obj/item/soap/nanotrasen,
/obj/item/lightreplacer/cyborg,
// eng
/obj/item/crowbar/cyborg,
/obj/item/wrench/cyborg,
/obj/item/extinguisher, // for firefighting, and propulsion in space
/obj/item/weldingtool/largetank/cyborg,
// mining
/obj/item/pickaxe,
/obj/item/t_scanner/adv_mining_scanner,
/obj/item/storage/bag/ore/cyborg,
// med
/obj/item/healthanalyzer,
/obj/item/reagent_containers/borghypo/basic,
/obj/item/roller_holder, // for taking the injured to medbay without worsening their injuries or leaving a blood trail the whole way
/obj/item/stack/sheet/metal/cyborg,
/obj/item/stack/cable_coil/cyborg,
/obj/item/stack/rods/cyborg,
/obj/item/stack/tile/plasteel/cyborg
)
emag_modules = list(/obj/item/melee/energy/sword/cyborg)
special_rechargables = list(
/obj/item/extinguisher,
/obj/item/weldingtool/largetank/cyborg,
/obj/item/lightreplacer/cyborg
)
// Medical cyborg module.
/obj/item/robot_module/medical
name = "medical robot module"
@@ -319,6 +278,7 @@
/obj/item/borg_defib,
/obj/item/handheld_defibrillator,
/obj/item/roller_holder,
/obj/item/borg/cyborghug,
/obj/item/reagent_containers/borghypo,
/obj/item/scalpel/laser/laser1,
/obj/item/hemostat,