Add: Skrellian SDTF weapon&armor

code/modules/mod/mod_control.dm

@@ -127,14 +127,14 @@
 	if(length(req_access))
 		locked = TRUE
 	new_core?.install(src)
-	helmet = new /obj/item/clothing/head/mod(src)
+	helmet = helmet = build_head() // SS220 EDIT - original: new /obj/item/clothing/head/mod(src)
 	mod_parts += helmet
-	chestplate = new /obj/item/clothing/suit/mod(src)
+	chestplate = build_suit() // SS220 EDIT - original: new /obj/item/clothing/suit/mod(src)
 	chestplate.allowed += theme.allowed_suit_storage
 	mod_parts += chestplate
-	gauntlets = new /obj/item/clothing/gloves/mod(src)
+	gauntlets = build_gloves() // SS220 EDIT - original: new /obj/item/clothing/gloves/mod(src)
 	mod_parts += gauntlets
-	boots = new /obj/item/clothing/shoes/mod(src)
+	boots = build_shoes() // SS220 EDIT - original: new /obj/item/clothing/shoes/mod(src)
 	mod_parts += boots
 	var/list/all_parts = mod_parts + src
 	for(var/obj/item/part as anything in all_parts)

modular_ss220/clothing/_clothing.dme

@@ -11,3 +11,4 @@
 #include "code/shoes.dm"
 #include "code/suits.dm"
 #include "code/under.dm"
+#include "code/mod.dm"

modular_ss220/clothing/code/mod.dm

@@ -0,0 +1,128 @@
+// MARK: MODsuit clothes
+/obj/item/clothing/head/mod/exclusive
+	icon = 'modular_ss220/clothing/icons/object/mod_clothing.dmi'
+	item_state = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+	icon_override = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+	sprite_sheets = list(
+		"Human" = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi',
+		"Skrell" = 'modular_ss220/clothing/icons/mob/species/skrell/mod_clothing.dmi',
+		)
+
+/obj/item/clothing/suit/mod/exclusive
+	icon = 'modular_ss220/clothing/icons/object/mod_clothing.dmi'
+	item_state = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+	icon_override = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+	sprite_sheets = list(
+		"Human" = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi',
+		"Skrell" = 'modular_ss220/clothing/icons/mob/species/skrell/mod_clothing.dmi',
+		)
+
+/obj/item/clothing/gloves/mod/exclusive
+	icon = 'modular_ss220/clothing/icons/object/mod_clothing.dmi'
+	item_state = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+	icon_override = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+	sprite_sheets = list(
+		"Human" = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi',
+		"Skrell" = 'modular_ss220/clothing/icons/mob/species/skrell/mod_clothing.dmi',
+		)
+
+/obj/item/clothing/shoes/mod/exclusive
+	icon = 'modular_ss220/clothing/icons/object/mod_clothing.dmi'
+	item_state = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+	icon_override = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+	sprite_sheets = list(
+		"Human" = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi',
+		"Skrell" = 'modular_ss220/clothing/icons/mob/species/skrell/mod_clothing.dmi',
+		)
+
+// MARK: MODsuit control
+/obj/item/mod/control/proc/build_head()
+	return new /obj/item/clothing/head/mod(src)
+
+/obj/item/mod/control/proc/build_suit()
+	return new /obj/item/clothing/suit/mod(src)
+
+/obj/item/mod/control/proc/build_gloves()
+	return new /obj/item/clothing/gloves/mod(src)
+
+/obj/item/mod/control/proc/build_shoes()
+	return new /obj/item/clothing/shoes/mod(src)
+
+/obj/item/mod/control/pre_equipped/exclusive
+	icon = 'modular_ss220/clothing/icons/object/mod_clothing.dmi'
+	icon_override = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+
+/obj/item/mod/control/pre_equipped/exclusive/build_head()
+	return new /obj/item/clothing/head/mod/exclusive(src)
+
+/obj/item/mod/control/pre_equipped/exclusive/build_suit()
+	return new /obj/item/clothing/suit/mod/exclusive(src)
+
+/obj/item/mod/control/pre_equipped/exclusive/build_gloves()
+	return new /obj/item/clothing/gloves/mod/exclusive(src)
+
+/obj/item/mod/control/pre_equipped/exclusive/build_shoes()
+	return new /obj/item/clothing/shoes/mod/exclusive(src)
+
+// MARK: Skrell elite MODsuit
+/datum/mod_theme/skrell_elite
+	name = "skrell"
+	desc = "A high-speed rescue suit by Nanotrasen, intended for its' emergency response teams."
+	extended_desc = "A streamlined suit of Nanotrasen design, these sleek black suits are only worn by \
+		elite emergency response personnel to help save the day. While the slim and nimble design of the suit \
+		cuts the ceramics and ablatives in it down, dropping the protection, \
+		it keeps the wearer safe from the harsh void of space while sacrificing no speed whatsoever. \
+		While wearing it you feel an extreme deference to darkness. "
+	default_skin = "skrell_elite"
+	armor_type_1 = /obj/item/mod/armor/mod_theme_skrell_elite
+
+	resistance_flags = FIRE_PROOF
+	flag_2_flags = RAD_PROTECT_CONTENTS_2
+	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+	siemens_coefficient = 0
+	slowdown_inactive = 0.5
+	slowdown_active = 0
+	complexity_max = DEFAULT_MAX_COMPLEXITY + 5
+	allowed_suit_storage = list(
+		/obj/item/ammo_box,
+		/obj/item/ammo_casing,
+		/obj/item/restraints/handcuffs,
+		/obj/item/flash,
+		/obj/item/melee/baton,
+		/obj/item/gun,
+	)
+	skins = list(
+		"skrell_elite" = list(
+			MOD_ICON_OVERRIDE = 'modular_ss220/clothing/icons/object/mod_clothing.dmi',
+			HELMET_FLAGS = list(
+				UNSEALED_LAYER = COLLAR_LAYER,
+
+				SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR,
+				UNSEALED_INVISIBILITY = HIDEFACE,
+				SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE,
+				SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES,
+			),
+			CHESTPLATE_FLAGS = list(
+				UNSEALED_CLOTHING = THICKMATERIAL,
+				SEALED_CLOTHING = STOPSPRESSUREDMAGE,
+				SEALED_INVISIBILITY = HIDEJUMPSUIT | HIDETAIL,
+			),
+			GAUNTLETS_FLAGS = list(
+				UNSEALED_CLOTHING = THICKMATERIAL,
+				SEALED_CLOTHING = STOPSPRESSUREDMAGE,
+				CAN_OVERSLOT = TRUE,
+			),
+			BOOTS_FLAGS = list(
+				UNSEALED_CLOTHING = THICKMATERIAL,
+				SEALED_CLOTHING = STOPSPRESSUREDMAGE,
+				CAN_OVERSLOT = TRUE,
+			),
+		),
+	)
+
+/obj/item/mod/armor/mod_theme_skrell_elite
+	armor = list(MELEE = 40, BULLET = 25, LASER = 25, ENERGY = 20, BOMB = 25, RAD = INFINITY, FIRE = 200, ACID = 200)
+
+/obj/item/mod/control/pre_equipped/exclusive/skrell_elite
+	theme = /datum/mod_theme/skrell_elite
+	applied_cell = /obj/item/stock_parts/cell/bluespace

modular_ss220/objects/_objects.dme

@@ -20,6 +20,8 @@
 #include "code/weapons/ranged/pneumagun.dm"
 #include "code/weapons/ranged/revolvers.dm"
 #include "code/weapons/ranged/sslr.dm"
+#include "code/weapons/ranged/sakhno.dm"
+#include "code/weapons/ranged/skrell_rifle.dm"
 
 // Plushies
 #include "code/plushies/hampters.dm"

modular_ss220/objects/code/weapons/ranged/sakhno.dm

@@ -0,0 +1,42 @@
+// Sakhno rifle
+/obj/item/gun/projectile/shotgun/boltaction/sakhno
+	name = "\improper Sakhno Precision Rifle"
+	desc = "A Sakhno Precision Rifle, a bolt action weapon that was (and certainly still is) popular with \
+		frontiersmen, cargo runners, private security forces, explorers, and other unsavoury types. This particular \
+		pattern of the rifle dates back all the way to 2440."
+	icon = 'modular_ss220/objects/icons/wide_guns.dmi'
+	icon_state = "sakhno"
+	item_state = "sakhno"
+	lefthand_file = 'modular_ss220/objects/icons/inhands/guns_lefthand.dmi'
+	righthand_file = 'modular_ss220/objects/icons/inhands/guns_righthand.dmi'
+	fire_sound = 'modular_ss220/objects/sound/weapons/gunshots/shot_heavy.ogg'
+	mag_type = /obj/item/ammo_box/magazine/internal/boltaction/sakhno
+	knife_x_offset = 30
+	knife_y_offset = 12
+
+/obj/item/ammo_box/magazine/internal/boltaction/sakhno
+	icon = 'modular_ss220/objects/icons/ammo.dmi'
+	icon_state = "310"
+	ammo_type = /obj/item/ammo_casing/s310
+	caliber = "s310"
+	max_ammo = 5
+	multiload = 1
+
+/obj/item/ammo_box/s310
+	name = "stripper clip (.310)"
+	desc = "A stripper clip for .310 cartridges, used in Sakhno rifles. Five round capacity."
+	icon = 'modular_ss220/objects/icons/ammo.dmi'
+	icon_state = "310"
+	ammo_type = /obj/item/ammo_casing/s310
+	max_ammo = 5
+	multi_sprite_step = 1
+
+/obj/item/ammo_casing/s310
+	name = ".310 round"
+	desc = "A .310 rifle cartridge"
+	icon = 'modular_ss220/objects/icons/ammo.dmi'
+	icon_state = "310-casing"
+	caliber = "s310"
+	projectile_type = /obj/item/projectile/bullet/midbullet3/hp
+	muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_STRONG
+	muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG

modular_ss220/objects/code/weapons/ranged/skrell_rifle.dm

@@ -0,0 +1,110 @@
+// Skrellian carbine
+/obj/item/gun/energy/gun/skrell_carbine
+	name = "\improper skrellian carbine"
+	desc = "The Vuu'Xqu*ix T-3, known as 'VT-3' by TSF. Rarely seen out in the wild by anyone outside of a Skrellian SDTF. "
+	icon = 'modular_ss220/objects/icons/guns.dmi'
+	lefthand_file = 'modular_ss220/objects/icons/inhands/guns_lefthand.dmi'
+	righthand_file = 'modular_ss220/objects/icons/inhands/guns_righthand.dmi'
+	item_state = "skrell_carbine"
+	icon_state = "skrell_carbine"
+	cell_type = /obj/item/stock_parts/cell/skrell_carbine_cell
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/skrell_light, /obj/item/ammo_casing/energy/laser/skrell_assault)
+	origin_tech = "combat=6;magnets=5"
+	modifystate = 2
+	execution_speed = 3 SECONDS
+
+/obj/item/gun/energy/gun/skrell_carbine/elite
+	name = "\improper elite skrellian carbine"
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/skrell_light/elite, /obj/item/ammo_casing/energy/laser/skrell_assault/elite)
+
+/obj/item/ammo_casing/energy/laser/skrell_light
+	projectile_type = /obj/item/projectile/beam/laser/skrell_light
+	muzzle_flash_color = LIGHT_COLOR_LAVENDER
+	select_name = "light"
+	e_cost
+
+/obj/item/ammo_casing/energy/laser/skrell_assault
+	projectile_type = /obj/item/projectile/beam/pulse/skrell_laser_assault
+	muzzle_flash_color = LIGHT_COLOR_LAVENDER
+	select_name = "assault"
+	e_cost = 1600
+
+/obj/item/ammo_casing/energy/laser/skrell_light/elite
+	e_cost = 60
+
+/obj/item/ammo_casing/energy/laser/skrell_assault/elite
+	e_cost = 200
+
+/obj/item/projectile/beam/laser/skrell_light
+	name = "laser"
+	icon_state = "bluelaser"
+	damage = 23
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
+	light_color = LIGHT_COLOR_LAVENDER
+	forcedodge = 1
+
+/obj/item/projectile/beam/pulse/skrell_laser_assault
+	name = "heavy laser"
+	icon_state = "u_laser_alt"
+	damage = 10
+	stamina = 60
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
+	light_color = LIGHT_COLOR_LAVENDER
+	weakened_against_rwalls = TRUE
+
+/obj/item/stock_parts/cell/skrell_carbine_cell
+	name = "\improper Vuu'Xqu*ix T-3 gun power cell"
+	maxcharge = 1600
+
+// Skrellian railgun rifle
+
+/obj/item/gun/projectile/automatic/sniper_rifle/skrell_rifle
+	name = "\improper skrellian rifle"
+	desc = "The Zquiv*Tzuuli-8, or ZT-8, is a railgun rarely seen by anyone other than those within Skrellian SDTF ranks. The rotary magazine houses a cylinder with individual chambers, that press against the barrel when loaded."
+	icon = 'modular_ss220/objects/icons/guns.dmi'
+	lefthand_file = 'modular_ss220/objects/icons/inhands/guns_lefthand.dmi'
+	righthand_file = 'modular_ss220/objects/icons/inhands/guns_righthand.dmi'
+	icon_state = "sniper"
+	item_state = "sniper"
+	fire_sound = 'modular_ss220/objects/sound/weapons/gunshots/railgun.ogg'
+	recoil = 0
+	fire_delay = 25
+	zoomable = FALSE
+	can_suppress = FALSE
+	mag_type = /obj/item/ammo_box/magazine/skrell_magazine
+
+/obj/item/gun/projectile/automatic/sniper_rifle/skrell_rifle/elite
+	fire_delay = 15
+	zoomable = TRUE
+	mag_type = /obj/item/ammo_box/magazine/skrell_magazine/skrell_magazine_elite
+
+/obj/item/ammo_box/magazine/skrell_magazine
+	name = "flechette cylinder"
+	desc = "A magazine containing flechettes, the design harkening back to cylinders on revolvers."
+	icon = 'modular_ss220/objects/icons/ammo.dmi'
+	icon_state = "skrell_magazine"
+	multi_sprite_step = 3
+	ammo_type = /obj/item/ammo_casing/railgun
+	max_ammo = 4
+	caliber = "railgun"
+	multiload = 1
+
+/obj/item/ammo_box/magazine/skrell_magazine/skrell_magazine_elite
+	icon_state = "skrell_magazine_elite"
+	multi_sprite_step = 7
+	max_ammo = 8
+
+/obj/item/ammo_casing/railgun
+	name = "railgun bullet"
+	desc = "A bullet for a high-tech railgun. It consists of a striking element and a detachable magnetic stabilizer."
+	icon = 'modular_ss220/objects/icons/ammo.dmi'
+	icon_state = "railgun-casing"
+	caliber = "railgun"
+	projectile_type = /obj/item/projectile/bullet/railgun
+
+/obj/item/projectile/bullet/railgun
+	damage = 45
+	weaken = 0.5 SECONDS
+	armour_penetration_flat = 30
+	pass_flags = PASSTABLE | PASSGRILLE | PASSGIRDER
+	speed = 0.5