cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-22 20:56:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into projectile_hit_sounds

Browse Source
This commit is contained in:
Neerti
2020-03-16 08:28:18 -04:00
committed by GitHub
parent f92324e4ad c7c714995e
commit 7bf00d0c5d
243 changed files with 998 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition.dm
+1
View File
@@ -8,6 +8,7 @@
throwforce = 1
w_class = ITEMSIZE_TINY
preserve_item = 1
drop_sound = 'sound/items/drop/ring.ogg'
var/leaves_residue = 1
var/caliber = "" //Which kind of guns it can be loaded into
code/modules/projectiles/gun.dm
+1
View File
@@ -49,6 +49,7 @@
origin_tech = list(TECH_COMBAT = 1)
attack_verb = list("struck", "hit", "bashed")
zoomdevicename = "scope"
drop_sound = 'sound/items/drop/gun.ogg'
var/automatic = 0
var/burst = 1
code/modules/projectiles/guns/magnetic/magnetic_railgun.dm
+3 -3
View File
@@ -150,7 +150,7 @@
w_class = ITEMSIZE_NORMAL
slowdown_held = 0
slowdown_held = 0.1
initial_cell_type = /obj/item/weapon/cell/device/weapon
initial_capacitor_type = /obj/item/weapon/stock_parts/capacitor
@@ -159,7 +159,7 @@
firemodes = list(
list(mode_name="lethal", power_cost = 500, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=10, move_delay=null, one_handed_penalty=0),
list(mode_name="stun", power_cost = 350, projectile_type = /obj/item/projectile/energy/electrode/stunshot, burst=1, fire_delay=7, move_delay=null, one_handed_penalty=0),
list(mode_name="stun", power_cost = 350, projectile_type = /obj/item/projectile/energy/electrode/strong, burst=1, fire_delay=7, move_delay=null, one_handed_penalty=0),
)
/obj/item/weapon/gun/magnetic/railgun/heater/pistol/hos
@@ -171,7 +171,7 @@
firemodes = list(
list(mode_name="lethal", power_cost = 400, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=8, move_delay=null, one_handed_penalty=0),
list(mode_name="stun", power_cost = 300, projectile_type = /obj/item/projectile/energy/electrode/stunshot, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=0),
list(mode_name="stun", power_cost = 300, projectile_type = /obj/item/projectile/energy/electrode/strong, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=0),
)
/obj/item/weapon/gun/magnetic/railgun/flechette/sif
code/modules/projectiles/projectile/magnetic.dm
+4 -1
View File
@@ -36,13 +36,16 @@
damage = 30
damage_type = SEARING
embed_chance = 0
armor_penetration = 40
penetrating = 1
/obj/item/projectile/bullet/magnetic/heated/weak
icon_state = "gauss_silenced"
damage = 15
agony = 5
embed_chance = 0
armor_penetration = 50
armor_penetration = 30
penetrating = 0
/obj/item/projectile/bullet/magnetic/fuelrod
name = "fuel rod"