cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into universal-damage

Browse Source
This commit is contained in:
Fox McCloud
2019-09-17 11:24:58 -04:00
parent 184e4877e8 b7019b5748
commit 6f637b6014
131 changed files with 1794 additions and 1012 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/shields.dm
+1 -1
View File
@@ -58,7 +58,7 @@
/obj/item/shield/energy
name = "energy combat shield"
desc = "A shield capable of stopping most melee attacks. Protects user from almost all energy projectiles. It can be retracted, expanded, and stored anywhere."
desc = "A shield that reflects almost all energy projectiles, but is useless against physical attacks. It can be retracted, expanded, and stored anywhere."
icon_state = "eshield0" // eshield1 for expanded
force = 3
throwforce = 3