Adds two new space ruins and more cool stuff (#6477)

aurorastation.dme

@@ -1326,6 +1326,7 @@
 #include "code\modules\clothing\spacesuits\rig\suits\merc.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\station.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\terminator.dm"
+#include "code\modules\clothing\spacesuits\void\alien.dm"
 #include "code\modules\clothing\spacesuits\void\captain.dm"
 #include "code\modules\clothing\spacesuits\void\merc.dm"
 #include "code\modules\clothing\spacesuits\void\misc.dm"

code/game/machinery/portable_turret.dm

@@ -20,6 +20,8 @@
 	active_power_usage = 300	//when active, this turret takes up constant 300 Equipment power
 	power_channel = EQUIP	//drains power from the EQUIPMENT channel
 
+	req_one_access = list(access_security, access_heads)
+
 	var/raised = 0			//if the turret cover is "open" and the turret is raised
 	var/raising= 0			//if the turret is currently opening or closing its cover
 	var/health = 80			//the turret's health
@@ -97,6 +99,7 @@
 	check_anomalies = TRUE
 	immobile = TRUE
 	no_salvage = TRUE
+	req_one_access = list(access_cent_specops, access_cent_general)
 
 	var/admin_emag_override = FALSE	// Set to true to allow emagging of this turret.
 
@@ -116,9 +119,6 @@
 
 /obj/machinery/porta_turret/Initialize(mapload)
 	. = ..()
-	LAZYCLEARLIST(req_access)
-	req_one_access = list(access_security, access_heads)
-
 	//Sets up a spark system
 	spark_system = bind_spark(src, 5)
 	if(!istype(installation, /obj/item/weapon/gun/energy))
@@ -144,11 +144,6 @@
 			src.setState(SOME_TC)
 	START_PROCESSING(SSprocessing, src)
 
-/obj/machinery/porta_turret/crescent/Initialize()
-	. = ..()
-	LAZYCLEARLIST(req_one_access)
-	req_access = list(access_cent_specops)
-
 /obj/machinery/porta_turret/Destroy()
 	var/area/control_area = get_area(src)
 	if(istype(control_area))
@@ -1002,6 +997,7 @@
 
 	eprojectile = /obj/item/projectile/beam/xray
 	eshot_sound	= 'sound/weapons/laser3.ogg'
+	req_one_access = list(access_syndicate)
 
 /obj/machinery/porta_turret/ion
 	installation = /obj/item/weapon/gun/energy/rifle/ionrifle
@@ -1014,6 +1010,7 @@
 	eprojectile = /obj/item/projectile/ion
 	shot_sound = 'sound/weapons/Laser.ogg'
 	eshot_sound	= 'sound/weapons/Laser.ogg'
+	req_one_access = list(access_syndicate)
 
 /obj/machinery/porta_turret/crossbow
 	installation = /obj/item/weapon/gun/energy/crossbow
@@ -1024,6 +1021,7 @@
 
 	eprojectile = /obj/item/projectile/energy/bolt/large
 	eshot_sound	= 'sound/weapons/Genhit.ogg'
+	req_one_access = list(access_syndicate)
 
 /obj/machinery/porta_turret/cannon
 	installation = /obj/item/weapon/gun/energy/rifle/laser/heavy
@@ -1034,6 +1032,7 @@
 
 	eprojectile = /obj/item/projectile/beam/heavylaser
 	eshot_sound	= 'sound/weapons/lasercannonfire.ogg'
+	req_one_access = list(access_syndicate)
 
 /obj/machinery/porta_turret/pulse
 	installation = /obj/item/weapon/gun/energy/pulse
@@ -1041,9 +1040,11 @@
 	lethal_icon = 1
 	egun = 0
 	sprite_set = "pulse"
+	no_salvage = TRUE
 
 	eprojectile = /obj/item/projectile/beam/pulse
 	eshot_sound	= 'sound/weapons/pulse.ogg'
+	req_one_access = list(access_syndicate)
 
 /obj/machinery/porta_turret/sniper
 	installation = /obj/item/weapon/gun/energy/sniperrifle
@@ -1051,9 +1052,11 @@
 	lethal_icon = 1
 	egun = 0
 	sprite_set = "sniper"
+	no_salvage = TRUE
 
 	eprojectile = /obj/item/projectile/beam/sniper
 	eshot_sound	= 'sound/weapons/marauder.ogg'
+	req_one_access = list(access_syndicate)
 
 /obj/machinery/porta_turret/net
 	installation = /obj/item/weapon/gun/energy/net
@@ -1064,6 +1067,7 @@
 
 	eprojectile = /obj/item/projectile/beam/energy_net
 	eshot_sound	= 'sound/weapons/plasma_cutter.ogg'
+	req_one_access = list(access_syndicate)
 
 /obj/machinery/porta_turret/thermal
 	installation = /obj/item/weapon/gun/energy/vaurca/thermaldrill
@@ -1074,6 +1078,7 @@
 
 	eprojectile = /obj/item/projectile/beam/thermaldrill
 	eshot_sound	= 'sound/magic/lightningbolt.ogg'
+	req_one_access = list(access_syndicate)
 
 /obj/machinery/porta_turret/meteor
 	installation = /obj/item/weapon/gun/energy/meteorgun
@@ -1081,9 +1086,11 @@
 	lethal_icon = 1
 	egun = 0
 	sprite_set = "meteor"
+	no_salvage = TRUE
 
 	eprojectile = /obj/item/projectile/meteor
 	eshot_sound	= 'sound/weapons/lasercannonfire.ogg'
+	req_one_access = list(access_syndicate)
 
 /obj/machinery/porta_turret/ballistic
 	installation = /obj/item/weapon/gun/energy/mountedsmg
@@ -1096,6 +1103,8 @@
 	eprojectile = /obj/item/projectile/bullet/rifle/a762
 	eshot_sound	= 'sound/weapons/gunshot/gunshot_saw.ogg'
 
+	req_one_access = list(access_syndicate)
+
 #undef TURRET_PRIORITY_TARGET
 #undef TURRET_SECONDARY_TARGET
 #undef TURRET_NOT_TARGET

code/modules/clothing/spacesuits/alien.dm

@@ -1,38 +1,3 @@
-//Skrell space gear. Sleek like a wetsuit.
-/obj/item/clothing/head/helmet/space/void/skrell
-	name = "skrellian helmet"
-	desc = "Smoothly contoured and polished to a shine. Still looks like a fishbowl."
-	armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100)
-	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
-	species_restricted = list("Skrell","Human")
-	siemens_coefficient = 0.4
-	refittable = FALSE
-
-/obj/item/clothing/head/helmet/space/void/skrell/white
-	icon_state = "skrell_helmet_white"
-
-/obj/item/clothing/head/helmet/space/void/skrell/black
-	icon_state = "skrell_helmet_black"
-
-/obj/item/clothing/suit/space/void/skrell
-	name = "skrellian voidsuit"
-	desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic."
-	armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100)
-	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
-	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
-	species_restricted = list("Skrell","Human")
-	siemens_coefficient = 0.4
-	refittable = FALSE
-
-/obj/item/clothing/suit/space/void/skrell/white
-	icon_state = "skrell_suit_white"
-	item_state = "skrell_suit_white"
-
-/obj/item/clothing/suit/space/void/skrell/black
-	icon_state = "skrell_suit_black"
-	item_state = "skrell_suit_black"
-
 // Vox space gear (vaccuum suit, low pressure armour)
 // Can't be equipped by any other species due to bone structure and vox cybernetics.
 /obj/item/clothing/suit/space/vox

code/modules/clothing/spacesuits/rig/modules/combat.dm

@@ -229,6 +229,17 @@
 
 	gun_type = /obj/item/weapon/gun/energy/rifle/ionrifle/mounted
 
+/obj/item/rig_module/mounted/tesla
+
+	name = "mounted tesla carbine"
+	desc = "A shoulder-mounted battery-powered tesla carbine mount."
+	icon_state = "tesla"
+
+	interface_name = "mounted tesla carbine"
+	interface_desc = "A shoulder-mounted cell-powered tesla carbine."
+
+	gun_type = /obj/item/weapon/gun/energy/tesla/mounted
+
 /obj/item/rig_module/mounted/plasmacutter
 	name = "hardsuit plasma cutter"
 	desc = "A forearm mounted kinetic accelerator"
@@ -367,3 +378,29 @@
 	fabrication_type = /obj/item/weapon/caution
 
 	category = MODULE_GENERAL
+
+
+/obj/item/rig_module/tesla_coil
+	name = "mounted tesla coil"
+	desc = "A mounted tesla coil that discharges a powerful lightning strike around the user."
+	icon_state = "ewar"
+	interface_name = "mounted tesla coil"
+	interface_desc ="Discharges a powerful lightning strike around the user."
+
+	use_power_cost = 30
+	module_cooldown = 100
+
+	usable = 1
+
+	category = MODULE_LIGHT_COMBAT
+
+/obj/item/rig_module/tesla_coil/engage()
+	if(!..())
+		return 0
+
+	var/mob/living/carbon/human/H = holder.wearer
+
+	H.visible_message("<span class='danger'>\The [H] crackles with energy!</span>")
+	playsound(H, 'sound/magic/LightningShock.ogg', 75, 1)
+	tesla_zap(H, 5, 5000)
+	return 1

code/modules/clothing/spacesuits/rig/rig.dm

@@ -85,6 +85,7 @@
 	var/datum/effect_system/sparks/spark_system
 
 	var/allowed_module_types = MODULE_GENERAL // All rigs by default should have access to general
+	var/list/species_restricted = list("exclude","Diona","Xenomorph","Vaurca","Golem", "Vox")
 
 /obj/item/weapon/rig/examine()
 	to_chat(usr, "This is \icon[src][src.name].")
@@ -139,7 +140,7 @@
 		chest.slowdown = offline_slowdown
 		verbs |= /obj/item/weapon/rig/proc/toggle_chest
 
-	for(var/obj/item/piece in list(gloves,helmet,boots,chest))
+	for(var/obj/item/clothing/piece in list(gloves,helmet,boots,chest))
 		if(!istype(piece))
 			continue
 		piece.canremove = 0
@@ -152,6 +153,7 @@
 			piece.siemens_coefficient = siemens_coefficient
 		piece.permeability_coefficient = permeability_coefficient
 		piece.unacidable = unacidable
+		piece.species_restricted = species_restricted
 		if(islist(armor)) piece.armor = armor.Copy()
 
 	set_vision(!offline)

code/modules/clothing/spacesuits/rig/rig_pieces.dm

@@ -19,7 +19,6 @@
 		"Machine" = 'icons/mob/species/machine/helmet.dmi',
 		"Vox" = 'icons/mob/species/vox/head.dmi'
 	)
-	species_restricted = list("exclude","Diona","Xenomorph","Vaurca","Golem", "Vox")
 
 /obj/item/clothing/gloves/rig
 	name = "gauntlets"
@@ -74,7 +73,6 @@
 		"Machine" = 'icons/mob/species/machine/suit.dmi',
 		"Vox" = 'icons/mob/species/vox/suit.dmi'
 		)
-	species_restricted = list("exclude","Diona","Xenomorph","Golem","Vaurca","Vox")
 
 	supporting_limbs = list()
 

code/modules/clothing/spacesuits/rig/suits/alien.dm

@@ -10,9 +10,7 @@
 	vision_restriction = TINT_HEAVY
 	offline_vision_restriction = TINT_BLIND
 
-	chest_type = /obj/item/clothing/suit/space/rig/unathi
-	helm_type = /obj/item/clothing/head/helmet/space/rig/unathi
-	boot_type = /obj/item/clothing/shoes/magboots/rig/unathi
+	species_restricted = list("Unathi")
 
 	allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy)
 
@@ -30,16 +28,6 @@
 
 	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL
 
-/obj/item/clothing/head/helmet/space/rig/unathi
-	species_restricted = list("Unathi")
-
-/obj/item/clothing/suit/space/rig/unathi
-	species_restricted = list("Unathi")
-
-/obj/item/clothing/shoes/magboots/rig/unathi
-	species_restricted = list("Unathi")
-
-
 
 /obj/item/weapon/rig/vaurca
 	name = "combat exoskeleton control module"
@@ -51,9 +39,9 @@
 	slowdown = 2
 	offline_slowdown = 3
 
-	chest_type = /obj/item/clothing/suit/space/rig/vaurca
+	species_restricted = list("Vaurca")
+
 	helm_type = /obj/item/clothing/head/helmet/space/rig/vaurca
-	boot_type = /obj/item/clothing/shoes/magboots/rig/vaurca
 	air_type =   /obj/item/weapon/tank/phoron
 
 	allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy)
@@ -68,19 +56,36 @@
 		/obj/item/rig_module/maneuvering_jets
 
 		)
-	
+
 	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_VAURCA
 
 /obj/item/weapon/rig/vaurca/minimal
 	initial_modules = list(/obj/item/rig_module/chem_dispenser/vaurca)
 
 /obj/item/clothing/head/helmet/space/rig/vaurca
-	species_restricted = list("Vaurca")
 	light_overlay = "helmet_light_dual_green"
 	light_color = "#3e7c3e"
 
-/obj/item/clothing/suit/space/rig/vaurca
-	species_restricted = list("Vaurca")
 
-/obj/item/clothing/shoes/magboots/rig/vaurca
-	species_restricted = list("Vaurca")
+/obj/item/weapon/rig/tesla
+	name = "tesla suit control module"
+	desc = "A tajaran hardsuit designated to be used by the special forces of the Tesla Brigade."
+	suit_type = "tesla suit"
+	icon_state = "tesla_rig"
+	armor = list(melee = 70, bullet = 50, laser = 35, energy = 15, bomb = 55, bio = 100, rad = 60)
+	vision_restriction = 0
+	slowdown = 2
+	offline_slowdown = 3
+	siemens_coefficient = 0
+
+	species_restricted = list("Tajara")
+
+	allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy)
+
+	initial_modules = list(
+		/obj/item/rig_module/actuators/combat,
+		/obj/item/rig_module/vision/thermal,
+		/obj/item/rig_module/tesla_coil,
+		/obj/item/rig_module/mounted/tesla)
+
+	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_UTILITY

code/modules/clothing/spacesuits/rig/suits/combat.dm

@@ -10,23 +10,12 @@
 	helm_type = /obj/item/clothing/head/helmet/space/rig/combat
 	allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton)
 
-
 	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT
 
+	species_restricted = list("Human")
+
 /obj/item/clothing/head/helmet/space/rig/combat
 	light_overlay = "helmet_light_dual_cyan"
-	species_restricted = list("Human")
-
-/obj/item/clothing/suit/space/rig/combat
-	species_restricted = list("Human")
-
-/obj/item/clothing/shoes/magboots/rig/combat
-	species_restricted = list("Human")
-
-/obj/item/clothing/gloves/rig/combat
-	species_restricted = list("Human")
-
-
 
 /obj/item/weapon/rig/combat/equipped
 
@@ -51,26 +40,16 @@
 	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)
 
-	chest_type = /obj/item/clothing/suit/space/rig/military
+	species_restricted = list("Human")
+
 	helm_type = /obj/item/clothing/head/helmet/space/rig/military
-	boot_type = /obj/item/clothing/shoes/magboots/rig/military
-	glove_type = /obj/item/clothing/gloves/rig/military
+
 
 	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY
 
 /obj/item/clothing/head/helmet/space/rig/military
 	light_overlay = "helmet_light_dual_green"
 	light_color = "#3e7c3e"
-	species_restricted = list("Human")
-
-/obj/item/clothing/suit/space/rig/military
-	species_restricted = list("Human")
-
-/obj/item/clothing/shoes/magboots/rig/military
-	species_restricted = list("Human")
-
-/obj/item/clothing/gloves/rig/military
-	species_restricted = list("Human")
 
 /obj/item/weapon/rig/military/equipped
 	initial_modules = list(
@@ -108,8 +87,7 @@
 		/obj/item/weapon/handcuffs
 	)
 
-	chest_type = /obj/item/clothing/suit/space/rig/retro
-	helm_type = /obj/item/clothing/head/helmet/space/rig/retro
+	species_restricted = list("exclude","Diona","Xenomorph", "Golem")
 
 	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY
 
@@ -121,9 +99,3 @@
 		/obj/item/rig_module/cooling_unit,
 		/obj/item/rig_module/fabricator/energy_net
 		)
-
-/obj/item/clothing/head/helmet/space/rig/retro
-	species_restricted = list("exclude","Diona","Xenomorph", "Golem")
-
-/obj/item/clothing/suit/space/rig/retro
-	species_restricted = list("exclude","Diona","Xenomorph", "Golem")

code/modules/clothing/spacesuits/rig/suits/light.dm

@@ -82,9 +82,10 @@
 	emp_protection = 40
 	slowdown = 0
 
+	species_restricted = list("exclude","Diona","Xenomorph", "Golem")
+
 	chest_type = /obj/item/clothing/suit/space/rig/light/ninja
 	glove_type = /obj/item/clothing/gloves/rig/light/ninja
-	helm_type =  /obj/item/clothing/head/helmet/space/rig/light/ninja
 	boot_type = /obj/item/clothing/shoes/rig/light/ninja
 
 	req_access = list(access_syndicate)
@@ -122,15 +123,11 @@
 	siemens_coefficient = 0
 
 /obj/item/clothing/shoes/rig/light/ninja
-	species_restricted = list("exclude","Diona","Xenomorph", "Golem")
 	silent = 1
 
 /obj/item/clothing/suit/space/rig/light/ninja
-	species_restricted = list("exclude","Diona","Xenomorph", "Golem")
 	breach_threshold = 38 //comparable to regular hardsuits
 
-/obj/item/clothing/head/helmet/space/rig/light/ninja
-	species_restricted = list("exclude","Diona","Xenomorph", "Golem")
 
 /obj/item/weapon/rig/light/stealth
 	name = "stealth suit control module"
@@ -167,9 +164,10 @@
 		/obj/item/rig_module/chem_dispenser/offworlder
 		)
 
+	species_restricted = list("Human")
+
 /obj/item/clothing/head/lightrig/offworlder
 	name = "helmet"
-	species_restricted = list("Human")
 	flash_protection = FLASH_PROTECTION_MAJOR
 
 /obj/item/clothing/suit/lightrig/offworlder
@@ -177,7 +175,6 @@
 	heat_protection = UPPER_TORSO
 	cold_protection = UPPER_TORSO
 	flags_inv = 0
-	species_restricted = list("Human")
 
 /obj/item/weapon/rig/light/offworlder/techno
 	name = "techno-conglomerate mobility hardsuit control module"

code/modules/clothing/spacesuits/rig/suits/station.dm

@@ -270,20 +270,9 @@
 	offline_slowdown = 4
 	offline_vision_restriction = TINT_HEAVY
 
-	chest_type = /obj/item/clothing/suit/space/rig/diving
-	helm_type = /obj/item/clothing/head/helmet/space/rig/diving
-	boot_type = /obj/item/clothing/shoes/magboots/rig/diving
-
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/toolbox,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/device/t_scanner,/obj/item/weapon/rcd)
 
 	req_access = list()
 	req_one_access = list()
 
-/obj/item/clothing/head/helmet/space/rig/diving
-	species_restricted = list("Human")
-
-/obj/item/clothing/suit/space/rig/diving
-	species_restricted = list("Human")
-
-/obj/item/clothing/shoes/magboots/rig/diving
 	species_restricted = list("Human")

code/modules/clothing/spacesuits/rig/suits/terminator.dm

@@ -20,10 +20,7 @@
 		/obj/item/weapon/handcuffs
 	)
 
-	chest_type = /obj/item/clothing/suit/space/rig/terminator
 	helm_type = /obj/item/clothing/head/helmet/space/rig/terminator
-	boot_type = /obj/item/clothing/shoes/magboots/rig/terminator
-	glove_type = /obj/item/clothing/gloves/rig/terminator
 
 	initial_modules = list(
 		/obj/item/rig_module/maneuvering_jets,
@@ -40,6 +37,8 @@
 		/obj/item/rig_module/actuators/combat
 	)
 
+	species_restricted = list("Heavy Machine")
+
 	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA
 
 /obj/item/clothing/head/helmet/space/rig/terminator
@@ -47,14 +46,6 @@
 	light_overlay = "helmet_light_terminator"
 	light_color = LIGHT_COLOR_RED
 
-/obj/item/clothing/suit/space/rig/terminator
-	species_restricted = list("Heavy Machine")
-
-/obj/item/clothing/shoes/magboots/rig/terminator
-	species_restricted = list("Heavy Machine")
-
-/obj/item/clothing/gloves/rig/terminator
-	species_restricted = list("Heavy Machine")
 
 /obj/item/weapon/rig/terminator/equipped
 	initial_modules = list(

code/modules/clothing/spacesuits/void/alien.dm

@@ -0,0 +1,61 @@
+/obj/item/clothing/head/helmet/space/void/skrell
+	name = "skrellian helmet"
+	desc = "Smoothly contoured and polished to a shine. Still looks like a fishbowl."
+	armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100)
+	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
+	species_restricted = list("Skrell","Human")
+	siemens_coefficient = 0.4
+	refittable = FALSE
+
+/obj/item/clothing/head/helmet/space/void/skrell/white
+	icon_state = "skrell_helmet_white"
+
+/obj/item/clothing/head/helmet/space/void/skrell/black
+	icon_state = "skrell_helmet_black"
+
+/obj/item/clothing/suit/space/void/skrell
+	name = "skrellian voidsuit"
+	desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic."
+	armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
+	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
+	species_restricted = list("Skrell","Human")
+	siemens_coefficient = 0.4
+	refittable = FALSE
+
+/obj/item/clothing/suit/space/void/skrell/white
+	icon_state = "skrell_suit_white"
+	item_state = "skrell_suit_white"
+
+/obj/item/clothing/suit/space/void/skrell/black
+	icon_state = "skrell_suit_black"
+	item_state = "skrell_suit_black"
+
+
+/obj/item/clothing/head/helmet/space/void/pra
+	name = "cosmonaut voidsuit helmet"
+	desc = "A tajaran helmet used by the crew of the Republican Orbital Fleet."
+	icon_state = "cosmo_suit"
+	item_state = "cosmo_suit"
+	armor = list(melee = 50, bullet = 50, laser = 30, energy = 15, bomb = 40, bio = 100, rad = 60)
+	species_restricted = list("Tajara")
+	refittable = FALSE
+	description_fluff = "The People's Republic of Adhomai enjoys having the only militarized spaceships of all the factions on Adhomai. Initially they relied on contracting outside \
+	protection from NanoTrasen and the Sol Alliance in order to defend their orbit from raiders. However, the Republican Navy has striven to become independent. With the help of \
+	contracted engineers, access to higher education abroad and training from Sol Alliance naval advisers, the People's Republic has been able to commission and crew some of its own \
+	ships. The Republican Navy's space-arm primarily conducts counter piracy operations in conjunction with fending off raiders."
+
+/obj/item/clothing/suit/space/void/pra
+	name = "cosmonaut voidsuit"
+	desc = "A tajaran voidsuit used by the crew of the Republican Orbital Fleet."
+	icon_state = "cosmo_suit"
+	item_state = "cosmo_suit"
+	armor = list(melee = 50, bullet = 50, laser = 30, energy = 15, bomb = 40, bio = 100, rad = 60)
+	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)
+	species_restricted = list("Tajara")
+	refittable = FALSE
+	description_fluff = "The People's Republic of Adhomai enjoys having the only militarized spaceships of all the factions on Adhomai. Initially they relied on contracting outside \
+	protection from NanoTrasen and the Sol Alliance in order to defend their orbit from raiders. However, the Republican Navy has striven to become independent. With the help of \
+	contracted engineers, access to higher education abroad and training from Sol Alliance naval advisers, the People's Republic has been able to commission and crew some of its own \
+	ships. The Republican Navy's space-arm primarily conducts counter piracy operations in conjunction with fending off raiders."

code/modules/mob/living/carbon/human/human.dm

@@ -475,7 +475,7 @@
 		shock_damage *= 0.4
 		playsound(loc, "sparks", 50, 1, -1)
 
-	if (shock_damage > 15 || tesla_shock)
+	if (shock_damage > 15)
 		visible_message(
 		"<span class='warning'>[src] was shocked by the [source]!</span>",
 		"<span class='danger'>You feel a powerful shock course through your body!</span>",

code/modules/projectiles/guns/energy/special.dm

@@ -571,6 +571,13 @@
 	accuracy = 80
 	muzzle_flash = 15
 
+/obj/item/weapon/gun/energy/tesla/mounted
+	name = "mounted tesla carbine"
+	self_recharge = 1
+	use_external_power = 1
+	recharge_time = 10
+	can_turret = 0
+
 /obj/item/weapon/gun/energy/gravity_gun
 	name = "gravity gun"
 	desc = "This nifty gun disables the gravity in the area you shoot at. Use with caution."

config/example/space_ruins.json

@@ -44,8 +44,6 @@
 		"file_name": "pra_blockade_runner.dmm",
 		"valid maps": ["aurora"],
 		"characteristics": {
-			"Large biomass signals": 100,
-			"Life Form Signals": 20,
 			"Bluespace Signals": 20,
 			"Unrecognizable Signals": 20
 		}
@@ -87,5 +85,21 @@
 			"Life Form Signals": 20,
 			"Bluespace Signals": 20
 		}
+	},
+	"diona gestalt": {
+		"file_name": "diona_gestalt.dmm",
+		"valid maps": ["aurora"],
+		"characteristics": {
+			"Large biomass signals": 100,
+			"Life Form Signals": 20
+		}
+	},
+	"spacehulk": {
+		"file_name": "spacehulk.dmm",
+		"valid maps": ["aurora"],
+		"characteristics": {
+			"Bluespace Signals": 20,
+			"Unrecognizable Signals": 20
+		}
 	}
 }

html/changelogs/alberyk_tesla.yml

@@ -0,0 +1,6 @@
+author: Alberyk, Kyres1
+
+delete-after: True
+
+changes: 
+  - rscadd: "Added two new space ruins."