cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-16 09:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prize Counter and Toy Fixes

Browse Source 
Prize counters now spend your tickets when you purchase something
- Had removed the ticket spending during my testing, forgot to re-add it
before submit

Toy Crossbows now properly display the name of their user when they
"start scrounging for ammo"

Water balloons can now be filled from sinks, ANY reagent dispenser
structure (not just watertanks), and drinking glasses in addition to
beakers and buckets.
- Watch out for security hurling pepper-spray balloons!
This commit is contained in:
FalseIncarnate
2016-02-27 11:06:42 -05:00
parent 59339e8cf5
commit d66624e7bd
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/toys.dm
+11 -3
View File
@@ -49,15 +49,23 @@
/obj/item/toy/balloon/afterattack(atom/A as mob|obj, mob/user as mob, proximity)
if(!proximity) return
if (istype(A, /obj/structure/reagent_dispensers/watertank) && get_dist(src,A) <= 1)
if (istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1)
A.reagents.trans_to(src, 10)
user << "<span class='notice'>You fill the balloon with the contents of [A].</span>"
desc = "A translucent balloon with some form of liquid sloshing around in it."
update_icon()
return
/obj/item/toy/balloon/wash(mob/user, atom/source)
if(reagents.total_volume < 10)
reagents.add_reagent("water", min(10-reagents.total_volume, 10))
user << "<span class='notice'>You fill the balloon from the [source].</span>"
desc = "A translucent balloon with some form of liquid sloshing around in it."
update_icon()
return
/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob, params)
if(istype(O, /obj/item/weapon/reagent_containers/glass))
if(istype(O, /obj/item/weapon/reagent_containers/glass) || istype(O, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass))
if(O.reagents)
if(O.reagents.total_volume < 1)
user << "The [O] is empty."
@@ -200,7 +208,7 @@
return
else if (bullets == 0)
user.Weaken(5)
user.visible_message("<span class='danger'>[] realized they were out of ammo and starting scrounging for some!</span>")
user.visible_message("<span class='danger'>[user] realized they were out of ammo and starting scrounging for some!</span>")