cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-21 23:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds a new Solarian SMG and resprites the Sol service pistol (#13555)

Browse Source
This commit is contained in:
BLUNTFORCE420
2022-04-21 04:49:20 -04:00
committed by GitHub
parent d301982273
commit 846139e71d
9 changed files with 66 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/projectiles/guns/projectile/automatic.dm
View File

@@ -70,6 +70,17 @@
icon_state = "c20r"
return
/obj/item/gun/projectile/automatic/c20r/sol
name = "solarian submachine gun"
desc = "Designed by Zavodskoi as a scaled-down version of their M469, the M470-L is a personal defense weapon intended for use by second-line personnel from all branches of the Solarian military, such as support troops and Navy crewmen. Chambered in 10mm."
icon = 'icons/obj/guns/sol_smg.dmi'
icon_state = "vityaz"
item_state = "vityaz"
/obj/item/gun/projectile/automatic/c20r/sol/update_icon()
..()
icon_state = (ammo_magazine)? "vityaz" : "vityaz-empty"
/obj/item/gun/projectile/automatic/wt550
name = "machine pistol"
desc = "The NI 550 Saber is a cheap self-defense weapon, mass-produced by Zavodskoi Interstellar for paramilitary and private use. Uses 9mm rounds."
@@ -157,7 +168,7 @@
to improve handling. The fire control group has been altered as well, sacrificing the burst-fire function in favor of a smoother trigger pull. Born from \
extensive experience fighting in claustrophobic environments aboard ships and stations, weapons like these are common among Coalition Rangers conducting high-risk boarding operations \
along the Frontier, who rely on its ability to rapidly gain fire superiority in the event of an ambush. While no formal name exists for it, \
and two no examples are quite alike, weapons of this type are commonly just referred to as the \"Shorty\"."
and no two examples are quite alike, weapons of this type are commonly just referred to as the \"Shorty\"."
icon = 'icons/obj/guns/shorty.dmi'
icon_state = "shorty"
item_state = "shorty"
@@ -201,9 +212,10 @@
icon_state = (ammo_magazine)? "bcarbine" : "bcarbine-empty"
/obj/item/gun/projectile/automatic/rifle/sol
name = "battle rifle"
desc = "A powerful battle rifle, the M469 is a highly accurate skirmishing firearm of Zavodskoi Instellar make which is chambered in 7.62."
icon = 'icons/obj/guns/battlerifle.dmi'
name = "solarian assault rifle"
desc = "A reliable assault rifle manufactured by Zavodskoi Interstellar, the M469 is the standard service rifle of the Solarian Armed Forces, most commonly associated with its ground forces. \
Though the design is old, it continues to see widespread use in the Alliance and its breakaway states and likely will for years to come. Chambered in 7.62mm."
icon = 'icons/obj/guns/sol_rifle.dmi'
icon_state = "battlerifle"
item_state = "battlerifle"
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 3, TECH_ILLEGAL = 2)

6
code/modules/projectiles/guns/projectile/pistol.dm
View File

@@ -432,9 +432,9 @@
icon_state = "leyon-e"
/obj/item/gun/projectile/pistol/sol
name = "service pistol"
desc = "A very old service pistol. Branded at the grip with the old emblem of the Sol Alliance, hand-made by Zavodskoi Instellar."
icon = 'icons/obj/guns/m8.dmi'
name = "solarian service pistol"
desc = "Manufactured by Zavodskoi Interstellar and based off of a full-sized variant of their 9mm design, the compact M8 is the standard service pistol of the Solarian Armed Forces. Chambered in 9mm."
icon = 'icons/obj/guns/sol_pistol.dmi'
icon_state = "m8"
item_state = "m8"
can_silence = FALSE

6
code/modules/projectiles/guns/projectile/shotgun.dm
View File

@@ -110,9 +110,9 @@
fire_sound = 'sound/weapons/gunshot/gunshot_shotgun.ogg'
/obj/item/gun/projectile/shotgun/pump/combat/sol
name = "naval shotgun"
desc = "A Malella-type 12-gauge breaching shotgun commonly found in the hands of the Sol Alliance. Made by Zavodskoi Interstellar."
icon = 'icons/obj/guns/malella.dmi'
name = "solarian combat shotgun"
desc = "A compact combat shotgun manufactured by Zavodskoi Interstellar for the Solarian Armed Forces, the M63 is most frequently employed by assaulters fighting in close-quarters environments, though it is also uncommonly used as a defensive weapon by Navy crewmen. Chambered in 12 gauge."
icon = 'icons/obj/guns/sol_shotgun.dmi'
icon_state = "malella"
item_state = "malella"
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 3, TECH_ILLEGAL = 2)