This commit is contained in:
Fox-McCloud
2014-12-12 06:52:20 -05:00
parent 1a425064a5
commit e76c8f26f3
27 changed files with 110 additions and 44 deletions
+1 -1
View File
@@ -245,7 +245,7 @@
mouthshoot = 0
return
in_chamber.on_hit(M)
if (in_chamber.damage_type != HALLOSS)
if (in_chamber.damage_type != STAMINA)
user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]", sharp=1)
user.death()
else
+2 -1
View File
@@ -66,6 +66,7 @@
icon_state = "omnilaser"
hitsound = null
damage = 0
damage_type = STAMINA
flag = "laser"
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag)
@@ -75,7 +76,7 @@
var/mob/living/carbon/human/M = target
if(istype(M.wear_suit))
if(M.wear_suit.type in suit_types)
M.adjustHalLoss(34)
M.adjustStaminaLoss(34)
return 1
/obj/item/projectile/lasertag/omni
@@ -75,7 +75,7 @@
name = "disabler beam"
icon_state = "omnilaser"
damage = 34
damage_type = HALLOSS
damage_type = STAMINA
var/range = 8
/obj/item/projectile/energy/disabler/Range()