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

Fix #1544 and cloning attempt (#1545)

Browse Source 
Fix #1544
May fix some cloning related issues.
Fix the ert snowflake pistol not fitting inside holsters
Added a warning to the victim of spider egg erp injection
This commit is contained in:
Alberyk
2017-01-13 19:38:17 -02:00
committed by skull132
parent 89269ff76b
commit fef884c865
4 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@
allowed_magazines = list(/obj/item/ammo_magazine/c762)
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=10, move_delay=null, burst_accuracy=-2, dispersion=null),
list(mode_name="semiauto", burst=1, fire_delay=10, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-1,-1), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="short bursts", burst=5, fire_delay=null, move_delay=4, burst_accuracy=list(0,-1,-1,-2,-2), dispersion=list(0.6, 1.0, 1.0, 1.0, 1.2))
)
@@ -396,7 +396,7 @@
accuracy_wielded = 0
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay= 10, move_delay=null, burst_accuracy=-2, dispersion=null),
list(mode_name="semiauto", burst=1, fire_delay= 10, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-1,-1), dispersion=list(0.0, 0.6, 1.0))
)

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

@@ -60,7 +60,6 @@
load_method = MAGAZINE
max_shells = 16
caliber = ".45"
slot_flags = slot_belt
origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2)
ammo_type = /obj/item/ammo_casing/c45
magazine_type = /obj/item/ammo_magazine/c45x