shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into new-tg-plants

Browse Source
This commit is contained in:
Useroth
2019-12-07 14:25:38 +01:00
committed by GitHub
parent 5f56d40f58 fd9e09d7e6
commit 28ddfd29b6
898 changed files with 16071 additions and 10762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown/misc.dm
+4 -1
View File
@@ -227,9 +227,12 @@
/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/prime()
icon_state = "cherry_bomb_lit"
playsound(src, 'sound/effects/fuse.ogg', seed.potency, 0)
addtimer(CALLBACK(src, /obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/detonate), rand(50, 100))
/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/detonate()
reagents.chem_temp = 1000 //Sets off the black powder
reagents.handle_reactions()
// Lavaland cactus
/obj/item/seeds/lavaland/cactus