cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Ornament boxes allowing players to farm infinite glass from Autolathes (#30565)

Browse Source
This commit is contained in:
DeityLink
2021-09-07 06:59:14 +02:00
committed by GitHub
parent 44a6e326a4
commit 9638f65b39
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/ornaments.dm
View File

@@ -62,7 +62,11 @@
if(get_turf(src)) if(get_turf(src))
playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1) playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
if(prob(33)) if(prob(33))
new /obj/item/weapon/shard(get_turf(src)) // Create a glass shard at the hit location) var/obj/effect/decal/cleanable/crumbs/C = new (get_turf(src))
for (var/ball_color in ornaments_list)
if (type == ornaments_list[ball_color])
C.color = ball_color
break
qdel(src) qdel(src)
/obj/item/ornament/red /obj/item/ornament/red

2
code/game/objects/items/weapons/storage/boxes.dm
View File

@@ -898,7 +898,7 @@
desc = "A box of seven glass Christmas ornaments. Color not included." desc = "A box of seven glass Christmas ornaments. Color not included."
icon_state = "ornament_box" icon_state = "ornament_box"
foldable = null foldable = null
starting_materials = list(MAT_GLASS = 2500) //needed for autolathe production starting_materials = list(MAT_GLASS = 2000) //needed for autolathe production
/obj/item/weapon/storage/box/ornaments/New() /obj/item/weapon/storage/box/ornaments/New()
..() ..()