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

Danse's Gun Changes 2: With a vengeance (#9878)

Browse Source 
* joe

* Update bullets.dm

* Update boxes.dm

* Update automatic.dm

* Update minigun.dm

* Create dansemacabre-woodmanstillbad.yml

* Delete dansemacabre-woodmanstillbad.yml

* I'm stupid

* Update highly visible and dangerous weapons.dm

* Update bullets.dm

* Update bullets.dm

* reverts bluestocks

* Delete blaster_cabine.dmi
This commit is contained in:
TheDanseMacabre
2020-09-19 12:12:18 +02:00
committed by GitHub
parent b433b66a8a
commit 43c5919307
8 changed files with 58 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/boxes.dm
+3 -3
View File
@@ -61,7 +61,7 @@
ammo_type = /obj/item/ammo_casing/c45
matter = list(DEFAULT_WALL_MATERIAL = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal
caliber = ".45"
max_ammo = 7
max_ammo = 9
multiple_sprites = 1
/obj/item/ammo_magazine/c45m/empty
@@ -114,7 +114,7 @@
matter = list(DEFAULT_WALL_MATERIAL = 600)
caliber = "9mm"
ammo_type = /obj/item/ammo_casing/c9mm
max_ammo = 10
max_ammo = 12
multiple_sprites = 1
/obj/item/ammo_magazine/mc9mm/empty
@@ -191,7 +191,7 @@
caliber = "a556"
matter = list(DEFAULT_WALL_MATERIAL = 1800)
ammo_type = /obj/item/ammo_casing/a556
max_ammo = 10
max_ammo = 30
multiple_sprites = 1
/obj/item/ammo_magazine/a556/empty
code/modules/projectiles/guns/projectile/automatic.dm
+3 -3
View File
@@ -20,7 +20,7 @@
list(mode_name="semiauto", can_autofire=0, burst=1),
list(mode_name="3-round bursts", can_autofire=0, burst=3, burst_accuracy=list(1,0,0), dispersion=list(0, 10, 15)),
list(mode_name="short bursts", can_autofire=0, burst=5, burst_accuracy=list(1,0,,-1,-1), dispersion=list(5, 10, 15, 20)),
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2))
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25))
)
//Submachine guns and personal defence weapons, go.
@@ -121,7 +121,7 @@
list(mode_name="semiauto", burst=1, fire_delay=10),
list(mode_name="3-round bursts", burst=3, burst_accuracy=list(1,0,0), dispersion=list(0, 5, 10)),
list(mode_name="short bursts", burst=5, burst_accuracy=list(1,0,0,-1,-1), dispersion=list(5, 5, 15)),
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2)),
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25)),
)
//slower to regain aim, more inaccurate if not wielding
@@ -276,7 +276,7 @@
firemodes = list(
list(mode_name="short bursts", burst=5, burst_accuracy = list(1,0,0,-1,-1), dispersion = list(3, 6, 9)),
list(mode_name="long bursts", burst=8, burst_accuracy = list(1,0,0,-1,-1,-1,-2,-2), dispersion = list(8)),
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2))
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25))
)
var/cover_open = 0
code/modules/projectiles/guns/projectile/minigun.dm
+1 -1
View File
@@ -129,7 +129,7 @@
firemodes = list(
list(mode_name="short bursts", can_autofire=0, burst=6, move_delay=8, burst_accuracy = list(0,-1,-1,-2,-2), dispersion = list(3, 6, 9)),
list(mode_name="long bursts", can_autofire=0, burst=12, move_delay=9, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(8)),
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2))
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25))
)
code/modules/projectiles/projectile/bullets.dm
+8 -8
View File
@@ -128,11 +128,11 @@
damage = 25
/obj/item/projectile/bullet/pistol/strong
damage = 60
damage = 30
armor_penetration = 15
/obj/item/projectile/bullet/pistol/revolver
damage = 45
armor_penetration = 15
damage = 30
/obj/item/projectile/bullet/pistol/rubber //"rubber" bullets
name = "rubber bullet"
@@ -181,17 +181,17 @@
/* "Rifle" rounds */
/obj/item/projectile/bullet/rifle
armor_penetration = 20
penetrating = 1
armor_penetration = 20
/obj/item/projectile/bullet/rifle/a762
damage = 25
damage = 35
/obj/item/projectile/bullet/rifle/a556
damage = 30
/obj/item/projectile/bullet/rifle/a556/ap
damage = 25
damage = 30
armor_penetration = 25
/obj/item/projectile/bullet/rifle/a145
@@ -339,7 +339,7 @@
/obj/item/projectile/bullet/gauss
name = "slug"
icon_state = "heavygauss"
damage = 30
damage = 45
muzzle_type = /obj/effect/projectile/muzzle/gauss
embed = 0
@@ -398,4 +398,4 @@
muzzle_type = /obj/effect/projectile/muzzle/bolt
/obj/item/projectile/bullet/shard/heavy
damage = 30
damage = 30