ADD: 2 новых синергирующих ствола НТ + реогранизация порядка в карго НТ + чистка ОДНОЙ СТРОКИ после PR#1301, 1303

mod_celadon/items/_items.dme

@@ -33,6 +33,5 @@
 #include "code/toggles.dm"
 #include "code/under.dm"
 #include "code/weapons.dm"
-#include "code/boxes.dm"
 
 #endif

mod_celadon/items/code/guncase.dm

@@ -118,3 +118,13 @@ EMPTY_GUN_HELPER(automatic/pistol/deagle)
 	new /obj/item/stock_parts/cell/gun/empty(src)
 
 /obj/item/storage/pistolcase/ringneck
+
+/obj/item/storage/guncase/cryogelida
+/obj/item/storage/guncase/cryogelida/PopulateContents()
+	new /obj/item/gun/energy/e_gun/plasmapistol_cryo(src)
+	new /obj/item/stock_parts/cell/gun/empty(src)
+
+/obj/item/storage/guncase/pyrogelida
+/obj/item/storage/guncase/pyrogelida/PopulateContents()
+	new /obj/item/gun/energy/e_gun/plasmapistol_fire(src)
+	new /obj/item/stock_parts/cell/gun/empty(src)

mod_celadon/outpost_console/code/supply_pack/nanotrasen/gun.dm

@@ -1,6 +1,20 @@
 /datum/supply_pack/faction/nanotrasen/gun
 	group = "Weapons"
 
+
+
+/datum/supply_pack/faction/nanotrasen/gun/cryogelida
+	name = "NT-SL PPD-142 'Cryogelida' plasma pistol"
+	desc = "A fresh-new experimental plasma pistol developed by Nanotrasen-Sharplite, it has 2 firemodes. Freeze firemode is perfect for cooling syndicate terrorists' heat, and frostbite firemode allows for sending them back into ice age. It synergizes well with Pyrogelida plasma pistol."
+	contains = list(/obj/item/storage/guncase/cryogelida)
+	cost = 8000
+
+/datum/supply_pack/faction/nanotrasen/gun/pyrogelida
+	name = "NT-SL PPD-238 'Pyrogelida' plasma pistol"
+	desc = "A fresh-new experimental plasma pistol developed by Nanotrasen-Sharplite, it has 2 firemodes. Burn firemode is perfect for non-Geneva-convention-violating combat, and IMMOLATE mode lets you commit warcrimes at the rate of 50 per minute. It synergizes well with Cryogelida plasma pistol."
+	contains = list(/obj/item/storage/guncase/pyrogelida)
+	cost = 9000
+
 /datum/supply_pack/faction/nanotrasen/gun/hades
 	name = "NT SL AL-655 'Hades' energy rifle"
 	desc = "Nanotrasen's pride in energy weapon developments. It's quite rare to find this for sale, but luckily it currently is. Makes your enemies scream in terror and creates burn holes"
@@ -19,12 +33,6 @@
 	contains = list(/obj/item/storage/guncase/iot)
 	cost = 5000
 
-/datum/supply_pack/faction/nanotrasen/gun/commander
-	name = "NT 'Commander' handgun"
-	desc = "A simple 9mm pistol, looks cool, is ballistic. Produced by Nanotrasen"
-	contains = list(/obj/item/storage/pistolcase/commander)
-	cost = 700
-
 /datum/supply_pack/faction/nanotrasen/gun/egun
 	name = "NT-1 Energy rifle"
 	desc = "One of the most basic energy weapons in the universe. Shoots lethal and disabler lasers. A simple, yet an efficient PDW. It is the egun. Produced by Nanotrasen"
@@ -48,3 +56,9 @@
 	desc = "A ballistic PDW produced by Nanotrasen. Quite old, but still is amazing at filling corporation's enemies with lead. Uses 4.6x30mm rounds."
 	contains = list(/obj/item/storage/guncase/wt550)
 	cost = 6500
+
+/datum/supply_pack/faction/nanotrasen/gun/commander
+	name = "NT 'Commander' handgun"
+	desc = "A simple 9mm pistol, looks cool, is ballistic. Produced by Nanotrasen"
+	contains = list(/obj/item/storage/pistolcase/commander)
+	cost = 700

mod_celadon/weapons/_weapons.dme

@@ -27,4 +27,7 @@
 
 #include "code/modules/research/all_nodes.dm"
 
+#include "code/modules/projectiles/guns/energy/plasma.dm"
+#include "code/modules/projectiles/guns/energy/projectile_plasma.dm"
+
 #endif

mod_celadon/weapons/code/modules/projectiles/guns/energy/plasma.dm

@@ -0,0 +1,52 @@
+/obj/item/gun/energy/e_gun/plasmapistol_cryo
+	name = "SL PPD-142 'Cryogelida' plasma pistol"
+	desc = "A fresh-new experimental plasma pistol manufactured by Nanotrasen-Sharplite, it uses supercooled plasma blasts to subdue users' enemies."
+	icon = 'mod_celadon/_storge_icons/icons/guns/ntsl_lasers.dmi'
+	lefthand_file = 'mod_celadon/_storge_icons/icons/guns/guns_lefthand.dmi'
+	righthand_file = 'mod_celadon/_storge_icons/icons/guns/guns_righthand.dmi'
+	icon_state = "plasma_pistol_cryo"
+	charge_sections = 4
+	shaded_charge = TRUE
+	ammo_type = list(/obj/item/ammo_casing/energy/disabler/plasmadisable, /obj/item/ammo_casing/energy/laser/plasmalaserweak)
+	default_ammo_type = /obj/item/stock_parts/cell/gun
+
+	weapon_weight = WEAPON_MEDIUM
+	w_class = WEIGHT_CLASS_NORMAL
+	slot_flags = ITEM_SLOT_BELT 
+
+	fire_delay = 5
+
+	gun_firemodes = list(FIREMODE_SEMIAUTO)
+	default_firemode = FIREMODE_SEMIAUTO
+
+	wield_delay = 0.2 SECONDS
+	wield_slowdown = 0.1
+	spread_unwielded = 5
+
+	//Нигредо и Альбедо
+
+/obj/item/gun/energy/e_gun/plasmapistol_fire
+	name = "SL PPD-238 'Pyrogelida' plasma pistol"
+	desc = "A fresh-new experimental plasma pistol manufactured by Nanotrasen-Sharplite, it uses superheated plasma blasts to furiously burn users' enemies."
+	icon = 'mod_celadon/_storge_icons/icons/guns/ntsl_lasers.dmi'
+	lefthand_file = 'mod_celadon/_storge_icons/icons/guns/guns_lefthand.dmi'
+	righthand_file = 'mod_celadon/_storge_icons/icons/guns/guns_righthand.dmi'
+	icon_state = "plasma_pistol_fire"
+	charge_sections = 4
+	shaded_charge = TRUE
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/burn_plasmalaserweak, /obj/item/ammo_casing/energy/laser/burn_plasmalaser)
+	default_ammo_type = /obj/item/stock_parts/cell/gun
+
+	weapon_weight = WEAPON_MEDIUM
+	w_class = WEIGHT_CLASS_NORMAL
+	slot_flags = ITEM_SLOT_BELT 
+
+	fire_delay = 5
+
+	gun_firemodes = list(FIREMODE_SEMIAUTO)
+	default_firemode = FIREMODE_SEMIAUTO
+
+	wield_delay = 0.2 SECONDS
+	wield_slowdown = LASER_PISTOL_SLOWDOWN
+	spread_unwielded = 5
+

mod_celadon/weapons/code/modules/projectiles/guns/energy/projectile_plasma.dm

@@ -0,0 +1,144 @@
+/obj/projectile/temp/cryo/plasmadisable
+	name = "supercooled plasma blast"
+	icon = 'mod_celadon/_storge_icons/icons/guns/ntsl_lasers.dmi'
+	icon_state = "plasmaice"
+	damage = 25
+	armour_penetration = -20
+	damage_type = STAMINA
+	range = 10
+	speed = 0.6
+	temperature = 0
+
+/obj/projectile/temp/cryo/plasmadisable/on_hit(atom/target, blocked = FALSE)
+	var/turf/targets_turf = target.loc
+	if(iscarbon(target))
+		var/mob/living/carbon/M = target
+		if(M.bodytemperature > M.get_body_temp_normal() + 10)
+			M.adjustBruteLoss((M.bodytemperature - 310) / 5)
+			M.bodytemperature = M.get_body_temp_normal()
+			to_chat(M, "<span class='userdanger'>Your veins feel like they are exploding!</span>")
+			M.reagents.remove_any(50)
+			M.force_scream()
+			if(M.blood_volume > 0)
+				var/amount_to_drain = 40
+				M.blood_volume = M.blood_volume - amount_to_drain
+			new /obj/effect/decal/cleanable/blood(targets_turf)
+		M.adjust_blurriness(5)
+		M.adjust_bodytemperature(-20)
+		M.adjustFireLoss(3)
+
+/obj/item/ammo_casing/energy/disabler/plasmadisable
+	projectile_type = /obj/projectile/temp/cryo/plasmadisable
+	fire_sound = 'sound/weapons/gun/laser/e40_las.ogg'
+	delay = 8
+	select_name = "freeze"
+	e_cost = 1000 //20 per upgraded cell
+
+
+
+
+
+/obj/projectile/temp/cryo/plasmalaserweak
+	name = "chilly plasma blast"
+	icon = 'mod_celadon/_storge_icons/icons/guns/ntsl_lasers.dmi'
+	icon_state = "plasmaice"
+	damage = 20
+	armour_penetration = -10
+	eyeblur = 1
+	range = 10
+	speed = 0.5
+	temperature = 0
+
+/obj/projectile/temp/cryo/plasmalaserweak/on_hit(atom/target, blocked = FALSE)
+	var/turf/targets_turf = target.loc
+	if(iscarbon(target))
+		var/mob/living/carbon/M = target
+		if(M.bodytemperature > M.get_body_temp_normal() + 10)
+			M.adjustBruteLoss((M.bodytemperature - 310) / 5)
+			M.bodytemperature = M.get_body_temp_normal()
+			to_chat(M, "<span class='userdanger'>Your veins feel like they are exploding!</span>")
+			M.reagents.remove_any(50)
+			M.force_scream()
+			if(M.blood_volume > 0)
+				var/amount_to_drain = 80
+				M.blood_volume = M.blood_volume - amount_to_drain
+			new /obj/effect/decal/cleanable/blood(targets_turf)
+		M.adjust_blurriness(5)
+		M.adjust_bodytemperature(-25)
+
+/obj/item/ammo_casing/energy/laser/plasmalaserweak
+	projectile_type = /obj/projectile/temp/cryo/plasmalaserweak
+	fire_sound = 'sound/weapons/gun/laser/e40_las.ogg'
+	delay = 7
+	select_name = "frostbite"
+	e_cost = 1000 //20 per upgraded cell
+
+
+
+/obj/projectile/temp/hot/burn_plasmalaserweak
+	name = "hot plasma blast"
+	icon = 'mod_celadon/_storge_icons/icons/guns/ntsl_lasers.dmi'
+	icon_state = "plasmafire"
+	damage = 20
+	armour_penetration = -5
+	range = 10
+	speed = 0.5
+	temperature = 0
+
+/obj/projectile/temp/hot/burn_plasmalaserweak/on_hit(atom/target)
+	if(iscarbon(target))
+		var/mob/living/carbon/M = target
+		if(M.bodytemperature < M.get_body_temp_normal() - 10)
+			M.adjustBruteLoss((310 - M.bodytemperature) / 10)
+			M.adjustStaminaLoss((310 - M.bodytemperature) / 10)
+			M.adjust_blurriness(5)
+			M.bodytemperature = M.get_body_temp_normal()
+			to_chat(src, "<span class='userdanger'>Your flesh feels like it's shrinking!.</span>")
+			M.force_scream()
+
+
+/obj/item/ammo_casing/energy/laser/burn_plasmalaserweak
+	projectile_type = /obj/projectile/temp/hot/burn_plasmalaserweak
+	fire_sound = 'sound/weapons/gun/laser/e40_las.ogg'
+	delay = 7
+	select_name = "burn"
+	e_cost = 1000 //20 per upgraded cell
+
+
+
+
+/obj/projectile/temp/hot/burn_plasmalaser
+	name = "superheated plasma blast"
+	icon = 'mod_celadon/_storge_icons/icons/guns/ntsl_lasers.dmi'
+	icon_state = "plasmafire"
+	damage = 30
+	armour_penetration = 0
+	range = 10
+	speed = 0.5
+	temperature = 0
+
+
+/obj/projectile/temp/hot/burn_plasmalaser/on_hit(atom/target)
+	var/turf/targets_turf = target.loc
+	if(iscarbon(target))
+		var/mob/living/carbon/M = target
+		if(M.bodytemperature < M.get_body_temp_normal() - 10)
+			M.adjustBruteLoss((310 - M.bodytemperature) / 10)
+			M.adjustStaminaLoss((310 - M.bodytemperature) / 10)
+			M.adjust_blurriness(5)
+			M.bodytemperature = M.get_body_temp_normal()
+			to_chat(src, "<span class='userdanger'>Your flesh feels like it's shrinking!.</span>")
+			M.force_scream()
+		M.adjust_bodytemperature(333)
+		M.adjust_fire_stacks(5)
+		M.IgniteMob()
+	if(!isopenturf(targets_turf))
+		return
+	targets_turf.IgniteTurf(rand(4,11), "red")
+
+/obj/item/ammo_casing/energy/laser/burn_plasmalaser
+	projectile_type = /obj/projectile/temp/hot/burn_plasmalaser
+	fire_sound = 'sound/weapons/gun/laser/e40_las.ogg'
+	select_name = "immolate"
+	delay = 12
+	e_cost = 3333 //6 per upgraded cell