cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes gumballs/lollipops

Browse Source
This commit is contained in:
Skrem_7
2023-03-19 12:10:47 -05:00
parent 0293248ef2
commit c0ff75443f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/objects/items/robot/robot_items.dm
View File

@@ -444,7 +444,7 @@
to_chat(user, span_warning("Not enough lollipops left!"))
return FALSE
candy--
var/obj/item/ammo_casing/reusable/lollipop/A = new /obj/item/ammo_casing/reusable/lollipop(src)
var/obj/item/ammo_casing/caseless/lollipop/A = new /obj/item/ammo_casing/caseless/lollipop(src)
A.BB.damage = hitdamage
if(hitdamage)
A.BB.nodamage = FALSE
@@ -459,7 +459,7 @@
to_chat(user, span_warning("Not enough gumballs left!"))
return FALSE
candy--
var/obj/item/ammo_casing/reusable/gumball/A = new /obj/item/ammo_casing/reusable/gumball(src)
var/obj/item/ammo_casing/caseless/gumball/A = new /obj/item/ammo_casing/caseless/gumball(src)
A.BB.damage = hitdamage
if(hitdamage)
A.BB.nodamage = FALSE
@@ -512,7 +512,7 @@
#undef THROW_GUMBALL_MODE
#undef DISPENSE_ICECREAM_MODE
/obj/item/ammo_casing/reusable/gumball
/obj/item/ammo_casing/caseless/gumball
name = "Gumball"
desc = "Why are you seeing this?!"
projectile_type = /obj/item/projectile/bullet/reusable/gumball
@@ -530,7 +530,7 @@
ammo_type = new ammo_type(src)
color = ammo_type.color
/obj/item/ammo_casing/reusable/lollipop //NEEDS RANDOMIZED COLOR LOGIC.
/obj/item/ammo_casing/caseless/lollipop //NEEDS RANDOMIZED COLOR LOGIC.
name = "Lollipop"
desc = "Why are you seeing this?!"
projectile_type = /obj/item/projectile/bullet/reusable/lollipop