Merge pull request #11854 from Loganbacca/devfix

Small fixes
This commit is contained in:
Chinsky
2016-01-01 21:11:04 +03:00
2 changed files with 1 additions and 1 deletions
+1
View File
@@ -2,6 +2,7 @@
name = "hard hat"
desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight."
icon_state = "hardhat0_yellow"
action_button_name = "Toggle Headlamp"
brightness_on = 4 //luminosity when on
light_overlay = "hardhat_light"
armor = list(melee = 30, bullet = 5, laser = 20,energy = 10, bomb = 20, bio = 10, rad = 20)
-1
View File
@@ -141,7 +141,6 @@
/obj/item/projectile/proc/launch_from_gun(atom/target, mob/user, obj/item/weapon/gun/launcher, var/target_zone, var/x_offset=0, var/y_offset=0)
if(user == target) //Shooting yourself
user.bullet_act(src, target_zone)
on_impact(user)
qdel(src)
return 0