Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions _maps/RandomZLevels/caves.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1401,7 +1401,7 @@
/area/awaymission/caves/BMP_asteroid)
"el" = (
/obj/structure/closet/secure_closet/personal,
/obj/item/gun/energy/laser/captain/scattershot,
/obj/item/gun/energy/laser/scattershot,
/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"em" = (
Expand Down Expand Up @@ -1650,8 +1650,8 @@
"fc" = (
/obj/structure/closet/crate,
/obj/item/paper/fluff/awaymissions/caves/shipment_receipt,
/obj/item/gun/energy/laser/captain/scattershot,
/obj/item/gun/energy/laser/captain/scattershot,
/obj/item/gun/energy/laser/scattershot,
/obj/item/gun/energy/laser/scattershot,
/obj/item/gun/energy/laser,
/obj/item/grenade/syndieminibomb/concussion,
/obj/item/grenade/syndieminibomb/concussion,
Expand Down Expand Up @@ -1726,7 +1726,7 @@
},
/obj/item/paper/fluff/awaymissions/caves/shipment_receipt,
/obj/item/organ/eyes/robotic/thermals,
/obj/item/gun/energy/laser/captain/scattershot,
/obj/item/gun/energy/laser/scattershot,
/obj/item/slimepotion/fireproof,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14"
Expand Down Expand Up @@ -1789,7 +1789,7 @@
},
/area/awaymission/caves/BMP_asteroid/level_two)
"fw" = (
/obj/item/gun/energy/laser/captain/scattershot,
/obj/item/gun/energy/laser/scattershot,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14"
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -18388,7 +18388,7 @@
dir = 8
},
/obj/item/gun/energy/gravity_gun,
/obj/item/gun/energy/laser/captain/scattershot{
/obj/item/gun/energy/laser/scattershot{
pixel_y = 8
},
/obj/item/gun/energy/wormhole_projector{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
. = ..()
for(var/i in 1 to 5)
if(prob(10))
weighted_feature_spawn_list[/obj/item/gun/energy/laser/captain/scattershot ]++
weighted_feature_spawn_list[/obj/item/gun/energy/laser/scattershot ]++
else
weighted_feature_spawn_list[/obj/item/melee/spear/bonespear/chitinspear]++

Expand Down
9 changes: 6 additions & 3 deletions code/modules/projectiles/guns/energy/laser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,19 @@
desc = "The NT-S01 laser gun is NTs first attempt to provide an inbuilt recharger, and is the first in its line as an 'S' or special class weapon given to space station command members. Due to how expensive it is to produce, and that the material used to do so deteriorates quickly, it was decommissioned, and the few models left are used as prizes meant to never see the light of day."
force = 10
ammo_x_offset = 3
selfcharge = 1
selfcharge = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF

/obj/item/gun/energy/laser/captain/scattershot
/obj/item/gun/energy/laser/scattershot
name = "scatter shot laser rifle"
icon_state = "lasercannon"
item_state = LASER
desc = "An industrial-grade heavy-duty laser rifle with a modified laser lens to scatter its shot into multiple smaller lasers. The inner-core can self-charge for theoretically infinite use."
ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser)
ammo_x_offset = 3
force = 10
selfcharge = TRUE
shaded_charge = FALSE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF

/obj/item/gun/energy/laser/cyborg
can_charge = FALSE
Expand Down