Laser namechange and some buffs (#18951)

* Laser naming

* More laser changes
This commit is contained in:
Errant
2023-08-13 07:18:49 +00:00
committed by GitHub
parent ca9b6327ed
commit 7527036cf1
5 changed files with 16 additions and 20 deletions

View File

@@ -8,7 +8,7 @@ ent-CrateTrackingImplants = Tracking implants
.desc = Contains a handful of tracking implanters. Good for prisoners you'd like to release but still keep track of. .desc = Contains a handful of tracking implanters. Good for prisoners you'd like to release but still keep track of.
ent-CrateArmoryLaser = lasers crate ent-CrateArmoryLaser = lasers crate
.desc = Contains three lethal, high-energy laser guns. Requires Armory access to open. .desc = Contains three standard-issue laser rifles. Requires Armory access to open.
ent-CrateArmoryPistols = pistols crate ent-CrateArmoryPistols = pistols crate
.desc = Contains two standard NT pistols with four mags. Requires Armory access to open. .desc = Contains two standard NT pistols with four mags. Requires Armory access to open.

View File

@@ -35,7 +35,7 @@
components: components:
- type: StorageFill - type: StorageFill
contents: contents:
- id: WeaponLaserGun - id: WeaponLaserCarbine
amount: 3 amount: 3
- type: entity - type: entity

View File

@@ -63,7 +63,7 @@
- "As an Engineer, you can repair windows by using a welding tool on them while not in combat mode." - "As an Engineer, you can repair windows by using a welding tool on them while not in combat mode."
- "As an Engineer, you can electrify grilles by placing powered cables beneath them." - "As an Engineer, you can electrify grilles by placing powered cables beneath them."
- "As an Engineer, you can use plasma glass to reinforce an area and prevent radiation. Uranium glass can also be used to prevent radiation." - "As an Engineer, you can use plasma glass to reinforce an area and prevent radiation. Uranium glass can also be used to prevent radiation."
- "As the Captain, you are one of the highest priority targets on the station. Everything from revolutions, to nuclear operatives, to traitors that need to rob you of your unique laser gun or your life are things to worry about." - "As the Captain, you are one of the highest priority targets on the station. Everything from revolutions, to nuclear operatives, to traitors that need to rob you of your unique laser pistol or your life are things to worry about."
- "As the Captain, always take the nuclear disk and pinpointer with you every shift. It's a good idea to give one of these to another head you can trust with keeping it safe." - "As the Captain, always take the nuclear disk and pinpointer with you every shift. It's a good idea to give one of these to another head you can trust with keeping it safe."
- "As the Captain, you have absolute access and control over the station, but this does not mean that being a horrible person won't result in mutiny." - "As the Captain, you have absolute access and control over the station, but this does not mean that being a horrible person won't result in mutiny."
- "As the Captain, try to be active and patrol the station. Staying in the bridge might be tempting, but you'll just end up putting a bigger target on your back!" - "As the Captain, try to be active and patrol the station. Staying in the bridge might be tempting, but you'll just end up putting a bigger target on your back!"

View File

@@ -45,7 +45,7 @@
- Belt - Belt
- type: entity - type: entity
name: retro laser gun name: retro laser blaster
parent: BaseWeaponBatterySmall parent: BaseWeaponBatterySmall
id: WeaponLaserGun id: WeaponLaserGun
description: A weapon using light amplified by the stimulated emission of radiation. description: A weapon using light amplified by the stimulated emission of radiation.
@@ -59,7 +59,7 @@
map: ["enum.GunVisualLayers.MagUnshaded"] map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded shader: unshaded
- type: HitscanBatteryAmmoProvider - type: HitscanBatteryAmmoProvider
proto: RedLaser proto: RedMediumLaser
fireCost: 62.5 fireCost: 62.5
- type: MagazineVisuals - type: MagazineVisuals
magState: mag magState: mag
@@ -68,7 +68,7 @@
- type: Appearance - type: Appearance
- type: entity - type: entity
name: makeshift laser gun name: makeshift laser pistol
parent: BaseWeaponBatterySmall parent: BaseWeaponBatterySmall
id: WeaponMakeshiftLaser id: WeaponMakeshiftLaser
description: Better pray it won't burn your hands off. description: Better pray it won't burn your hands off.
@@ -91,7 +91,7 @@
startingCharge: 500 startingCharge: 500
- type: entity - type: entity
name: laser gun name: laser rifle
parent: BaseWeaponBattery parent: BaseWeaponBattery
id: WeaponLaserCarbine id: WeaponLaserCarbine
description: Favoured by Nanotrasen Security for being cheap and easy to use. description: Favoured by Nanotrasen Security for being cheap and easy to use.
@@ -115,10 +115,10 @@
fireCost: 62.5 fireCost: 62.5
- type: entity - type: entity
name: practice laser gun name: practice laser rifle
parent: WeaponLaserCarbine parent: WeaponLaserCarbine
id: WeaponLaserCarbinePractice id: WeaponLaserCarbinePractice
description: A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice. description: This modified laser rifle fires harmless beams in the 40-watt range, for target practice.
components: components:
- type: HitscanBatteryAmmoProvider - type: HitscanBatteryAmmoProvider
proto: RedLaserPractice proto: RedLaserPractice
@@ -357,13 +357,11 @@
- type: Appearance - type: Appearance
- type: entity - type: entity
name: antique laser gun name: antique laser pistol
parent: BaseWeaponBatterySmall parent: BaseWeaponBatterySmall
id: WeaponAntiqueLaser id: WeaponAntiqueLaser
description: This is an antique laser gun. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. description: This is an antique laser pistol. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy.
components: components:
- type: Item
size: 30
- type: Sprite - type: Sprite
sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi
layers: layers:
@@ -395,13 +393,13 @@
price: 750 price: 750
- type: entity - type: entity
name: advanced laser gun name: advanced laser pistol
parent: BaseWeaponBatterySmall parent: BaseWeaponBatterySmall
id: WeaponAdvancedLaser id: WeaponAdvancedLaser
description: An experimental laser gun with a self charging nuclear powered battery. description: An experimental high-energy laser pistol with a self-charging nuclear battery.
components: components:
- type: Item - type: Item
size: 30 size: 30 # Intentionally larger than other pistols
- type: Sprite - type: Sprite
sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi
layers: layers:
@@ -436,8 +434,6 @@
id: WeaponBehonkerLaser id: WeaponBehonkerLaser
description: The eye of a behonker, it fires a laser when squeezed. description: The eye of a behonker, it fires a laser when squeezed.
components: components:
- type: Item
size: 30
- type: Sprite - type: Sprite
sprite: Objects/Weapons/Guns/Battery/behonker_eye.rsi sprite: Objects/Weapons/Guns/Battery/behonker_eye.rsi
layers: layers:

View File

@@ -44,9 +44,9 @@
<Box> <Box>
<GuideEntityEmbed Entity="CaptainIDCard" Caption="Captain's ID Card"/> <GuideEntityEmbed Entity="CaptainIDCard" Caption="Captain's ID Card"/>
</Box> </Box>
- Steal the Captain's [color=#a4885c]Antique Laser Gun[/color]. - Steal the Captain's [color=#a4885c]Antique Laser Pistol[/color].
<Box> <Box>
<GuideEntityEmbed Entity="WeaponAntiqueLaser" Caption="Captain's Antique Laser Gun"/> <GuideEntityEmbed Entity="WeaponAntiqueLaser" Caption="Captain's Antique Laser Pistol"/>
</Box> </Box>
- Steal the Captain's [color=#a4885c]Jetpack[/color]. - Steal the Captain's [color=#a4885c]Jetpack[/color].
<Box> <Box>