cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 05:51:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds a Ballistic Carbine (#11695)

Browse Source
This commit is contained in:
WickedCybs
2021-04-22 12:01:46 +02:00
committed by GitHub
parent 9afa3b707b
commit 679d81440b
10 changed files with 67 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/boxes.dm
+20
View File
@@ -207,6 +207,26 @@
origin_tech = list(TECH_COMBAT = 3)
ammo_type = /obj/item/ammo_casing/a556/ap
/obj/item/ammo_magazine/a556/carbine
name = "carbine magazine (5.56mm)"
icon_state = "5.56c"
desc = "A 5.56 ammo magazine fit for a carbine, not an assault rifle."
matter = list(DEFAULT_WALL_MATERIAL = 1250)
max_ammo = 15
/obj/item/ammo_magazine/a556/carbine/empty
max_ammo = 0
/obj/item/ammo_magazine/a556/carbine/practice
name = "carbine magazine (5.56mm practice)"
ammo_type = /obj/item/ammo_casing/a556/practice
/obj/item/ammo_magazine/a556/carbine/ap
name = "carbine magazine (5.56mm AP)"
icon_state = "5.56APc"
origin_tech = list(TECH_COMBAT = 3)
ammo_type = /obj/item/ammo_casing/a556/ap
/obj/item/ammo_magazine/a50
name = "magazine (.50)"
icon_state = "50ae"
code/modules/projectiles/guns/projectile/automatic.dm
+28 -3
View File
@@ -135,7 +135,8 @@
/obj/item/gun/projectile/automatic/rifle/sts35
name = "assault rifle"
desc = "A durable, rugged looking automatic weapon of a make popular on the frontier worlds. Uses 7.62mm rounds. It is unmarked."
desc_fluff = "The STS35 is a durable, reliable and cheap to buy fully automatic assault rifle with many licensed manufacturers across the galaxy. It comes in different versions and calibres, this one uses 7.62 rounds. The manufacturer markings have been filed off."
desc_fluff = "The STS35 is a durable, reliable and cheap to buy fully automatic assault rifle with many licensed manufacturers across \
the galaxy. It comes in different versions and calibres, this one uses 7.62 rounds. The manufacturer markings have been filed off."
can_bayonet = TRUE
knife_x_offset = 23
knife_y_offset = 13
@@ -144,6 +145,30 @@
..()
icon_state = (ammo_magazine)? "arifle" : "arifle-empty"
/obj/item/gun/projectile/automatic/rifle/carbine
name = "ballistic carbine"
desc = "A durable, rugged looking semi-automatic weapon of a make popular on the frontier worlds. Uses 5.56mm rounds and does not accept large \
capacity magazines. It is unmarked."
desc_fluff = "The ST24 is often considered the little brother of its larger and fully automatic counterpart, the STS35. It is a \
reliable and cheap to buy carbine with many licensed manufacturers across the galaxy. It comes in different versions and calibres, \
some even boasting select fire functionality. This one uses 5.56 rounds and is semi-automatic. The manufacturer markings have been filed off."
icon = 'icons/obj/guns/bcarbine.dmi'
icon_state = "bcarbine"
item_state = "bcarbine"
caliber = "a556"
can_bayonet = TRUE
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 1, TECH_ILLEGAL = 3)
magazine_type = /obj/item/ammo_magazine/a556/carbine
allowed_magazines = list(/obj/item/ammo_magazine/a556/carbine)
knife_x_offset = 23
knife_y_offset = 13
firemodes = list(mode_name="semiauto", burst=1, fire_delay=12)
/obj/item/gun/projectile/automatic/rifle/carbine/update_icon()
..()
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."
@@ -181,7 +206,7 @@
slot_flags = SLOT_BACK
load_method = MAGAZINE
magazine_type = /obj/item/ammo_magazine/a556
allowed_magazines = list(/obj/item/ammo_magazine/a556)
allowed_magazines = list(/obj/item/ammo_magazine/a556, /obj/item/ammo_magazine/a556/carbine)
auto_eject = 1
auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
@@ -460,4 +485,4 @@
/obj/item/gun/projectile/automatic/rifle/shotgun/update_icon()
..()
icon_state = (ammo_magazine)? "assaultshotgun" : "assaultshotgun-empty"
icon_state = (ammo_magazine)? "assaultshotgun" : "assaultshotgun-empty"
code/modules/projectiles/projectile/bullets.dm
+1 -1
View File
@@ -210,7 +210,7 @@
damage = 40
armor_penetration = 15
/obj/item/projectile/bullet/rifle/a556/ap
/obj/item/projectile/bullet/rifle/a556/ap
damage = 35
armor_penetration = 40