обновление горячей картошки бос эдишен

baystation12.dme

@@ -2873,6 +2873,7 @@
 #include "code\modules\projectiles\ammunition\boxes.dm"
 #include "code\modules\projectiles\ammunition\bullets.dm"
 #include "code\modules\projectiles\ammunition\magnetic.dm"
+#include "code\modules\projectiles\guns\guncell.dm"
 #include "code\modules\projectiles\guns\energy.dm"
 #include "code\modules\projectiles\guns\launcher.dm"
 #include "code\modules\projectiles\guns\projectile.dm"

code/bos/modules/guns/mantid.dm

@@ -27,11 +27,14 @@
 	slot_flags = SLOT_BACK
 	force = 25 // Heavy as Hell.
 	projectile_type = /obj/item/projectile/beam/particle
-	max_shots = 18
-	self_recharge = 1
+	charge_cost = 20
+	self_recharge = 0
 	w_class = ITEM_SIZE_HUGE
 	one_hand_penalty = 6
 	multi_aim = 1
+	battery_chamber_size = 4
+	battery_changable = TRUE
+	battery_type = /obj/item/cell/guncell/ascent
 	burst_delay = 3
 	burst = 3
 	move_delay = 4

code/datums/supplypacks/security.dm

@@ -6,26 +6,27 @@
 	contains = list(/obj/item/storage/box/emps,
 					/obj/item/grenade/smokebomb = 3,
 					/obj/item/grenade/chem_grenade/incendiary)
-	cost = 20
+	cost = 25
 	containername = "special ops crate"
 	hidden = 1
 
+
 /decl/hierarchy/supply_pack/security/lightarmor
 	name = "Armor - Light"
 	contains = list(/obj/item/clothing/suit/armor/pcarrier/light = 4,
-					/obj/item/clothing/head/helmet =4)
+					/obj/item/clothing/head/helmet = 4)
 	cost = 30
 	containertype = /obj/structure/closet/crate/secure
 	containername = "light armor crate"
 	access = access_security
 
 /decl/hierarchy/supply_pack/security/armor
 	name = "Armor - Unmarked"
-	contains = list(/obj/item/clothing/suit/armor/pcarrier/medium = 2,
-					/obj/item/clothing/head/helmet =2)
-	cost = 20
+	contains = list(/obj/item/clothing/suit/armor/pcarrier/medium = 3,
+					/obj/item/clothing/head/helmet = 3)
+	cost = 25
 	containertype = /obj/structure/closet/crate/secure
-	containername = "armor crate"
+	containername = "unmarked armor crate"
 	access = access_security
 
 /decl/hierarchy/supply_pack/security/tacticalarmor
@@ -38,52 +39,52 @@
 					/obj/item/storage/belt/holster/security/tactical,
 					/obj/item/clothing/shoes/tactical,
 					/obj/item/clothing/gloves/tactical)
-	cost = 45
+	cost = 40
 	containertype = /obj/structure/closet/crate/secure
 	containername = "tactical armor crate"
 	access = access_armory
 
 /decl/hierarchy/supply_pack/security/blackguards
 	name = "Armor - Arm and leg guards, black"
-	contains = list(/obj/item/clothing/accessory/arm_guards = 2,
-					/obj/item/clothing/accessory/leg_guards = 2)
-	cost = 20
+	contains = list(/obj/item/clothing/accessory/arm_guards = 3,
+					/obj/item/clothing/accessory/leg_guards = 3)
+	cost = 15
 	containertype = /obj/structure/closet/crate/secure
 	containername = "arm and leg guards crate"
 	access = access_armory
 
 /decl/hierarchy/supply_pack/security/blueguards
 	name = "Armor - Arm and leg guards, blue"
-	contains = list(/obj/item/clothing/accessory/arm_guards/blue = 2,
-					/obj/item/clothing/accessory/leg_guards/blue = 2)
-	cost = 20
+	contains = list(/obj/item/clothing/accessory/arm_guards/blue = 3,
+					/obj/item/clothing/accessory/leg_guards/blue = 3)
+	cost = 15
 	containertype = /obj/structure/closet/crate/secure
 	containername = "arm and leg guards crate"
 	access = access_armory
 
 /decl/hierarchy/supply_pack/security/greenguards
 	name = "Armor - Arm and leg guards, green"
-	contains = list(/obj/item/clothing/accessory/arm_guards/green = 2,
-					/obj/item/clothing/accessory/leg_guards/green = 2)
-	cost = 20
+	contains = list(/obj/item/clothing/accessory/arm_guards/green = 3,
+					/obj/item/clothing/accessory/leg_guards/green = 3)
+	cost = 15
 	containertype = /obj/structure/closet/crate/secure
 	containername = "arm and leg guards crate"
 	access = access_armory
 
 /decl/hierarchy/supply_pack/security/navyguards
 	name = "Armor - Arm and leg guards, navy blue"
-	contains = list(/obj/item/clothing/accessory/arm_guards/navy = 2,
-					/obj/item/clothing/accessory/leg_guards/navy = 2)
-	cost = 20
+	contains = list(/obj/item/clothing/accessory/arm_guards/navy = 3,
+					/obj/item/clothing/accessory/leg_guards/navy = 3)
+	cost = 15
 	containertype = /obj/structure/closet/crate/secure
 	containername = "arm and leg guards crate"
 	access = access_armory
 
 /decl/hierarchy/supply_pack/security/tanguards
 	name = "Armor - Arm and leg guards, tan"
-	contains = list(/obj/item/clothing/accessory/arm_guards/tan = 2,
-					/obj/item/clothing/accessory/leg_guards/tan = 2)
-	cost = 20
+	contains = list(/obj/item/clothing/accessory/arm_guards/tan = 3,
+					/obj/item/clothing/accessory/leg_guards/tan = 3)
+	cost = 15
 	containertype = /obj/structure/closet/crate/secure
 	containername = "arm and leg guards crate"
 	access = access_armory
@@ -95,9 +96,9 @@
 					/obj/item/clothing/suit/armor/riot = 4,
 					/obj/item/storage/box/flashbangs,
 					/obj/item/storage/box/teargas)
-	cost = 80
+	cost = 65
 	containertype = /obj/structure/closet/crate/secure
-	containername = "riot armor crate"
+	containername = "riot gear crate"
 	access = access_armory
 
 /decl/hierarchy/supply_pack/security/ballisticarmor
@@ -126,13 +127,13 @@
 					/obj/item/gun/energy/taser = 4)
 	cost = 50
 	containertype = /obj/structure/closet/crate/secure/weapon
-	containername = "weapons crate"
+	containername = "security weapons crate"
 	access = access_security
 
 /decl/hierarchy/supply_pack/security/egun
 	name = "Weapons - Energy sidearms"
-	contains = list(/obj/item/gun/energy/gun/secure = 4)
-	cost = 40
+	contains = list(/obj/item/gun/energy/gun/secure = 3)
+	cost = 30
 	containertype = /obj/structure/closet/crate/secure/weapon
 	containername = "energy sidearms crate"
 	access = access_armory
@@ -145,35 +146,27 @@
 	contraband = 1
 	security_level = null
 
-/decl/hierarchy/supply_pack/security/plasma
-	name = "Weapons - Plasma assault rifles"
-	contains = list(/obj/item/gun/energy/k342 = 2,
-					/obj/item/cell/guncell/medium = 6)
-	cost = 110
-	containertype = /obj/structure/closet/crate/secure/weapon
-	containername = "plasma longarms crate"
-	access = access_armory
-	security_level = SUPPLY_SECURITY_ELEVATED
 /*
 /decl/hierarchy/supply_pack/security/plasma/expo
 	name = "Weapons - Plasma assault rifles (Expeditionary Corps)"
 	contains = list(/obj/item/gun/energy/k342/explo = 2,
-					/obj/item/cell/guncell/medium = 6)
-	cost = 130
-	security_level = SUPPLY_SECURITY_ELEVATED
+					/obj/item/cell/guncell/medium = 2)
+	cost = 100
 */
+
 /decl/hierarchy/supply_pack/security/plasma/stingray
 	name = "Weapons - Plasma sniper rifles"
 	contains = list(/obj/item/gun/energy/k342/sniper = 2,
-					/obj/item/cell/guncell/medium = 6)
+					/obj/item/cell/guncell/medium = 4)
 	cost = 180
 	security_level = SUPPLY_SECURITY_HIGH
 
 /decl/hierarchy/supply_pack/security/ion
 	name = "Weapons - Electromagnetic"
 	contains = list(/obj/item/gun/energy/ionrifle = 2,
+					/obj/item/gun/energy/ionrifle/small,
 					/obj/item/storage/box/emps)
-	cost = 50
+	cost = 60
 	containertype = /obj/structure/closet/crate/secure/weapon
 	containername = "electromagnetic weapons crate"
 	access = access_armory
@@ -182,12 +175,31 @@
 /decl/hierarchy/supply_pack/security/shotgun
 	name = "Weapons - Shotgun"
 	contains = list(/obj/item/gun/projectile/shotgun/pump/combat = 2)
-	cost = 60
+	cost = 50
 	containertype = /obj/structure/closet/crate/secure/weapon
 	containername = "shotgun crate"
 	access = access_armory
 	security_level = SUPPLY_SECURITY_ELEVATED
 
+/decl/hierarchy/supply_pack/security/pdwnt
+	name = "Weapons - NT41"
+	contains = list(/obj/item/gun/projectile/automatic/corpo = 2,
+					/obj/item/ammo_magazine/corpo = 6)
+	cost = 60
+	containertype = /obj/structure/closet/crate/secure/weapon
+	containername = "NT41 crate"
+	access = access_armory
+	security_level = SUPPLY_SECURITY_ELEVATED
+
+/decl/hierarchy/supply_pack/security/frags
+	name = "Weapons - Fragmentation grenades"
+	contains = list(/obj/item/storage/box/frags = 2)
+	cost = 80
+	containertype = /obj/structure/closet/crate/secure/weapon
+	containername = "frag grenade crate"
+	access = access_emergency_armory
+	security_level = SUPPLY_SECURITY_HIGH
+
 /decl/hierarchy/supply_pack/security/flashbang
 	name = "Weapons - Flashbangs"
 	contains = list(/obj/item/storage/box/flashbangs = 2)
@@ -204,6 +216,87 @@
 	containername = "tear gas grenades crate"
 	access = access_security
 
+/decl/hierarchy/supply_pack/security/battaries
+	name = "Ammunition - Energy rifle small guncells"
+	cost = 40
+	contains = list(/obj/item/cell/guncell/small = 2,
+					/obj/item/cell/guncell/verysmall = 2)
+	containertype = /obj/structure/closet/crate/secure/weapon
+	containername = "energy rifle guncells crate"
+	access = access_security
+
+/decl/hierarchy/supply_pack/security/battaries/medium
+	name = "Ammunition - Energy rifle mediun guncells"
+	cost = 60
+	contains = list(/obj/item/cell/guncell/medium = 4)
+
+/decl/hierarchy/supply_pack/security/battaries/large
+	name = "Ammunition - Energy rifle large guncells"
+	cost = 80
+	contains = list(/obj/item/cell/guncell/large = 3)
+	security_level = SUPPLY_SECURITY_ELEVATED
+
+/decl/hierarchy/supply_pack/security/battaries/megalarge
+	name = "Ammunition - Energy rifle unstable guncells"
+	cost = 100
+	contains = list(/obj/item/cell/guncell/megalarge = 3)
+	security_level = SUPPLY_SECURITY_ELEVATED
+
+/decl/hierarchy/supply_pack/security/battaries/hypercharged
+	name = "Ammunition/Weapons - Energy rifle Hypercharged small cells"
+	cost = 60
+	contains = list(/obj/item/cell/guncell/overcharged/small = 2,
+					/obj/item/cell/guncell/overcharged/verysmall = 2,
+					/obj/item/cell/guncell/overcharged/medium = 2)
+	security_level = SUPPLY_SECURITY_HIGH
+
+/decl/hierarchy/supply_pack/security/battaries/hypercharged/large
+	name = "Ammunition/Weapons - Energy rifle Hypercharged large cells"
+	cost = 80
+	contains = list(/obj/item/cell/guncell/overcharged/medium = 2,
+					/obj/item/cell/guncell/overcharged/large = 2,
+					/obj/item/cell/guncell/overcharged/megalarge = 2)
+
+/decl/hierarchy/supply_pack/security/battaries/pistol
+	name = "Ammunition - Energy pistol small guncells"
+	cost = 30
+	contains = list(/obj/item/cell/guncell/pistol/small = 2,
+					/obj/item/cell/guncell/pistol/verysmall = 2)
+	containertype = /obj/structure/closet/crate/secure/weapon
+	containername = "energy pistol guncells crate"
+
+/decl/hierarchy/supply_pack/security/battaries/pistol/medium
+	name = "Ammunition - Energy pistol medium guncells"
+	cost = 60
+	contains = list(/obj/item/cell/guncell/pistol/medium = 4)
+
+/decl/hierarchy/supply_pack/security/battaries/pistol/large
+	name = "Ammunition - Energy pistol large guncells"
+	cost = 80
+	contains = list(/obj/item/cell/guncell/pistol/large = 3)
+	security_level = SUPPLY_SECURITY_ELEVATED
+
+/decl/hierarchy/supply_pack/security/battaries/pistol/megalarge
+	name = "Ammunition - Energy pistol unstable guncells"
+	cost = 100
+	contains = list(/obj/item/cell/guncell/pistol/megalarge = 3)
+	security_level = SUPPLY_SECURITY_ELEVATED
+
+/decl/hierarchy/supply_pack/security/battaries/pistol/hypercharged
+	name = "Ammunition/Weapons - Energy pistol Hypercharged small cells"
+	cost = 60
+	contains = list(/obj/item/cell/guncell/pistol/overcharged/small = 2,
+					/obj/item/cell/guncell/pistol/overcharged/verysmall = 2,
+					/obj/item/cell/guncell/pistol/overcharged/medium = 2)
+	security_level = SUPPLY_SECURITY_HIGH
+
+/decl/hierarchy/supply_pack/security/battaries/pistol/hypercharged/large
+	name = "Ammunition/Weapons - Energy pistol Hypercharged large cells"
+	cost = 80
+	contains = list(/obj/item/cell/guncell/pistol/overcharged/medium = 2,
+					/obj/item/cell/guncell/pistol/overcharged/large = 2,
+					/obj/item/cell/guncell/pistol/overcharged/megalarge = 2)
+
 /decl/hierarchy/supply_pack/security/shotgunammo
 	name = "Ammunition - Lethal shells"
 	contains = list(/obj/item/storage/box/ammo/shotgunammo = 2,
@@ -247,6 +340,14 @@
 	containername = "SMG practice ammunition crate"
 	access = access_security
 
+/decl/hierarchy/supply_pack/security/pdwammont
+	name = "Ammunition - Lethal NT41 ammo"
+	contains = list(/obj/item/ammo_magazine/corpo = 8)
+	cost = 20
+	containertype = /obj/structure/closet/crate/secure/weapon
+	containername = "NT41 ammunition crate"
+	access = access_security
+
 /decl/hierarchy/supply_pack/security/bullpupammo
 	name = "Ammunition - military rifle"
 	contains = list(/obj/item/ammo_magazine/mil_rifle = 4)

code/datums/uplink/ammunition.dm

@@ -147,3 +147,37 @@
 	desc = "A container of rounds for the corporative PDW BP15. Contains whole 30 rounds."
 	item_cost = 2
 	path = /obj/item/ammo_magazine/pdw
+
+/datum/uplink_item/item/ammo/guncell
+	name = "Medium Rifle Guncell"
+	desc = "A guncell used with energy based weaponry that uses rifle cells. This one is rated 300Wh."
+	item_cost = 2
+	path = /obj/item/cell/guncell/medium
+
+/datum/uplink_item/item/ammo/guncell/pistol
+	name = "Medium Pistol Guncell"
+	desc = "A guncell used with energy based weaponry that uses pistol cells. This one is rated 300Wh."
+	path = /obj/item/cell/guncell/pistol/medium
+
+/datum/uplink_item/item/ammo/guncell/large
+	name = "Large Rifle Guncell"
+	desc = "A guncell used with energy based weaponry that uses rifle cells. This one is rated 400Wh. Slightly larger than normal one and won't explode in your hands."
+	item_cost = 3
+	path = /obj/item/cell/guncell/large
+
+/datum/uplink_item/item/ammo/guncell/large/pistol
+	name = "Large Pistol Guncell"
+	desc = "A guncell used with energy based weaponry that uses pistol cells. This one is rated 400Wh. Slightly larger than normal one and won't explode in your hands."
+	path = /obj/item/cell/guncell/pistol/large
+
+/datum/uplink_item/item/ammo/guncell/hypercharged
+	name = "Hypercharged Rifle Huge Guncell"
+	desc = "A guncell used with energy based weaponry that uses rifle cells. This one is rated whopping 800wh AND can be used as ghetto hand grenade. When you hate someone so much you wouldn't even care if it can rip off your own arms."
+	item_cost = 8
+	path = /obj/item/cell/guncell/overcharged/huge
+
+/datum/uplink_item/item/ammo/guncell/hypercharged/pistol
+	name = "Hypercharged Pistol Huge Guncell"
+	desc = "A guncell used with energy based weaponry that uses pistol cells. This one is rated whopping 800wh AND can be used as ghetto hand grenade. When you hate someone so much you wouldn't even care if it can rip off your own arms."
+	path = /obj/item/cell/guncell/pistol/overcharged/huge
+

code/datums/uplink/grenades.dm

@@ -69,6 +69,12 @@
 	antag_roles = list(MODE_MERCENARY)
 	path = /obj/item/storage/box/frags
 
+/datum/uplink_item/item/ammo/guncell/hypercharged/box
+	name = "6x Hypercharged Guncells"
+	desc = "A box containing 6x large hypercharged for both energy pistols and rifles. The way of jihad never ends."
+	item_cost = 20
+	path = /obj/item/storage/box/hypercharged_guncells
+
 /datum/uplink_item/item/grenades/supermatter
 	name = "1x Supermatter Grenade"
 	desc = "This grenade contains a small supermatter shard which will delaminate upon activation and pull in nearby objects, irradiate lifeforms, and eventually explode."

code/game/objects/items/weapons/storage/boxes.dm

@@ -244,6 +244,13 @@
 	icon_state = "radbox"
 	startswith = list(/obj/item/grenade/supermatter = 5)
 
+/obj/item/storage/box/hypercharged_guncells
+	name = "box of hypercharged cells"
+	desc = "A box containing 6 higly unstable hypercharged guncells. Both ammunition and a improvised grenade."
+	icon_state = "flashbang"
+	startswith = list(	/obj/item/cell/guncell/overcharged/large = 3,
+						/obj/item/cell/guncell/pistol/overcharged/large = 3)
+
 /obj/item/storage/box/trackimp
 	name = "boxed tracking implant kit"
 	desc = "Box full of scum-bag tracking utensils."