[MIRROR] re-add borg all access, tweak antag borg loadouts

SierraBay · Dec 4, 2023 · 353d95f · 353d95f
1 parent 4d390c8
commit 353d95f
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 194 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/maps/torch/torch.dm b/maps/torch/torch.dm
@@ -122,7 +122,6 @@
 
 	#include "outfits/scgec.dm"
 
-	#include "robot/_robot_access.dm"
 	#include "robot/module_flying_surveyor.dm"
 
 	#include "structures/signs.dm"