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

Merge branch 'master' into PS_PORT_SCHEDULER

Browse Source
This commit is contained in:
kevinz000
2018-12-06 18:10:48 -08:00
committed by GitHub
parent 70a934adf9 8f946a39b4
commit d15f7efa5b
82 changed files with 573 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun.dm
+1 -1
View File
@@ -584,7 +584,7 @@
if(one_handed_penalty)
if(!held_twohanded)
acc_mod += -ceil(one_handed_penalty/2)
acc_mod += -CEILING(one_handed_penalty/2, 1)
disp_mod += one_handed_penalty*0.5 //dispersion per point of two-handedness
//Accuracy modifiers
code/modules/projectiles/projectile/energy.dm
+5 -2
View File
@@ -123,6 +123,7 @@
damage_type = BURN
agony = 10
check_armour = "bio"
armor_penetration = 25 // It's acid
combustion = FALSE
@@ -130,9 +131,10 @@
name = "neurotoxic spit"
icon_state = "neurotoxin"
damage = 5
damage_type = TOX
damage_type = BIOACID
agony = 80
check_armour = "bio"
armor_penetration = 25 // It's acid-based
combustion = FALSE
@@ -140,9 +142,10 @@
name = "neurotoxic spit"
icon_state = "neurotoxin"
damage = 20
damage_type = TOX
damage_type = BIOACID
agony = 20
check_armour = "bio"
armor_penetration = 25 // It's acid-based
/obj/item/projectile/energy/phoron
name = "phoron bolt"