cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Trick Revolver, Added Trick minibomb (#21915)

Browse Source 
* 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:
HMBGERDO
2023-08-21 19:56:33 +01:00
committed by GitHub
co-authored by Henri215 Luc Burzah
parent 22a1ebf132
commit 979935a7c9
4 changed files with 58 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/grenades/syndieminibomb.dm
+14
View File
@@ -10,3 +10,17 @@
update_mob()
explosion(loc, 1, 2, 4, flame_range = 2)
qdel(src)
/obj/item/grenade/syndieminibomb/fake
/obj/item/grenade/syndieminibomb/fake/examine(mob/user)
. = ..()
if(HAS_TRAIT(user, TRAIT_CLUMSY))
. += "<span class='sans'>There are small glue ejectors all over the bomb.</span>"
/obj/item/grenade/syndieminibomb/fake/attack_self(mob/user)
if(!active)
flags |= NODROP
to_chat(user, "<span class='userdanger'>As you activate the bomb, it emits a substance that sticks to your hand! It won't come off!</span>")
to_chat(user, "<span class='sans'>Uh oh.</span>")
. = ..()
code/game/objects/items/weapons/storage/uplink_kits.dm
+7 -1
View File
@@ -263,11 +263,17 @@
new /obj/item/ammo_casing/shotgun/assassination(src)
new /obj/item/gun/projectile/revolver/doublebarrel/improvised/cane(src)
/obj/item/storage/box/syndie_kit/fake_minibomb
name = "trick minibomb kit"
/obj/item/storage/box/syndie_kit/fake_minibomb/populate_contents()
new /obj/item/grenade/syndieminibomb/fake(src)
/obj/item/storage/box/syndie_kit/fake_revolver
name = "trick revolver kit"
/obj/item/storage/box/syndie_kit/fake_revolver/populate_contents()
new /obj/item/toy/russian_revolver/trick_revolver(src)
new /obj/item/gun/projectile/revolver/fake(src)
/obj/item/storage/box/syndie_kit/mimery
name = "advanced mimery kit"