Laser Misc Changes (#3879)

## About The Pull Request Makes ordinary lasers / eguns normal sized instead of bulky, and lets you add both them and weapon cells to holsters. Also fixes a singular weapon sprite on Singulo Lab. Fixes #3790 ## Why It's Good For The Game They look like they're handguns and they should fit in holsters too ## Changelog :cl: balance: Lasers / Eguns are now normal-sized add: Lasers / Eguns now fit in holsters fix: Sprite issue on Singulo Lab lasercannons /:cl: --------- Co-authored-by: github-actions <[email protected]>
shiptest-ss13 · Dec 12, 2024 · a97bc3e · a97bc3e
1 parent 561a0cb
commit a97bc3e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
@@ -9118,7 +9118,7 @@
 /obj/effect/gibspawner,
 /obj/item/gun/energy/lasercannon{
 	desc = "An advanced laser cannon, a laser etched inscription in the handle states 'NT-LS-1013'. The casing is made of a lightweight alloy.";
-	icon_state = "pulse";
+	icon_state = "lasercannon";
 	name = "NT-LS-1013"
 	},
 /turf/open/floor/plating/asteroid,
@@ -10922,7 +10922,7 @@
 /obj/machinery/light/directional/north,
 /obj/item/gun/energy/lasercannon{
 	desc = "An advanced laser cannon, a laser etched inscription in the handle states 'NT-LS-1013'. The casing is made of a lightweight alloy.";
-	icon_state = "pulse";
+	icon_state = "lasercannon";
 	name = "NT-LS-1013"
 	},
 /obj/item/gun/energy/laser/iot,

diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
@@ -107,9 +107,12 @@
 	can_hold = typecacheof(list(
 		/obj/item/gun/ballistic/automatic/pistol,
 		/obj/item/gun/ballistic/revolver,
-		/obj/item/ammo_box))
+		/obj/item/gun/energy/laser,
+		/obj/item/gun/energy/e_gun,
+		/obj/item/stock_parts/cell/gun,
+		/obj/item/ammo_box)) // this doesnt let you put hades into holsters trust me
 	can_hold_max_of_items = typecacheof(list(
-		/obj/item/gun/ballistic = 1
+		/obj/item/gun = 1,
 	))
 
 /datum/component/storage/concrete/pockets/holster/real_location()

diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -13,7 +13,7 @@
 	dual_wield_spread = 60
 	wield_slowdown = LASER_RIFLE_SLOWDOWN
 	manufacturer = MANUFACTURER_SHARPLITE_NEW
-	w_class = WEIGHT_CLASS_BULKY
+	w_class = WEIGHT_CLASS_NORMAL
 
 /obj/item/gun/energy/e_gun/empty_cell
 	spawn_no_ammo = TRUE
@@ -50,6 +50,7 @@
 	default_ammo_type = /obj/item/stock_parts/cell/gun/upgraded
 
 	weapon_weight = WEAPON_MEDIUM
+	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = ITEM_SLOT_BACK
 
 	gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
@@ -241,6 +242,7 @@
 	item_state = "shotgun_combat"
 	shaded_charge = TRUE
 	ammo_type = list(/obj/item/ammo_casing/energy/disabler/scatter/ultima, /obj/item/ammo_casing/energy/laser/ultima)
+	w_class = WEIGHT_CLASS_BULKY
 	var/obj/item/modular_computer/integratedNTOS
 	var/NTOS_type = /obj/item/modular_computer/internal
 

diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
@@ -2,7 +2,7 @@
 	name = "SL L-204 laser gun"
 	desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal."
 
-	w_class = WEIGHT_CLASS_BULKY
+	w_class = WEIGHT_CLASS_NORMAL
 	custom_materials = list(/datum/material/iron=2000)
 	ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
 	ammo_x_offset = 1
@@ -129,6 +129,7 @@
 	item_state = null
 	ammo_type = list(/obj/item/ammo_casing/energy/xray)
 	ammo_x_offset = 3
+	w_class = WEIGHT_CLASS_BULKY
 
 ////////Laser Tag////////////////////
 
@@ -171,6 +172,7 @@
 	icon_state = "iotshotgun"
 	item_state = "shotgun_combat"
 	ammo_type = list(/obj/item/ammo_casing/energy/disabler/scatter/ultima)
+	w_class = WEIGHT_CLASS_BULKY
 	var/obj/item/modular_computer/integratedNTOS
 	var/NTOS_type = /obj/item/modular_computer/internal
 	manufacturer = MANUFACTURER_SHARPLITE_NEW
@@ -202,7 +204,6 @@
 	item_state = "gun"
 	ammo_x_offset = 2
 	charge_sections = 4
-	w_class = WEIGHT_CLASS_NORMAL
 	default_ammo_type = /obj/item/stock_parts/cell/gun/mini
 	allowed_ammo_types = list(
 		/obj/item/stock_parts/cell/gun/mini,
@@ -253,6 +254,7 @@
 	)
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/eoehoma/e50)
 	weapon_weight = WEAPON_HEAVY
+	w_class = WEIGHT_CLASS_BULKY
 	manufacturer = MANUFACTURER_EOEHOMA
 
 	wield_delay = 0.7 SECONDS