Adds a couple of lore themed mercenary gear loadout (#6644)

Adds a bit of what is related here: https://forums.aurorastation.org/topic/11941-antagonist-rework-20/ Pretty much, adds a couple of gear crates that mercenary teams, seeking to do a lore related gimmick, can buy by pooling their crystals. Right now, it is just adds a couple of human related factions, such as eridani, sol alliance, elyra and the frontier.
2026-01-06 07:22:15 +00:00 · 2019-07-04 15:13:17 -03:00
parent 709f225460
commit ad9caa77ae
31 changed files with 448 additions and 5 deletions
--- a/code/modules/clothing/spacesuits/rig/suits/combat.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm
@@ -99,3 +99,76 @@
 		/obj/item/rig_module/cooling_unit,
 		/obj/item/rig_module/fabricator/energy_net
 		)
+
+/obj/item/weapon/rig/gunslinger
+	name = "gunslinger hardsuit control module"
+	desc = "A favorite of Frontier rangers, the Gunslinger suit is a sturdy hardsuit meant to provide the user absolute situational awareness."
+	icon_state = "gunslinger"
+	suit_type = "gunslinger hardsuit"
+	armor = list(melee = 50, bullet = 60, laser = 40, energy = 30, bomb = 30, bio = 100, rad = 60)
+	offline_slowdown = 2
+	offline_vision_restriction = TINT_HEAVY
+
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
+
+	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA
+
+	species_restricted = list("Human")
+
+/obj/item/weapon/rig/gunslinger/equipped
+	req_access = list(access_syndicate)
+
+	initial_modules = list(
+		/obj/item/rig_module/vision/thermal,
+		/obj/item/rig_module/maneuvering_jets,
+		/obj/item/rig_module/mounted/taser
+		)
+
+/obj/item/weapon/rig/strike
+	name = "strike hardsuit control module"
+	desc = "An expensive hardsuit utilized by Eridani security contractors to field heavy weapons and coordinate non-lethal takedowns directly. Usually seen spearheading police raids."
+	icon_state = "strikesuit"
+	suit_type = "strike hardsuit"
+	armor = list(melee = 80, bullet = 45, laser = 45, energy = 25, bomb = 25, bio = 100, rad = 100)
+	offline_slowdown = 2
+	offline_vision_restriction = TINT_HEAVY
+
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
+
+	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA
+
+	species_restricted = list("Human")
+
+/obj/item/weapon/rig/strike/equipped
+	req_access = list(access_syndicate)
+
+	initial_modules = list(
+		/obj/item/rig_module/fabricator/energy_net,
+		/obj/item/rig_module/power_sink,
+		/obj/item/rig_module/mounted/taser
+		)
+
+/obj/item/weapon/rig/elyran
+	name = "elyran battlesuit control module"
+	desc = "An advanced Elyran hardsuit specialized in scorched earth tactics."
+	icon_state = "elyran_rig"
+	suit_type = "elyran battlesuit"
+	armor = list(melee = 60, bullet = 40, laser = 60, energy = 60, bomb = 25, bio = 100, rad = 100)
+	offline_slowdown = 2
+	offline_vision_restriction = TINT_HEAVY
+
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
+
+	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA
+
+	species_restricted = list("Human")
+
+	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 10000
+
+/obj/item/weapon/rig/elyran/equipped
+	req_access = list(access_syndicate)
+
+	initial_modules = list(
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/actuators/combat
+		)
--- a/code/modules/clothing/spacesuits/void/misc.dm
+++ b/code/modules/clothing/spacesuits/void/misc.dm
@@ -3,7 +3,7 @@
 	desc = "A sleek black space helmet designed for combat. Looks to be uniform with Sol Alliance colors."
 	icon_state = "sol_helmet"
 	item_state = "sol_helmet"
-	armor = list(melee = 70, bullet = 55, laser = 45, energy = 15, bomb = 40, bio = 100, rad = 60)
+	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
 	siemens_coefficient = 0.3
 	species_restricted = list("Human")

@@ -22,3 +22,76 @@
 	siemens_coefficient = 0.3
 	species_restricted = list("Human")
 	refittable = FALSE
+
+/obj/item/clothing/head/helmet/space/void/frontier
+	name = "frontier vulture voidsuit helmet"
+	desc = "A helmet resembling an avian, built for the Human head. Heavy and plated with plasteel across its faces."
+	icon_state = "vulture"
+	item_state = "vulture"
+	armor = list(melee = 80, bullet = 70, laser = 20, energy = 5, bomb = 5, bio = 100, rad = 30)
+	siemens_coefficient = 0.3
+	species_restricted = list("Human")
+
+	brightness_on = 6
+	refittable = FALSE
+
+/obj/item/clothing/suit/space/void/frontier
+	name = "frontier vulture voidsuit"
+	desc = "An iconic Frontier Alliance standard-issue voidsuit, designed after the Interstellar War and seen in use to this day."
+	icon_state = "vulture"
+	item_state = "vulture"
+	slowdown = 3
+	armor = list(melee = 80, bullet = 70, laser = 20, energy = 5, bomb = 5, bio = 100, rad = 30)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
+	siemens_coefficient = 0.3
+	species_restricted = list("Human")
+	refittable = FALSE
+
+
+/obj/item/clothing/head/helmet/space/void/cruiser
+	name = "cruiser voidsuit helmet"
+	desc = "A silvery chrome, single visor space helmet with built-in peripherals and very bright fore lighting. A favorite of bounty hunters."
+	icon_state = "eridani_suit"
+	item_state = "eridani_suit"
+	armor = list(melee = 50, bullet = 50, laser = 40, energy = 50, bomb = 50, bio = 100, rad = 30)
+	siemens_coefficient = 0.3
+	species_restricted = list("Human")
+	w_class = 3
+	brightness_on = 6
+	refittable = FALSE
+
+/obj/item/clothing/suit/space/void/cruiser
+	name = "cruiser voidsuit"
+	desc = "A silvery chrome voidsuit with neon highlights. Utilized by Eridani private military and police."
+	icon_state = "eridani_suit"
+	item_state = "eridani_suit"
+	armor = list(melee = 50, bullet = 50, laser = 40, energy = 40, bomb = 50, bio = 100, rad = 30)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
+	siemens_coefficient = 0.3
+	species_restricted = list("Human")
+	refittable = FALSE
+
+/obj/item/clothing/head/helmet/space/void/valkyrie
+	name = "valkyrie voidsuit helmet"
+	desc = "A slot-eyed space helmet, sleek and designed for military purposes. Colored in Elyran military camouflage."
+	icon_state = "valkyrie"
+	item_state = "valkyrie"
+	armor = list(melee = 60, bullet = 30, laser = 50, energy = 40, bomb = 60, bio = 100, rad = 100)
+	siemens_coefficient = 0.3
+	species_restricted = list("Human")
+	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 10000
+	brightness_on = 6
+	refittable = FALSE
+
+/obj/item/clothing/suit/space/void/valkyrie
+	name = "valkyrie voidsuit"
+	desc = "A pricey specialist voidsuit designed for atmospheric long jumping and combat. Colored in Elyran military camouflage."
+	icon_state = "valkyrie"
+	item_state = "valkyrie"
+	armor = list(melee = 60, bullet = 30, laser = 50, energy = 40, bomb = 60, bio = 100, rad = 100)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
+	siemens_coefficient = 0.3
+	species_restricted = list("Human")
+	refittable = FALSE
+	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 10000
+
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -426,3 +426,19 @@
 	name = "ion slug box"
 	icon_state = "empslugbox"
 	ammo_type = /obj/item/ammo_casing/gauss/emp
+
+
+/obj/item/ammo_magazine/plasma
+	name = "heavy duty plasma cell"
+	icon_state = "heavy_plasma_cell"
+	mag_type = MAGAZINE
+	caliber = "plasma slug"
+	ammo_type = /obj/item/ammo_casing/plasma_slug
+	max_ammo = 10
+
+/obj/item/ammo_magazine/plasma/light
+	name = "small plasma cell"
+	icon_state = "light_plasma_cell"
+	caliber = "plasma bolt"
+	ammo_type = /obj/item/ammo_casing/plasma_bolt
+	max_ammo = 30
--- a/code/modules/projectiles/ammunition/bullets.dm
+++ b/code/modules/projectiles/ammunition/bullets.dm
@@ -273,4 +273,18 @@
 	name = "ion slug"
 	desc = "A heavy ion gauss slug."
 	icon_state = "empslug"
-	projectile_type = /obj/item/projectile/ion/gauss
+	projectile_type = /obj/item/projectile/ion/gauss
+
+/obj/item/ammo_casing/plasma_slug
+	name = "plasma slug"
+	desc = "A plasma slug."
+	icon_state = "plasmaslug"
+	caliber = "plasma slug"
+	projectile_type = /obj/item/projectile/plasma
+
+/obj/item/ammo_casing/plasma_bolt
+	name = "plasma bolt"
+	desc = "A plasma bolt."
+	icon_state = "plasmabolt"
+	caliber = "plasma bolt"
+	projectile_type = /obj/item/projectile/plasma/light
--- a/code/modules/projectiles/guns/projectile/plasma.dm
+++ b/code/modules/projectiles/guns/projectile/plasma.dm
@@ -0,0 +1,36 @@
+/obj/item/weapon/gun/projectile/plasma
+	name = "plasma shotgun"
+	desc = "A marvel of Elyran weapons technology which utilizes superheated plasma to pierce thick armor with gruesome results."
+	icon_state = "slammer"
+	item_state = "slammer"
+	w_class = 3
+	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3)
+	ammo_type = /obj/item/ammo_casing/plasma_slug
+	magazine_type = /obj/item/ammo_magazine/plasma
+	allowed_magazines = list(/obj/item/ammo_magazine/plasma)
+	caliber = "plasma slug"
+	fire_sound = 'sound/weapons/gunshot/slammer.ogg'
+	load_method = MAGAZINE
+	handle_casings = DELETE_CASINGS
+	fire_delay = 8
+
+/obj/item/weapon/gun/projectile/plasma/update_icon()
+	..()
+	if(ammo_magazine)
+		icon_state = "[initial(icon_state)]"
+	else
+		icon_state = "[initial(icon_state)]-empty"
+
+
+/obj/item/weapon/gun/projectile/plasma/bolter
+	name = "plasma bolter"
+	desc = "A miniaturized, less efficient version of the infamous plasma slammer. Sacrifices much of its power for a more compact frame."
+	icon_state = "bolter"
+	item_state = "bolter"
+	w_class = 2
+	ammo_type = /obj/item/ammo_casing/plasma_bolt
+	magazine_type = /obj/item/ammo_magazine/plasma/light
+	allowed_magazines = list(/obj/item/ammo_magazine/plasma/light)
+	caliber = "plasma bolt"
+	fire_sound = 'sound/weapons/gunshot/bolter.ogg'
+	fire_delay = 6
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -274,3 +274,19 @@

 /obj/item/projectile/magic/teleport/proc/blink_mob(mob/living/L)
 	do_teleport(L, get_turf(L), blink_range, asoundin = 'sound/effects/phasein.ogg')
+
+/obj/item/projectile/plasma
+	name = "plasma slug"
+	icon_state = "plasma_bolt"
+	damage = 25
+	damage_type = BRUTE
+	check_armour = "energy"
+	incinerate = 10
+	armor_penetration = 20
+	penetrating = 1
+
+/obj/item/projectile/plasma/light
+	name = "plasma bolt"
+	damage = 10
+	armor_penetration = 10
+	incinerate = 5