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

Merge branch 'development' into map-development

Browse Source 
# Conflicts:
#	baystation12.dme
#	code/game/objects/random/random.dm
#	code/game/turfs/turf_changing.dm
#	code/modules/mining/ore.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
This commit is contained in:
skull132
2017-05-01 01:07:56 +03:00
parent c03666340a c197ce34fc
commit a5848c2802
336 changed files with 4668 additions and 3389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/projectiles/projectile/beams.dm
View File

@@ -292,9 +292,9 @@
name = "energy bolt"
//For projectiles name is only shown in onhit messages, so its more of a layman's description
//of what the projectile looks like
damage = 4 //Very weak
armor_penetration = 10
damage = 3.5 //Very weak
accuracy = 4 //Guided by magic, unlikely to miss
eyeblur = 0 //Not bright or blinding
var/mob/living/ignore
muzzle_type = /obj/effect/projectile/cult/muzzle
@@ -312,8 +312,8 @@
/obj/item/projectile/beam/cult/heavy
name = "glowing energy bolt"
damage = 12 //Stronger and better armor penetration, though still much weaker than a typical laser
armor_penetration = 15
damage = 10 //Stronger and better armor penetration, though still much weaker than a typical laser
armor_penetration = 10
muzzle_type = /obj/effect/projectile/cult/heavy/muzzle
tracer_type = /obj/effect/projectile/cult/heavy/tracer