From cb6c2fd854e90808831667c79af0829bcba2092c Mon Sep 17 00:00:00 2001 From: MuckerMayhem <1161516+MuckerMayhem@users.noreply.github.com> Date: Mon, 4 Dec 2023 16:55:42 +0300 Subject: [PATCH] [MIRROR] re-add borg all access, tweak antag borg loadouts --- .../living/silicon/robot/modules/_module.dm | 2 +- .../silicon/robot/modules/module_clerical.dm | 1 - .../robot/modules/module_engineering.dm | 5 +- .../silicon/robot/modules/module_janitor.dm | 7 +- .../robot/modules/module_maintenance_drone.dm | 1 - .../silicon/robot/modules/module_medical.dm | 1 - .../silicon/robot/modules/module_miner.dm | 1 - .../silicon/robot/modules/module_research.dm | 1 - .../silicon/robot/modules/module_security.dm | 2 - .../silicon/robot/modules/module_standard.dm | 1 - maps/torch/job/torch_jobs.dm | 6 - maps/torch/robot/_robot_access.dm | 173 ------------------ maps/torch/torch.dm | 1 - 13 files changed, 8 insertions(+), 194 deletions(-) delete mode 100644 maps/torch/robot/_robot_access.dm diff --git a/code/modules/mob/living/silicon/robot/modules/_module.dm b/code/modules/mob/living/silicon/robot/modules/_module.dm index cf782a6f3abf5..ad0c9f886b9ac 100644 --- a/code/modules/mob/living/silicon/robot/modules/_module.dm +++ b/code/modules/mob/living/silicon/robot/modules/_module.dm @@ -56,7 +56,7 @@ /// Whether or not to include the map's defined `synth_access` list. var/use_map_synth_access = TRUE /// Whether or not to apply get_all_station_access() to the access flags. - var/use_all_station_access = FALSE + var/use_all_station_access = TRUE /obj/item/robot_module/Initialize() diff --git a/code/modules/mob/living/silicon/robot/modules/module_clerical.dm b/code/modules/mob/living/silicon/robot/modules/module_clerical.dm index cc2b15298263b..29068d4100253 100644 --- a/code/modules/mob/living/silicon/robot/modules/module_clerical.dm +++ b/code/modules/mob/living/silicon/robot/modules/module_clerical.dm @@ -40,7 +40,6 @@ emag_gear = list( /obj/item/melee/baton/robot/electrified_arm, /obj/item/device/flash, - /obj/item/gun/energy/gun, /obj/item/reagent_containers/food/drinks/bottle/small/beer/fake ) skills = list( diff --git a/code/modules/mob/living/silicon/robot/modules/module_engineering.dm b/code/modules/mob/living/silicon/robot/modules/module_engineering.dm index a5a48fafa3553..de06a749d69a4 100644 --- a/code/modules/mob/living/silicon/robot/modules/module_engineering.dm +++ b/code/modules/mob/living/silicon/robot/modules/module_engineering.dm @@ -66,7 +66,6 @@ emag_gear = list( /obj/item/melee/baton/robot/electrified_arm, /obj/item/device/flash, - /obj/item/gun/energy/gun, /obj/item/rcd/borg, /obj/item/flamethrower/full/loaded, /obj/item/shield_diffuser, @@ -81,6 +80,8 @@ SKILL_COMPUTER = SKILL_EXPERIENCED ) + var/flamethrower_recharge_modifier = 8 + /obj/item/robot_module/engineering/finalize_synths() var/datum/matter_synth/metal/metal = locate() in synths @@ -133,7 +134,7 @@ if (R.emagged) var/obj/item/flamethrower/full/loaded/flamethrower = locate() in equipment if (flamethrower) - flamethrower.beaker.reagents.add_reagent(/datum/reagent/napalm, 10 * amount) + flamethrower.beaker.reagents.add_reagent(/datum/reagent/napalm, flamethrower_recharge_modifier * amount) var/obj/item/shield_diffuser/diff = locate() in equipment if (diff) diff --git a/code/modules/mob/living/silicon/robot/modules/module_janitor.dm b/code/modules/mob/living/silicon/robot/modules/module_janitor.dm index 6c2de11596669..43cb3c0dad539 100644 --- a/code/modules/mob/living/silicon/robot/modules/module_janitor.dm +++ b/code/modules/mob/living/silicon/robot/modules/module_janitor.dm @@ -23,11 +23,12 @@ emag_gear = list( /obj/item/melee/baton/robot/electrified_arm, /obj/item/device/flash, - /obj/item/gun/energy/gun, /obj/item/reagent_containers/spray, /obj/item/flamethrower/full/loaded ) + var/flamethrower_recharge_modifier = 20 + /obj/item/robot_module/janitor/finalize_emag() . = ..() @@ -44,8 +45,8 @@ if (R.emagged) var/obj/item/reagent_containers/spray/S = locate() in equipment if (S) - S.reagents.add_reagent(/datum/reagent/fuel, 30 * amount) + S.reagents.add_reagent(/datum/reagent/fuel, flamethrower_recharge_modifier * amount) var/obj/item/flamethrower/full/loaded/flamethrower = locate() in equipment if (flamethrower) - flamethrower.beaker.reagents.add_reagent(/datum/reagent/napalm, 30 * amount) + flamethrower.beaker.reagents.add_reagent(/datum/reagent/napalm, flamethrower_recharge_modifier * amount) diff --git a/code/modules/mob/living/silicon/robot/modules/module_maintenance_drone.dm b/code/modules/mob/living/silicon/robot/modules/module_maintenance_drone.dm index 127eef638fc99..db83c821c9b9a 100644 --- a/code/modules/mob/living/silicon/robot/modules/module_maintenance_drone.dm +++ b/code/modules/mob/living/silicon/robot/modules/module_maintenance_drone.dm @@ -53,7 +53,6 @@ SKILL_CONSTRUCTION = SKILL_EXPERIENCED, SKILL_ELECTRICAL = SKILL_EXPERIENCED ) - use_all_station_access = TRUE /obj/item/robot_module/drone/finalize_equipment(mob/living/silicon/robot/R) . = ..() diff --git a/code/modules/mob/living/silicon/robot/modules/module_medical.dm b/code/modules/mob/living/silicon/robot/modules/module_medical.dm index 2495f3f91e4b0..e480c98907874 100644 --- a/code/modules/mob/living/silicon/robot/modules/module_medical.dm +++ b/code/modules/mob/living/silicon/robot/modules/module_medical.dm @@ -13,7 +13,6 @@ emag_gear = list( /obj/item/melee/baton/robot/electrified_arm, /obj/item/device/flash, - /obj/item/gun/energy/gun, /obj/item/reagent_containers/spray/chemsprayer, /obj/item/gun/launcher/syringe/rapid/sleepy ) diff --git a/code/modules/mob/living/silicon/robot/modules/module_miner.dm b/code/modules/mob/living/silicon/robot/modules/module_miner.dm index 687734b669aaa..cdda66466bf15 100644 --- a/code/modules/mob/living/silicon/robot/modules/module_miner.dm +++ b/code/modules/mob/living/silicon/robot/modules/module_miner.dm @@ -33,7 +33,6 @@ ) emag_gear = list( /obj/item/melee/baton/robot/electrified_arm, - /obj/item/gun/energy/gun, /obj/item/rcd/borg ) diff --git a/code/modules/mob/living/silicon/robot/modules/module_research.dm b/code/modules/mob/living/silicon/robot/modules/module_research.dm index 997e595346f23..79ab1c3aa0415 100644 --- a/code/modules/mob/living/silicon/robot/modules/module_research.dm +++ b/code/modules/mob/living/silicon/robot/modules/module_research.dm @@ -34,7 +34,6 @@ emag_gear = list( /obj/item/melee/baton/robot/electrified_arm, /obj/item/device/flash, - /obj/item/gun/energy/gun, /obj/prefab/hand_teleporter, /obj/item/gun/energy/decloner ) diff --git a/code/modules/mob/living/silicon/robot/modules/module_security.dm b/code/modules/mob/living/silicon/robot/modules/module_security.dm index a1f643067f8fd..313ebbb7478ce 100644 --- a/code/modules/mob/living/silicon/robot/modules/module_security.dm +++ b/code/modules/mob/living/silicon/robot/modules/module_security.dm @@ -46,8 +46,6 @@ ) emag_gear = list( /obj/item/melee/baton/robot/electrified_arm, - /obj/item/gun/energy/gun, - /obj/item/gun/projectile/automatic/sec_smg, /obj/item/gun/energy/plasmacutter, /obj/item/borg/combat/shield ) diff --git a/code/modules/mob/living/silicon/robot/modules/module_standard.dm b/code/modules/mob/living/silicon/robot/modules/module_standard.dm index 9eeb5eb37af3e..66a8b8327979d 100644 --- a/code/modules/mob/living/silicon/robot/modules/module_standard.dm +++ b/code/modules/mob/living/silicon/robot/modules/module_standard.dm @@ -15,7 +15,6 @@ emag_gear = list( /obj/item/melee/baton/robot/electrified_arm, /obj/item/device/flash, - /obj/item/gun/energy/gun, /obj/item/borg/combat/shield ) skills = list( diff --git a/maps/torch/job/torch_jobs.dm b/maps/torch/job/torch_jobs.dm index 83364a7f04111..9688d6b42d404 100644 --- a/maps/torch/job/torch_jobs.dm +++ b/maps/torch/job/torch_jobs.dm @@ -8,12 +8,6 @@ /datum/species/vox = list(/datum/job/ai, /datum/job/cyborg), /datum/species/human/mule = list(/datum/job/ai, /datum/job/cyborg, /datum/job/merchant) ) - synth_access = list( - access_synth, - access_maint_tunnels, - access_teleporter, - access_solgov_crew - ) #define HUMAN_ONLY_JOBS /datum/job/captain, /datum/job/hop, /datum/job/cmo, /datum/job/chief_engineer, /datum/job/hos, /datum/job/representative, /datum/job/sea, /datum/job/pathfinder, /datum/job/rd species_to_job_blacklist = list( diff --git a/maps/torch/robot/_robot_access.dm b/maps/torch/robot/_robot_access.dm deleted file mode 100644 index ada35cedde5a3..0000000000000 --- a/maps/torch/robot/_robot_access.dm +++ /dev/null @@ -1,173 +0,0 @@ -/obj/item/robot_module/clerical/set_map_specific_access() - access += list( - access_emergency_storage, - access_cargo, - access_cargo_bot, - access_commissary, - access_hangar, - access_mailsorting, - access_radio_serv, - access_radio_sup - ) - -/obj/item/robot_module/clerical/butler/set_map_specific_access() - access = list( - access_commissary, - access_hydroponics, - access_kitchen, - access_radio_serv - ) - -/obj/item/robot_module/medical/set_map_specific_access() - access += list( - access_chemistry, - access_crematorium, - access_emergency_storage, - access_eva, - access_external_airlocks, - access_hangar, - access_medical, - access_medical_equip, - access_morgue, - access_senmed, - access_surgery, - access_virology, - access_radio_med - ) - -/obj/item/robot_module/engineering/set_map_specific_access() - access = list( - access_atmospherics, - access_construction, - access_emergency_storage, - access_engine, - access_engine_equip, - access_eva, - access_external_airlocks, - access_hangar, - access_network, - access_robotics, - access_seneng, - access_tcomsat, - access_tech_storage, - access_radio_eng - ) - -/obj/item/robot_module/janitor/set_map_specific_access() - access = list( - access_emergency_storage, - access_janitor, - access_radio_serv - ) - -/obj/item/robot_module/miner/set_map_specific_access() - access = list( - access_eva, - access_expedition_shuttle, - access_guppy, - access_hangar, - access_mining, - access_mining_office, - access_mining_station, - access_radio_exp, - access_radio_sup - ) - -/obj/item/robot_module/research/set_map_specific_access() - access = list( - access_expedition_shuttle, - access_hangar, - access_mining_office, - access_mining_station, - access_petrov, - access_petrov_analysis, - access_petrov_chemistry, - access_petrov_maint, - access_petrov_phoron, - access_petrov_toxins, - access_research, - access_tox, - access_tox_storage, - access_xenoarch, - access_xenobiology, - access_radio_exp, - access_radio_sci - ) - -/obj/item/robot_module/flying/cultivator/set_map_specific_access() - access = list( - access_hydroponics, - access_kitchen, - access_research, - access_radio_sci, - access_radio_serv - ) - -/obj/item/robot_module/flying/emergency/set_map_specific_access() - access = list( - access_chemistry, - access_crematorium, - access_emergency_storage, - access_eva, - access_external_airlocks, - access_hangar, - access_medical, - access_medical_equip, - access_morgue, - access_senmed, - access_surgery, - access_virology, - access_radio_med - ) - -/obj/item/robot_module/flying/filing/set_map_specific_access() - access = list( - access_emergency_storage, - access_cargo, - access_cargo_bot, - access_commissary, - access_hangar, - access_mailsorting, - access_radio_serv, - access_radio_sup - ) - -/obj/item/robot_module/flying/forensics/set_map_specific_access() - access = list( - access_brig, - access_emergency_storage, - access_forensics_lockers, - access_morgue, - access_sec_doors, - access_security, - access_radio_sec - ) - -/obj/item/robot_module/flying/repair/set_map_specific_access() - access = list( - access_atmospherics, - access_construction, - access_emergency_storage, - access_engine, - access_engine_equip, - access_eva, - access_external_airlocks, - access_hangar, - access_network, - access_robotics, - access_seneng, - access_tcomsat, - access_tech_storage, - access_radio_eng - ) - -/obj/item/robot_module/security/set_map_specific_access() - access = list( - access_brig, - access_emergency_storage, - access_eva, - access_external_airlocks, - access_sec_doors, - access_security, - access_radio_sec - ) diff --git a/maps/torch/torch.dm b/maps/torch/torch.dm index 9e63e39bb1c15..f88cde9c55c81 100644 --- a/maps/torch/torch.dm +++ b/maps/torch/torch.dm @@ -123,7 +123,6 @@ #include "outfits/scgec.dm" - #include "robot/_robot_access.dm" #include "robot/module_flying_surveyor.dm" #include "structures/signs.dm"