cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-21 04:48:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	html/changelogs/sdtwbaj-skrellmoney.yml
This commit is contained in:
skull132
2018-02-24 21:09:27 +02:00
parent b368c0c97a dbf31178c7
commit bfced36a28
11 changed files with 46 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/melee/energy.dm
-1
View File
@@ -304,7 +304,6 @@
shield_power = 150
can_block_bullets = 1
active = 1
armor_penetration = 20
/obj/item/weapon/melee/energy/blade/Initialize()
. = ..()