From 77bce347c1d38b3eb6d6e4bc1079737f749f15a1 Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Fri, 1 Jan 2016 11:15:34 +1300 Subject: [PATCH 1/2] Added hardhat action button --- code/modules/clothing/head/hardhat.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index d344d3b34c3..e77792649b8 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -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) From 4fdfc8424966fa063ce3abc9df4481004f1b34ac Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Fri, 1 Jan 2016 11:28:02 +1300 Subject: [PATCH 2/2] Fixed projectile effect runtime Only showing the impact effect without the rest of the tracer would look a bit silly anyway. --- code/modules/projectiles/projectile.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 91f176e3484..a77b3f19745 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -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