From 40615b77fba140168a1212b52ec22119ca639655 Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Wed, 13 Jul 2011 21:07:29 +0000 Subject: [PATCH] Guns: Lasers and pulse shots are now significantly more penetrating. Previously, even lowly assistant suits would halve the damage of pulse rifles. Not anymore! Turrets: Portable turrets and AI turrets are now able to shoot people even if they're on the ground. However, taser shots will still fly over people. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1844 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/portable_turret.dm | 4 ++++ code/game/machinery/turrets.dm | 1 + code/modules/mob/living/carbon/human/human.dm | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 81782d2b609..620741b2ce7 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -489,11 +489,13 @@ Neutralize All Unidentified Life Signs: []
"}, // All energy-based weapons are applicable if (istype(E, /obj/item/weapon/gun/energy/laser)) A = new /obj/item/projectile/beam( loc ) + A.original = target.loc icon_state = "orange_target_prism" if(!emagged) use_power(500) else use_power(1000) else if(istype(E, /obj/item/weapon/gun/energy/pulse_rifle)) A = new /obj/item/projectile/beam/pulse( loc ) + A.original = target.loc icon_state = "orange_target_prism" if(!emagged) use_power(700) else use_power(1400) @@ -506,6 +508,7 @@ Neutralize All Unidentified Life Signs: []
"}, else if(istype(E, /obj/item/weapon/gun/energy/freeze)) A = new /obj/item/projectile/freeze( loc ) + A.original = target.loc var/obj/item/projectile/freeze/F = A F.temperature = rand(0, 200) icon_state = "target_prism" @@ -521,6 +524,7 @@ Neutralize All Unidentified Life Signs: []
"}, else // if it has been emagged, use laser shots A = new /obj/item/projectile/beam( loc ) + A.original = target.loc icon_state = "orange_target_prism" use_power(1000) diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index c668d887a8e..f24ea943599 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -191,6 +191,7 @@ var/obj/item/projectile/A if (src.lasers) A = new /obj/item/projectile/beam( loc ) + A.original = target.loc use_power(500) else A = new /obj/item/projectile/electrode( loc ) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 35bebbec635..3cf3ab3a0a9 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -333,7 +333,7 @@ show_message("\red Your [armor["clothes"]] absorbs the hit!", 4) return else - if (prob(armor["armor"])) + if (prob(armor["armor"])/2) show_message("\red Your [armor["clothes"]] only softens the hit!", 4) if (prob(20)) d = d / 2 @@ -366,7 +366,7 @@ show_message("\red Your [armor["clothes"]] absorbs the hit!", 4) return else - if (armor["armor"]/2) + if (prob(armor["armor"])/2) show_message("\red Your [armor["clothes"]] only softens the hit!", 4) if (prob(20)) d = d / 2