cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 14:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Weapons changes

Browse Source
This commit is contained in:
SplinterGP
2020-07-20 22:12:01 -03:00
parent f967ecc1d9
commit 7a2de0520d
7 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/projectiles/ammunition/rounds_yw.dm
View File

@@ -25,4 +25,7 @@
desc = "A 7.92x57mm Mauser casing."
icon_state = "rifle-casing"
caliber = "mauser"
projectile_type = /obj/item/projectile/bullet/rifle/a762
projectile_type = /obj/item/projectile/bullet/rifle/a762/lmg
/obj/item/projectile/bullet/rifle/a762/lmg
icon_state = "bullet_alt"

2
code/modules/projectiles/guns/projectile/automatic_yw.dm
View File

@@ -14,7 +14,7 @@
max_shells = 75
caliber = "mauser"
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 2)
ammo_type = "/obj/item/ammo_casing/a792x57m" // Is this really needed anymore?
ammo_type = "/obj/item/ammo_casing/a792x57m/lmg" // Is this really needed anymore?
fire_sound = 'sound/weapons/mg42.ogg'
load_method = MAGAZINE
magazine_type = /obj/item/ammo_magazine/mg42

14
code/modules/projectiles/guns/projectile/shotgun_yw.dm
View File

@@ -31,7 +31,7 @@
icon_state = "c12g"
mag_type = MAGAZINE
caliber = "12g"
matter = list(DEFAULT_WALL_MATERIAL = 13000) //did the math. now fixed the exploityness of this thing. Have fun!
matter = list(DEFAULT_WALL_MATERIAL = 1300) //did the math. now fixed the exploityness of this thing. Have fun!
ammo_type = /obj/item/ammo_casing/a12g
max_ammo = 4
multiple_sprites = 1
@@ -54,28 +54,30 @@
//scattering shots, old buckshot
/obj/item/ammo_casing/a12g/scatter
name = "scatter shell"
name = "scatter shotgun shell"
desc = "A 12 gauge scattering shell"
icon = 'icons/obj/ammo_yw.dmi'
icon_state = "scattershell"
projectile_type = /obj/item/projectile/scatter/shotgun
/obj/item/projectile/scatter/shotgun
name = "Shotgun scatter projectile"
name = "shotgun scatter projectile"
spread_submunition_damage = FALSE
submunition_spread_max = 60
submunition_spread_min = 50
submunition_spread_max = 100
submunition_spread_min = 90
submunitions = list(
/obj/item/projectile/bullet/shotgun/scatterprojectile = 6
)
/obj/item/projectile/bullet/shotgun/scatterprojectile
name = "pellet"
icon_state = "bullet"
fire_sound = 'sound/weapons/Gunshot_shotgun.ogg'
damage = 13
/obj/item/weapon/storage/box/scattershot
name = "box of shotgun scatter shells"
desc = "It has a picture of a gun and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
desc = "It has a picture of a shell and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death. High spread factor, just shoot and pray."
icon = 'icons/obj/ammo_yw.dmi'
icon_state = "scattershot_box"
item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")

2
code/modules/projectiles/projectile/bullets.dm
View File

@@ -1,5 +1,6 @@
/obj/item/projectile/bullet
name = "bullet"
icon = 'icons/obj/projectiles_yw.dmi' //YWEdit, uses our bullet sprites
icon_state = "bullet"
fire_sound = 'sound/weapons/Gunshot4.ogg'
damage = 60
@@ -115,6 +116,7 @@
/obj/item/projectile/bullet/shotgun
name = "slug"
icon_state = "bullet_chonk" //Ywedit
fire_sound = 'sound/weapons/Gunshot_shotgun.ogg'
damage = 50
armor_penetration = 15

1
code/modules/projectiles/projectile/magnetic.dm
View File

@@ -1,6 +1,7 @@
// Rod for railguns. Slightly less nasty than the sniper round.
/obj/item/projectile/bullet/magnetic
name = "rod"
icon = 'icons/obj/projectiles.dmi' //Ywedit, uses default icon path not _yw
icon_state = "rod"
fire_sound = 'sound/weapons/railgun.ogg'
damage = 65