mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
Fixed Trick Revolver, Added Trick minibomb (#21915)
* trick revolver fix, trick minibomb added * Update code/datums/uplink_items/uplink_traitor.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/grenades/syndieminibomb.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/projectiles/guns/projectile/revolver.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/projectiles/guns/projectile/revolver.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/datums/uplink_items/uplink_traitor.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Update code/datums/uplink_items/uplink_traitor.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Update code/game/objects/items/weapons/grenades/syndieminibomb.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Update code/modules/projectiles/guns/projectile/revolver.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Update code/datums/uplink_items/uplink_traitor.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
co-authored by
Henri215
Luc
Burzah
parent
22a1ebf132
commit
979935a7c9
@@ -91,6 +91,34 @@
|
||||
. = ..()
|
||||
. += "[get_ammo(0,0)] of those are live rounds."
|
||||
|
||||
/obj/item/gun/projectile/revolver/fake
|
||||
|
||||
/obj/item/gun/projectile/revolver/fake/examine(mob/user)
|
||||
. = ..()
|
||||
if(HAS_TRAIT(user, TRAIT_CLUMSY))
|
||||
. += "<span class='sans'>Its mechanism seems to shoot backwards.</span>"
|
||||
|
||||
/obj/item/gun/projectile/revolver/fake/process_fire(atom/target, mob/living/carbon/human/user, message, params, zone_override, bonus_spread)
|
||||
var/zone = "chest"
|
||||
if(user.has_organ("head"))
|
||||
zone = "head"
|
||||
add_fingerprint(user)
|
||||
if(!chambered)
|
||||
shoot_with_empty_chamber(user)
|
||||
return
|
||||
if(!chambered.fire(target = user, user = user, params = params, distro = null, quiet = suppressed, zone_override = zone, spread = 0, firer_source_atom = src))
|
||||
shoot_with_empty_chamber(user)
|
||||
return
|
||||
process_chamber()
|
||||
update_icon()
|
||||
playsound(src, 'sound/weapons/gunshots/gunshot_strong.ogg', 50, TRUE)
|
||||
user.visible_message("<span class='danger'>[src] goes off!</span>")
|
||||
to_chat(user, "<span class='danger'>[src] did look pretty dodgey!</span>")
|
||||
SEND_SOUND(user, sound('sound/misc/sadtrombone.ogg')) //HONK
|
||||
user.apply_damage(300, BRUTE, zone, sharp = TRUE, used_weapon = "Self-inflicted gunshot wound to the [zone].")
|
||||
user.bleed(BLOOD_VOLUME_NORMAL)
|
||||
user.death() // Just in case
|
||||
|
||||
/obj/item/gun/projectile/revolver/fingergun //Summoned by the Finger Gun spell, from advanced mimery traitor item
|
||||
name = "\improper finger gun"
|
||||
desc = "Bang bang bang!"
|
||||
|
||||
Reference in New Issue
Block a user