Remove removed revik, Koran fix, add GROZA in weapon vend (#129)

* убрал убранные пушки, добавил фамас и грозу в вендор * ammo groza and 88 * fix some * 1 * 2 * fix * remove ar-18 mag * Update rifles.dm Signed-off-by: Kirill <[email protected]> * fix dmi * 1 * fix --------- Signed-off-by: Kirill <[email protected]>
PMC-Unga-Marines · Aug 27, 2024 · 76ba544 · 76ba544
1 parent 5a650fa
commit 76ba544
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 26 deletions.
diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
@@ -195,7 +195,6 @@ GLOBAL_LIST_INIT(leader_gear_listed_products, list(
 	/obj/structure/closet/bodybag/tarp = list(CAT_LEDSUP, "V1 thermal-dampening tarp", 2, "yellow"),
 	/obj/item/weapon/gun/flamer/big_flamer/marinestandard = list(CAT_LEDSUP, "FL-84 flamethrower", 6, "red"),
 	/obj/item/ammo_magazine/flamer_tank/large = list(CAT_LEDSUP, "Flamethrower tank", 2, "orange2"),
-	/obj/item/weapon/gun/revolver/standard_magnum = list(CAT_LEDSUP, "R-76 Magnum", 10, "red"),
 	/obj/item/storage/holster/belt/mateba/full = list(CAT_LEDSUP, "Mateba Autorevolver belt", 10, "red"),
 	/obj/item/ammo_magazine/revolver/mateba = list(CAT_LEDSUP, "Mateba magazine", 2, "orange2"),
 	/obj/item/ammo_magazine/packet/mateba = list(CAT_LEDSUP, "Mateba packet", 3, "orange2"),
@@ -279,7 +278,6 @@ GLOBAL_LIST_INIT(commander_gear_listed_products, list(
 	/obj/item/weapon/gun/rifle/T25 = list(CAT_FCSUP, "T25 Smartrifle", 23, "red"),
 	/obj/item/ammo_magazine/rifle/T25 = list(CAT_FCSUP, "T25 smartrifle magazine", 2, "orange2"),
 	/obj/item/ammo_magazine/packet/T25_rifle = list(CAT_FCSUP, "T25 smartrifle ammo box", 3, "orange2"),
-	/obj/item/weapon/gun/revolver/standard_magnum = list(CAT_FCSUP, "R-76 Magnum", 10, "red"),
 	/obj/item/storage/holster/belt/mateba/full = list(CAT_FCSUP, "Mateba Autorevolver belt", 10, "red"),
 	/obj/item/ammo_magazine/revolver/mateba = list(CAT_FCSUP, "Mateba magazine", 2, "orange2"),
 	/obj/item/ammo_magazine/packet/mateba = list(CAT_FCSUP, "Mateba packet", 3, "orange2"),

diff --git a/code/game/objects/items/loot_box.dm b/code/game/objects/items/loot_box.dm
@@ -42,9 +42,6 @@
 		/obj/item/weapon/karambit,
 		/obj/item/weapon/karambit/fade,
 		/obj/item/weapon/karambit/case_hardened,
-		/obj/item/storage/briefcase/standard_magnum/gold,
-		/obj/item/storage/briefcase/standard_magnum/silver,
-		/obj/item/storage/briefcase/standard_magnum/nickle,
 	)
 	rare_list = list(
 		/obj/vehicle/unmanned,

diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm
@@ -184,6 +184,7 @@
 	name = "Koran"
 	icon = 'icons/obj/items/priest.dmi'
 	icon_state = "Koran"
+	deity_name = "Allah"
 	actions_types = list(/datum/action/item_action)
 	max_w_class = 3
 	storage_slots = 1

diff --git a/code/game/objects/items/storage/bible.dm b/code/game/objects/items/storage/bible.dm
@@ -13,11 +13,6 @@
 	var/mob/affecting = null
 	var/deity_name = "Christ"
 
-/obj/item/storage/bible/koran
-	name = "koran"
-	icon_state = "koran"
-	deity_name = "Allah"
-
 /obj/item/storage/bible/booze
 	name = "bible"
 	desc = "To be applied to the head repeatedly."

diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm
@@ -16,6 +16,10 @@
 			/obj/item/ammo_magazine/rifle/standard_assaultrifle/hp = -1,
 			/obj/item/weapon/gun/shotgun/pump/lever/repeater = -1,
 			/obj/item/ammo_magazine/packet/p4570 = -1,
+			/obj/item/weapon/gun/rifle/type71 = -1,
+			/obj/item/ammo_magazine/rifle/type71 = -1,
+			/obj/item/ammo_magazine/rifle/type71/ap = -1,
+			/obj/item/ammo_magazine/rifle/type71/hp = -1,
 		),
 		"SMGs" = list(
 			/obj/item/weapon/gun/smg/vector = -1,
@@ -78,6 +82,8 @@
 			/obj/item/weapon/gun/pistol/vp70 = -1,
 			/obj/item/ammo_magazine/pistol/vp70 = -1,
 			/obj/item/ammo_magazine/pistol/vp70/hp = -1,
+			/obj/item/ammo_magazine/pistol/vp70/incendiary = -1,
+			/obj/item/ammo_magazine/pistol/vp70/sabot = -1,
 			/obj/item/weapon/gun/pistol/plasma_pistol = -1,
 			/obj/item/ammo_magazine/pistol/plasma_pistol = -1,
 			/obj/item/weapon/gun/shotgun/double/derringer = -1,
@@ -220,6 +226,10 @@
 			/obj/item/ammo_magazine/rifle/standard_assaultrifle/hp = -1,
 			/obj/item/weapon/gun/shotgun/pump/lever/repeater = -1,
 			/obj/item/ammo_magazine/packet/p4570 = -1,
+			/obj/item/weapon/gun/rifle/type71 = -1,
+			/obj/item/ammo_magazine/rifle/type71 = -1,
+			/obj/item/ammo_magazine/rifle/type71/ap = -1,
+			/obj/item/ammo_magazine/rifle/type71/hp = -1,
 		),
 		"Energy Weapons" = list(
 			/obj/item/cell/lasgun/lasrifle = -1,
@@ -293,6 +303,8 @@
 			/obj/item/weapon/gun/pistol/vp70 = -1,
 			/obj/item/ammo_magazine/pistol/vp70 = -1,
 			/obj/item/ammo_magazine/pistol/vp70/hp = -1,
+			/obj/item/ammo_magazine/pistol/vp70/incendiary = -1,
+			/obj/item/ammo_magazine/pistol/vp70/sabot = -1,
 			/obj/item/weapon/gun/pistol/plasma_pistol = -1,
 			/obj/item/ammo_magazine/pistol/plasma_pistol = -1,
 			/obj/item/weapon/gun/shotgun/double/derringer = -1,
@@ -431,6 +443,10 @@
 			/obj/item/ammo_magazine/rifle/standard_assaultrifle/hp = -1,
 			/obj/item/weapon/gun/shotgun/pump/lever/repeater = -1,
 			/obj/item/ammo_magazine/packet/p4570 = -1,
+			/obj/item/weapon/gun/rifle/type71 = -1,
+			/obj/item/ammo_magazine/rifle/type71 = -1,
+			/obj/item/ammo_magazine/rifle/type71/ap = -1,
+			/obj/item/ammo_magazine/rifle/type71/hp = -1,
 		),
 		"Energy Weapons" = list(
 			/obj/item/cell/lasgun/lasrifle = -1,
@@ -506,6 +522,8 @@
 			/obj/item/weapon/gun/pistol/vp70 = -1,
 			/obj/item/ammo_magazine/pistol/vp70 = -1,
 			/obj/item/ammo_magazine/pistol/vp70/hp = -1,
+			/obj/item/ammo_magazine/pistol/vp70/incendiary = -1,
+			/obj/item/ammo_magazine/pistol/vp70/sabot = -1,
 			/obj/item/weapon/gun/pistol/plasma_pistol = -1,
 			/obj/item/ammo_magazine/pistol/plasma_pistol = -1,
 			/obj/item/weapon/gun/shotgun/double/derringer = -1,

diff --git a/code/modules/projectiles/ammo_datums/bullet/rifle.dm b/code/modules/projectiles/ammo_datums/bullet/rifle.dm
@@ -168,6 +168,22 @@
 	penetration = 15
 	additional_xeno_penetration = 12.5
 
+/datum/ammo/bullet/rifle/mpi_km/ap
+	name = "crude heavy rifle bullet"
+	hud_state = "rifle_crude"
+	flags_ammo_behavior = AMMO_BALLISTIC
+	damage = 25
+	penetration = 35
+	additional_xeno_penetration = 27.5
+
+/datum/ammo/bullet/rifle/mpi_km/hp
+	name = "crude heavy rifle bullet"
+	hud_state = "rifle_crude"
+	flags_ammo_behavior = AMMO_BALLISTIC
+	damage = 50
+	penetration = 0
+	additional_xeno_penetration = -15
+
 /datum/ammo/bullet/rifle/standard_dmr
 	name = "marksman bullet"
 	hud_state = "hivelo"

diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm
@@ -1114,7 +1114,7 @@
 //USL TYPE 71 RIFLE
 
 /obj/item/weapon/gun/rifle/type71
-	name = "\improper Type 71 pulse rifle"
+	name = "\improper Type 71 'GROZA' pulse rifle"
 	desc = "The primary rifle of the USL pirates, the Type 71 is a reliable rifle chambered in 7.62x39mm, firing in three round bursts to conserve ammunition. A newer model for surpression roles to comply with overmatch doctrines is in progress and only issued to a limited number of privates in the USL."
 	icon = 'icons/Marine/gun64.dmi'
 	icon_state = "type71"
@@ -1127,7 +1127,11 @@
 	reload_sound = 'sound/weapons/guns/interact/type71_reload.ogg'
 	cocked_sound = 'sound/weapons/guns/interact/type71_cocked.ogg'
 	default_ammo_type = /obj/item/ammo_magazine/rifle/type71
-	allowed_ammo_types = list(/obj/item/ammo_magazine/rifle/type71)
+	allowed_ammo_types = list(
+		/obj/item/ammo_magazine/rifle/type71,
+		/obj/item/ammo_magazine/rifle/type71/ap,
+		/obj/item/ammo_magazine/rifle/type71/hp,
+	)
 	aim_slowdown = 0.6
 	wield_delay = 0.7 SECONDS
 	attachable_allowed = list(
@@ -1951,13 +1955,13 @@
 	caliber = CALIBER_10X24_CASELESS //codex
 	max_shells = 36 //codex
 	wield_delay = 1 SECONDS
-	default_ammo_type = /obj/item/ammo_magazine/rifle/standard_carbine
+	default_ammo_type = /obj/item/ammo_magazine/rifle/standard_assaultrifle
 	allowed_ammo_types = list(
-		/obj/item/ammo_magazine/rifle/standard_carbine,
-		/obj/item/ammo_magazine/rifle/standard_carbine/ap,
-		/obj/item/ammo_magazine/rifle/standard_carbine/hp,
-		/obj/item/ammo_magazine/rifle/standard_carbine/sabot,
-		/obj/item/ammo_magazine/rifle/standard_carbine/incendiary,
+		/obj/item/ammo_magazine/rifle/standard_assaultrifle,
+		/obj/item/ammo_magazine/rifle/standard_assaultrifle/ap,
+		/obj/item/ammo_magazine/rifle/standard_assaultrifle/hp,
+		/obj/item/ammo_magazine/rifle/standard_assaultrifle/sabot,
+		/obj/item/ammo_magazine/rifle/standard_assaultrifle/incendiary,
 	)
 	attachable_allowed = list(
 		/obj/item/attachable/scope/optical,

diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm
@@ -261,9 +261,22 @@
 	caliber = CALIBER_762X39
 	icon_state = "type_71"
 	icon_state_mini = "mag_rifle_big"
+	ammo_band_icon = "type_71_band"
 	default_ammo = /datum/ammo/bullet/rifle/mpi_km
 	max_rounds = 42
 
+/obj/item/ammo_magazine/rifle/type71/ap
+	name = "\improper Type 71 AP magazine (7.62x39mm)"
+	desc = "A 7.62x39mm AP magazine that fits in the Type 71 rifle."
+	ammo_band_color = AMMO_BAND_COLOR_AP
+	default_ammo = /datum/ammo/bullet/rifle/mpi_km/ap
+
+/obj/item/ammo_magazine/rifle/type71/hp
+	name = "\improper Type 71 HP magazine (7.62x39mm)"
+	desc = "A 7.62x39mm HP magazine that fits in the Type 71 rifle."
+	ammo_band_color = AMMO_BAND_COLOR_HOLLOWPOINT
+	default_ammo = /datum/ammo/bullet/rifle/mpi_km/hp
+
 //TX-16 AUTOMATIC SHOTGUN
 
 /obj/item/ammo_magazine/rifle/tx15_flechette
@@ -700,7 +713,6 @@
 	name = "\improper AR-12 AP magazine (10x24mm)"
 	desc = "A 10mm armor piercing assault rifle magazine."
 	ammo_band_color = AMMO_BAND_COLOR_AP
-
 	default_ammo = /datum/ammo/bullet/rifle/ap
 
 /obj/item/ammo_magazine/rifle/standard_assaultrifle/incendiary

diff --git a/code/modules/reqs/supplypacks.dm b/code/modules/reqs/supplypacks.dm
@@ -768,13 +768,6 @@ WEAPONS
 	cost = 120
 	available_against_xeno_only = TRUE
 
-/datum/supply_packs/weapons/magnum
-	name = "R-76 Magnum"
-	contains = list(/obj/item/weapon/gun/revolver/standard_magnum)
-	notes = "Ammo is contained within normal marine vendors."
-	cost = 75
-	available_against_xeno_only = TRUE
-
 /datum/supply_packs/weapons/standard_ammo
 	name = "Surplus Standard Ammo Crate"
 	notes = "Contains 22 ammo boxes of a wide variety which come prefilled. You lazy bum."

diff --git a/icons/obj/items/ammo.dmi b/icons/obj/items/ammo.dmi