cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

[s] Fixes an inconstancy (#21701)

Browse Source 
* fixes an inconsistency

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
2023-07-16 11:21:10 -05:00
committed by GitHub
co-authored by Luc
parent 40927ac3eb
commit 809335b3b9
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/toys.dm
+35
View File
@@ -1087,13 +1087,48 @@
/obj/item/toy/russian_revolver/trick_revolver/examine(mob/user) //Sneaky sneaky
. = ..()
. += "<span class='info'>Use a pen on it to rename it.</span>"
. += "Has [fake_bullets] round\s remaining."
. += "<span class='info'>Use in hand to empty the gun's ammo reserves.</span>"
. += "[fake_bullets] of those are live rounds."
/obj/item/toy/russian_revolver/trick_revolver/post_shot(user)
to_chat(user, "<span class='danger'>[src] did look pretty dodgey!</span>")
SEND_SOUND(user, sound('sound/misc/sadtrombone.ogg')) //HONK
/obj/item/toy/russian_revolver/trick_revolver/verb/trick_spin()
set name = "Spin Chamber"
set category = "Object"
set desc = "Click to spin your revolver's chamber."
var/mob/M = usr
if(M.stat || !in_range(M, src))
return
to_chat(M, "<span class='warning'>You go to spin the chamber... and it goes off in your face!</span>")
shoot_gun(M)
/obj/item/toy/russian_revolver/trick_revolver/attack_self(mob/user)
if(!bullets_left) //You can re-arm the trap...
user.visible_message("<span class='warning'>[user] loads a bullet into [src]'s cylinder before spinning it.</span>")
spin_cylinder()
else //But if you try to spin it to see if it was fake...
user.visible_message("<span class='warning'>[user] tries to empty [src], but it goes off in their face!</span>")
shoot_gun(user)
/obj/item/toy/russian_revolver/trick_revolver/attackby(obj/item/I, mob/user, params)
if(is_pen(I))
to_chat(user, "<span class='warning'>You go to write on [src].. and it goes off in your face!</span>")
shoot_gun(user)
if(istype(I, /obj/item/ammo_casing/a357))
to_chat(user, "<span class='warning'>You go to load a bullet into [src].. and it goes off in your face!</span>")
shoot_gun(user)
if(istype(I, /obj/item/ammo_box/a357))
to_chat(user, "<span class='warning'>You go to speedload [src].. and it goes off in your face!</span>")
shoot_gun(user)
return ..()
/*
* Rubber Chainsaw
*/