Merge branch 'master' into abandoned_garden

shiptest-ss13 · Sep 4, 2024 · 52e5fad · 52e5fad
2 parents f0b3a50 + f8af446
commit 52e5fad
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 7 deletions.
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
@@ -57,6 +57,17 @@
 	stock = 6
 	availability_prob = 0
 
+/datum/blackmarket_item/ammo/c299
+	name = "Eoehoma .299 Caseless Ammo Box"
+	desc = "This ammunition for the E-40 Hybrid Rifle is probably worth more than the people you're shooting it at."
+	item = /obj/item/ammo_box/c299
+
+	price_min = 300
+	price_max = 700
+	stock_min = 4
+	stock_max = 8
+	availability_prob = 0
+
 /datum/blackmarket_item/ammo/saber_mag
 	name = "Saber 9mm SMG Magazines"
 	desc = "Magazines for use in the Saber 9mm SMG. No, they don't work as swords."

diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -129,10 +129,10 @@
 	name = "E-40 Hybrid Assault Rifle"
 	desc = "A dual mode hybrid assault rifle made by the now defunct Eoehoma Firearms. Capable of firing both bullets AND lasers, for the discerning dealer in death. Chambered in Eoehoma .299 Caseless."
 	item = /obj/item/gun/ballistic/automatic/assault/e40
-	pair_item = list(/datum/blackmarket_item/ammo/e40_mag)
+	pair_item = list(/datum/blackmarket_item/ammo/e40_mag, /datum/blackmarket_item/ammo/c299)
 
 	price_min = 7000
-	price_max = 15000
+	price_max = 10000
 	stock_max = 2
 	availability_prob = 10
 	spawn_weighting = FALSE

diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm
@@ -85,8 +85,8 @@
 	bullet_per_box = 20
 
 /obj/item/ammo_casing/caseless/c299
-	name = ".229 Eoehoma caseless bullet casing"
-	desc = "A .229 Eoehoma caseless bullet casing."
+	name = ".299 Eoehoma caseless bullet casing"
+	desc = "A .299 Eoehoma caseless bullet casing."
 	icon_state = "caseless"
 	caliber = ".299 caseless"
 	projectile_type = /obj/projectile/bullet/c299

diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
@@ -519,3 +519,11 @@
 	icon_state = "a44roum-hp"
 	ammo_type = /obj/item/ammo_casing/a44roum/hp
 	max_ammo = 50
+
+/obj/item/ammo_box/c299
+	name = "ammo box (.299 Eoehoma caseless)"
+	desc = "A box of .299 Eoehoma caseless, for use with the E-40 hybrid assault rifle."
+	icon_state = "299box"
+	ammo_type = /obj/item/ammo_casing/caseless/c299
+	max_ammo = 120
+	w_class = WEIGHT_CLASS_NORMAL // This is a lot of ammo
diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm
@@ -119,7 +119,7 @@
 	multiple_sprites = AMMO_BOX_FULL_EMPTY
 
 /obj/item/ammo_box/magazine/e40
-	name = "E-40 magazine (.229 Eoehoma caseless)"
+	name = "E-40 magazine (.299 Eoehoma caseless)"
 	icon_state = "e40_mag-1"
 	base_icon_state = "e40_mag"
 	ammo_type = /obj/item/ammo_casing/caseless/c299

diff --git a/code/modules/projectiles/guns/ballistic/assault.dm b/code/modules/projectiles/guns/ballistic/assault.dm
@@ -141,7 +141,7 @@
 
 /obj/item/gun/ballistic/automatic/assault/e40
 	name = "\improper E-40 Hybrid Rifle"
-	desc = "A Hybrid Assault Rifle, best known for being having a dual ballistic/laser system along with an advanced ammo counter. Once an icon for bounty hunters, age has broken most down, so these end up in collector's hands or as shoddy Frontiersmen laser SMG conversions when in their inheritted stockpiles. But if one were to find one in working condition, it would be just as formidable as back then. Chambered in .229 Eoehoma caseless, and uses energy for lasers."
+	desc = "A Hybrid Assault Rifle, best known for being having a dual ballistic/laser system along with an advanced ammo counter. Once an icon for bounty hunters, age has broken most down, so these end up in collector's hands or as shoddy Frontiersmen laser SMG conversions when in their inheritted stockpiles. But if one were to find one in working condition, it would be just as formidable as back then. Chambered in .299 Eoehoma caseless, and uses energy for lasers."
 	icon = 'icons/obj/guns/manufacturer/eoehoma/48x32.dmi'
 	lefthand_file = 'icons/obj/guns/manufacturer/eoehoma/lefthand.dmi'
 	righthand_file = 'icons/obj/guns/manufacturer/eoehoma/righthand.dmi'

diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm
@@ -69,7 +69,7 @@
 // .299 Eoehoma Caseless (E-40)
 
 /obj/projectile/bullet/c299
-	name = ".229 Eoehoma caseless bullet"
+	name = ".299 Eoehoma caseless bullet"
 	damage = 20
 	armour_penetration = 10
 

diff --git a/html/changelogs/archive/2024-09.yml b/html/changelogs/archive/2024-09.yml
@@ -0,0 +1,3 @@
+2024-09-04:
+  generalthrax:
+  - balance: E-40 is now slightly less expensive