Fix Eland Revolver (#4048)

* Update TGS DMAPI * Revert "Automatic TGS DMAPI Update" * fixed eland shiut * fhdg * hategun * guh * ghbfsdgfdhsgdfs * jghkv --------- Co-authored-by: tgstation-server <[email protected]>
Monkestation · Nov 1, 2024 · a3d8db8 · a3d8db8
1 parent 2f790ba
commit a3d8db8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 40 deletions.
diff --git a/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm b/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm
@@ -16,7 +16,7 @@
 /obj/item/ammo_box/magazine/internal/cylinder/proc/rotate()
 	var/b = stored_ammo[1]
 	stored_ammo.Cut(1,2)
-	stored_ammo.Insert(0, b)
+	stored_ammo.Add(b)
 
 /obj/item/ammo_box/magazine/internal/cylinder/proc/spin()
 	for(var/i in 1 to rand(0, max_ammo*2))

diff --git a/monkestation/code/modules/blueshift/elements/caseless.dm b/monkestation/code/modules/blueshift/elements/caseless.dm
@@ -34,4 +34,8 @@
 		var/obj/item/gun/shot_from = fired_from
 		if(shot_from.chambered == shell)
 			shot_from.chambered = null //Nuke it. Nuke it now.
+		if(istype(shot_from, /obj/item/gun/ballistic/revolver/sol))
+			var/obj/item/ammo_box/magazine/internal/cylinder/c35sol/cylinder1 = shot_from.contents[2]
+			cylinder1.stored_ammo[1] = null
+			return
 	QDEL_NULL(shell)
diff --git a/monkestation/code/modules/blueshift/items/ammo.dm b/monkestation/code/modules/blueshift/items/ammo.dm
@@ -266,28 +266,24 @@
 
 // .35 Sol Short
 // Pistol caliber caseless round used almost exclusively by SolFed weapons
+//CASELESS VAR IS ADDED SO THAT REVOLVER CHAMBERS KNOW WHAT TO DO WITH IT
 
 /obj/item/ammo_casing/c35sol
 	name = ".35 Sol Short lethal bullet casing"
 	desc = "A SolFed standard caseless lethal pistol round."
-
 	icon = 'monkestation/code/modules/blueshift/icons/obj/company_and_or_faction_based/carwo_defense_systems/ammo.dmi'
 	icon_state = "35sol"
-
 	caliber = CALIBER_SOL35SHORT
 	projectile_type = /obj/projectile/bullet/c35sol
 
-
 /obj/item/ammo_casing/c35sol/Initialize(mapload)
 	. = ..()
-
 	AddElement(/datum/element/caseless)
 
 
 /obj/projectile/bullet/c35sol
 	name = ".35 Sol Short bullet"
 	damage = 15
-
 	wound_bonus = -5 // Normal bullets are 20
 	bare_wound_bonus = 5
 	embed_falloff_tile = -4
@@ -296,14 +292,10 @@
 /obj/item/ammo_box/c35sol
 	name = "ammo box (.35 Sol Short lethal)"
 	desc = "A box of .35 Sol Short pistol rounds, holds twenty-four rounds."
-
 	icon = 'monkestation/code/modules/blueshift/icons/obj/company_and_or_faction_based/carwo_defense_systems/ammo.dmi'
 	icon_state = "35box"
-
 	multiple_sprites = AMMO_BOX_FULL_EMPTY
-
 	w_class = WEIGHT_CLASS_NORMAL
-
 	caliber = CALIBER_SOL35SHORT
 	ammo_type = /obj/item/ammo_casing/c35sol
 	max_ammo = 24
@@ -314,9 +306,7 @@
 /obj/item/ammo_casing/c35sol/incapacitator
 	name = ".35 Sol Short incapacitator bullet casing"
 	desc = "A SolFed standard caseless less-lethal pistol round. Exhausts targets on hit, has a tendency to bounce off walls at shallow angles."
-
 	icon_state = "35sol_disabler"
-
 	projectile_type = /obj/projectile/bullet/c35sol/incapacitator
 	harmful = FALSE
 
@@ -325,10 +315,8 @@
 	name = ".35 Sol Short incapacitator bullet"
 	damage = 5
 	stamina = 30
-
 	wound_bonus = -40
 	bare_wound_bonus = -20
-
 	weak_against_armour = TRUE
 
 	// The stats of the ricochet are a nerfed version of detective revolver rubber ammo
@@ -339,7 +327,6 @@
 	ricochet_incidence_leeway = 50
 	ricochet_chance = 130
 	ricochet_decay_damage = 0.8
-
 	shrapnel_type = null
 	sharpness = NONE
 	embedding = null
@@ -348,9 +335,7 @@
 /obj/item/ammo_box/c35sol/incapacitator
 	name = "ammo box (.35 Sol Short incapacitator)"
 	desc = "A box of .35 Sol Short pistol rounds, holds twenty-four rounds. The blue stripe indicates this should hold less-lethal ammunition."
-
 	icon_state = "35box_disabler"
-
 	ammo_type = /obj/item/ammo_casing/c35sol/incapacitator
 
 
@@ -359,25 +344,19 @@
 /obj/item/ammo_casing/c35sol/ripper
 	name = ".35 Sol Short ripper bullet casing"
 	desc = "A SolFed standard caseless ripper pistol round. Causes slashing wounds on targets, but is weak to armor."
-
 	icon_state = "35sol_shrapnel"
 	projectile_type = /obj/projectile/bullet/c35sol/ripper
-
 	custom_materials = AMMO_MATS_RIPPER
 	advanced_print_req = TRUE
 
 
 /obj/projectile/bullet/c35sol/ripper
 	name = ".35 Sol ripper bullet"
 	damage = 12
-
 	weak_against_armour = TRUE
-
 	sharpness = SHARP_EDGED
-
 	wound_bonus = 20
 	bare_wound_bonus = 20
-
 	embedding = list(
 		embed_chance = 75,
 		fall_chance = 3,
@@ -395,9 +374,7 @@
 /obj/item/ammo_box/c35sol/ripper
 	name = "ammo box (.35 Sol Short ripper)"
 	desc = "A box of .35 Sol Short pistol rounds, holds twenty-four rounds. The purple stripe indicates this should hold hollowpoint-like ammunition."
-
 	icon_state = "35box_shrapnel"
-
 	ammo_type = /obj/item/ammo_casing/c35sol/ripper
 
 // .40 Sol Long
@@ -406,24 +383,20 @@
 /obj/item/ammo_casing/c40sol
 	name = ".40 Sol Long lethal bullet casing"
 	desc = "A SolFed standard caseless lethal rifle round."
-
 	icon = 'monkestation/code/modules/blueshift/icons/obj/company_and_or_faction_based/carwo_defense_systems/ammo.dmi'
 	icon_state = "40sol"
-
 	caliber = CALIBER_SOL40LONG
 	projectile_type = /obj/projectile/bullet/c40sol
 
 
 /obj/item/ammo_casing/c40sol/Initialize(mapload)
 	. = ..()
-
 	AddElement(/datum/element/caseless)
 
 
 /obj/projectile/bullet/c40sol
 	name = ".40 Sol Long bullet"
 	damage = 20
-
 	wound_bonus = 10
 	bare_wound_bonus = 20
 

diff --git a/monkestation/code/modules/blueshift/items/company_guns.dm b/monkestation/code/modules/blueshift/items/company_guns.dm
@@ -462,16 +462,11 @@
 /obj/item/gun/ballistic/revolver/sol
 	name = "\improper Eland Revolver"
 	desc = "A small revolver with a comically short barrel and cylinder space for eight .35 Sol Short rounds."
-
 	icon = 'monkestation/code/modules/blueshift/icons/obj/company_and_or_faction_based/trappiste_fabriek/guns32x.dmi'
 	icon_state = "eland"
-
 	accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/c35sol
-
 	suppressor_x_offset = 3
-
 	w_class = WEIGHT_CLASS_SMALL
-
 	can_suppress = TRUE
 
 /obj/item/gun/ballistic/revolver/sol/give_manufacturer_examine()
@@ -504,19 +499,13 @@
 /obj/item/gun/ballistic/revolver/takbok
 	name = "\improper Takbok Revolver"
 	desc = "A hefty revolver with an equally large cylinder capable of holding five .585 Trappiste rounds."
-
 	icon = 'monkestation/code/modules/blueshift/icons/obj/company_and_or_faction_based/trappiste_fabriek/guns32x.dmi'
 	icon_state = "takbok"
-
 	fire_sound = 'monkestation/code/modules/blueshift/sounds/revolver_heavy.ogg'
 	suppressed_sound = 'monkestation/code/modules/blueshift/sounds/suppressed_heavy.ogg'
-
 	accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/c585trappiste
-
 	suppressor_x_offset = 5
-
 	can_suppress = TRUE
-
 	fire_delay = 1 SECONDS
 	recoil = 3
 	wield_recoil = 1