Fixes reflection, various security level fixes, gamma armory update, communication console fixes

This commit is contained in:
Markolie
2014-11-29 02:05:42 +01:00
parent 7e544c17bc
commit ae8f08e2b8
18 changed files with 827 additions and 686 deletions

View File

@@ -39,8 +39,6 @@
ammo_type = "/obj/item/ammo_casing/c9mm"
max_ammo = 36
/obj/item/ammo_box/c45
name = "Ammunition Box (.45)"
icon_state = "9mm"

View File

@@ -135,8 +135,9 @@
if(M.ckey)
msg_admin_attack("UNKNOWN shot [M] ([M.ckey]) with a [src] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[firer.x];Y=[firer.y];Z=[firer.z]'>JMP</a>)") //BS12 EDIT ALG
spawn(0)
if(A)
if (!forcedodge)
if(!forcedodge)
forcedodge = A.bullet_act(src, def_zone) // searches for return value
if(forcedodge == -1) // the bullet passes through a dense object!
bumped = 0 // reset bumped variable!

View File

@@ -29,6 +29,14 @@
icon_state = "heavylaser"
damage = 40
/obj/item/projectile/beam/sniper
name = "sniper beam"
icon_state = "sniperlaser"
damage = 60
stun = 5
weaken = 5
stutter = 5
/obj/item/projectile/beam/xray
name = "xray beam"
icon_state = "xray"
@@ -628,14 +636,6 @@ var/list/beam_master = list()
M.Weaken(5)
return 1
/obj/item/projectile/beam/sniper
name = "sniper beam"
icon_state = "sniperlaser"
damage = 60
stun = 5
weaken = 5
stutter = 5
/obj/item/projectile/beam/stun
name = "stun beam"