Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

most laser and energy weapons are bigger, lethal lasers are cheaper #54041

Merged
merged 9 commits into from
Oct 6, 2020
Merged

most laser and energy weapons are bigger, lethal lasers are cheaper #54041

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8926fe0
obviously more than this must be done
tralezab Sep 28, 2020
683baa5
mapped in
tralezab Sep 28, 2020
76abd17
restores old gun sprites
tralezab Sep 28, 2020
2ba9be8
lowers energy cost of lasergun
tralezab Sep 28, 2020
40bfb80
Revert "mapped in"
tralezab Sep 29, 2020
0ac4986
a LOT of guns are bulky now
tralezab Sep 29, 2020
b285229
that should work?
tralezab Oct 5, 2020
f035c47
whoop
tralezab Oct 5, 2020
6b011a0
whoops x2
tralezab Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/RandomZLevels/caves.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1549,7 +1549,7 @@
/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,
/obj/item/gun/energy/laser/rifle,
/obj/item/grenade/syndieminibomb/concussion,
/obj/item/grenade/syndieminibomb/concussion,
/obj/item/grenade/syndieminibomb/concussion,
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomZLevels/spacebattle.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1702,7 +1702,7 @@
/area/awaymission/spacebattle/cruiser)
"gC" = (
/obj/structure/closet/crate/secure/weapon,
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser/rifle,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"gD" = (
Expand Down Expand Up @@ -2137,8 +2137,8 @@
/obj/structure/window/reinforced{
dir = 1
},
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser/rifle,
/obj/item/gun/energy/laser/rifle,
/turf/open/floor/engine,
/area/awaymission/spacebattle/cruiser)
"ii" = (
Expand Down Expand Up @@ -2391,7 +2391,7 @@
"ju" = (
/obj/structure/rack,
/obj/structure/window/reinforced,
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser/rifle,
/turf/open/floor/engine,
/area/awaymission/spacebattle/cruiser)
"jv" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51122,12 +51122,12 @@
/area/ai_monitored/security/armory)
"bTj" = (
/obj/structure/rack,
/obj/item/gun/energy/laser{
/obj/item/gun/energy/laser/rifle{
pixel_x = -3;
pixel_y = 3
},
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser{
/obj/item/gun/energy/laser/rifle,
/obj/item/gun/energy/laser/rifle{
pixel_x = 3;
pixel_y = -3
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44195,12 +44195,12 @@
/area/engine/engineering)
"coS" = (
/obj/structure/rack,
/obj/item/gun/energy/laser{
/obj/item/gun/energy/laser/rifle{
pixel_x = -3;
pixel_y = 3
},
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser{
/obj/item/gun/energy/laser/rifle,
/obj/item/gun/energy/laser/rifle{
pixel_x = 3;
pixel_y = -3
},
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files/MetaStation/MetaStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4917,12 +4917,12 @@
/area/ai_monitored/security/armory)
"akF" = (
/obj/structure/rack,
/obj/item/gun/energy/laser{
/obj/item/gun/energy/laser/rifle{
pixel_x = -3;
pixel_y = 3
},
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser{
/obj/item/gun/energy/laser/rifle,
/obj/item/gun/energy/laser/rifle{
pixel_x = 3;
pixel_y = -3
},
Expand Down Expand Up @@ -11367,7 +11367,7 @@
"azE" = (
/obj/structure/disposalpipe/segment,
/obj/structure/closet/secure_closet/warden,
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser/rifle,
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/PubbyStation/PubbyStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3742,12 +3742,12 @@
/area/ai_monitored/security/armory)
"ajT" = (
/obj/structure/rack,
/obj/item/gun/energy/laser{
/obj/item/gun/energy/laser/rifle{
pixel_x = -3;
pixel_y = 3
},
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser{
/obj/item/gun/energy/laser/rifle,
/obj/item/gun/energy/laser/rifle{
pixel_x = 3;
pixel_y = -3
},
Expand Down
10 changes: 5 additions & 5 deletions _maps/map_files/generic/CentCom.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
/area/holodeck/rec_center/winterwonderland)
"aH" = (
/obj/structure/table,
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser/rifle,
/turf/open/floor/holofloor/asteroid,
/area/holodeck/rec_center/bunker)
"aI" = (
Expand Down Expand Up @@ -2039,7 +2039,7 @@
/obj/item/clothing/shoes/sneakers/brown,
/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/head/helmet/swat,
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser/rifle,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
Expand All @@ -2051,7 +2051,7 @@
/obj/item/clothing/shoes/sneakers/brown,
/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/head/helmet/swat,
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser/rifle,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
Expand Down Expand Up @@ -16135,7 +16135,7 @@
/obj/item/clothing/shoes/sneakers/brown,
/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/head/helmet/swat,
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser/rifle,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
Expand All @@ -16150,7 +16150,7 @@
/obj/item/clothing/shoes/sneakers/brown,
/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/head/helmet/swat,
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser/rifle,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
Expand Down
8 changes: 4 additions & 4 deletions _maps/shuttles/pirate_default.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,11 +534,11 @@
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/item/gun/energy/laser{
/obj/item/gun/energy/laser/rifle{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do pirates have cheap mass-produced Nanotrasen knock offs rather than the real ones? This goes for the Thunderdome and ruins ones as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i mean, they had it before, I didn't change nothing here. rifle is just the subtype for bulky lasers

pixel_x = -3;
pixel_y = 6
},
/obj/item/gun/energy/laser{
/obj/item/gun/energy/laser/rifle{
pixel_y = 3
},
/obj/machinery/recharger,
Expand Down Expand Up @@ -567,11 +567,11 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/item/gun/energy/laser{
/obj/item/gun/energy/laser/rifle{
pixel_x = -3;
pixel_y = 6
},
/obj/item/gun/energy/laser{
/obj/item/gun/energy/laser/rifle{
pixel_y = 3
},
/turf/open/floor/pod/light,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/ruin_pirate_cutter.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
icon_state = "right";
name = "Weapon Storage"
},
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser/rifle,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/structures/crates_lockers/closets/gimmick.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
for(var/i in 1 to 3)
new /obj/item/melee/transforming/energy/sword/saber(src)
for(var/i in 1 to 3)
new /obj/item/gun/energy/laser(src)
new /obj/item/gun/energy/laser/rifle(src)
for(var/i in 1 to 3)
new /obj/item/melee/baton/loaded(src)
for(var/i in 1 to 3)
Expand All @@ -88,7 +88,7 @@
for(var/i in 1 to 3)
new /obj/item/melee/transforming/energy/sword/saber(src)
for(var/i in 1 to 3)
new /obj/item/gun/energy/laser(src)
new /obj/item/gun/energy/laser/rifle(src)
for(var/i in 1 to 3)
new /obj/item/melee/baton/loaded(src)
for(var/i in 1 to 3)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/crates_lockers/closets/secure/security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
for(var/i in 1 to 3)
new /obj/item/gun/energy/e_gun(src)
for(var/i in 1 to 3)
new /obj/item/gun/energy/laser(src)
new /obj/item/gun/energy/laser/rifle(src)

/obj/structure/closet/secure_closet/tac
name = "armory tac locker"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/exports/weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/datum/export/weapon/laser
cost = 200
unit_name = "laser gun"
export_types = list(/obj/item/gun/energy/laser)
export_types = list(/obj/item/gun/energy/laser/rifle)

/datum/export/weapon/disabler
cost = 100
Expand Down
6 changes: 3 additions & 3 deletions code/modules/cargo/packs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,9 +315,9 @@
name = "Lasers Crate"
desc = "Contains three lethal, high-energy laser guns. Requires Security access to open."
cost = 2000
contains = list(/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser)
contains = list(/obj/item/gun/energy/laser/rifle,
/obj/item/gun/energy/laser/rifle,
/obj/item/gun/energy/laser/rifle)
crate_name = "laser crate"


Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/ammunition/energy/laser.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

/obj/item/ammo_casing/energy/lasergun
projectile_type = /obj/projectile/beam/laser
e_cost = 83
e_cost = 71
tralezab marked this conversation as resolved.
Show resolved Hide resolved
select_name = "kill"

/obj/item/ammo_casing/energy/lasergun/old
Expand Down
4 changes: 4 additions & 0 deletions code/modules/projectiles/guns/energy/energy_gun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
flight_y_offset = 10
dual_wield_spread = 60

/obj/item/gun/energy/e_gun/rifle
desc = "A bulky hybrid energy gun with two settings: disable and kill."
w_class = WEIGHT_CLASS_BULKY //no two hand required because lasers don't have knockback

/obj/item/gun/energy/e_gun/mini
name = "miniature energy gun"
desc = "A small, pistol-sized energy gun with a built-in flashlight. It has two settings: disable and kill."
Expand Down
4 changes: 4 additions & 0 deletions code/modules/projectiles/guns/energy/laser.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
ammo_x_offset = 1
shaded_charge = 1

/obj/item/gun/energy/laser/rifle
desc = "An older model laser gun that fires concentrated beams of light which pass through glass and thin metal. There are many better options, but Nanotrasen enjoys the cheap production cost."
w_class = WEIGHT_CLASS_BULKY

/obj/item/gun/energy/laser/practice
name = "practice laser gun"
desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/spells/spell_types/rightandwrong.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ GLOBAL_LIST_INIT(summoned_guns, list(
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/e_gun,
/obj/item/gun/energy/e_gun/advtaser,
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser/rifle,
/obj/item/gun/ballistic/revolver,
/obj/item/gun/ballistic/revolver/detective,
/obj/item/gun/ballistic/automatic/pistol/deagle/camo,
Expand Down