mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 02:34:00 +00:00
Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
This commit is contained in:
@@ -725,7 +725,7 @@
|
||||
in_chamber.on_hit(M)
|
||||
if(in_chamber.damage_type != HALLOSS && !in_chamber.nodamage)
|
||||
log_and_message_admins("commited suicide using \a [src]", user)
|
||||
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 = TRUE)
|
||||
user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", sharp = TRUE, used_weapon = src)
|
||||
user.death()
|
||||
else if(in_chamber.damage_type == HALLOSS)
|
||||
to_chat(user, span_notice("Ow..."))
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
else if(firer)
|
||||
var/obj/T
|
||||
|
||||
if(original in target.contents && istype(original, /obj))
|
||||
if((original in target.contents) && istype(original, /obj))
|
||||
T = original
|
||||
|
||||
var/list/possible_targets = list()
|
||||
|
||||
Reference in New Issue
Block a user