cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 12:05:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8881 from phil235/SentiencePotionFix

Browse Source 
Fixes invisible snacks and mobs from gold and silver slime reaction.
This commit is contained in:
Jordie
2015-04-13 18:23:40 +10:00
parent f365401049 f7b51889e1
commit e9d264ba55
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Goon-Medicine.dm
+2 -1
View File
@@ -683,7 +683,8 @@ proc/chemical_mob_spawn(var/datum/reagents/holder, var/amount_to_spawn, var/reac
/mob/living/simple_animal/hostile/asteroid/hivelordbrood,
/mob/living/simple_animal/hostile/carp/holocarp,
/mob/living/simple_animal/hostile/mining_drone,
/mob/living/simple_animal/hostile/poison
/mob/living/simple_animal/hostile/poison,
/mob/living/simple_animal/hostile/blob
)//exclusion list for things you don't want the reaction to create.
var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
var/atom/A = holder.my_atom
code/modules/reagents/Chemistry-Recipes.dm
+18 -1
View File
@@ -536,8 +536,25 @@ datum/chemical_reaction/pestkiller
/datum/chemical_reaction/slimebork/on_reaction(var/datum/reagents/holder)
feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
var/list/blocked = list(/obj/item/weapon/reagent_containers/food/snacks,
/obj/item/weapon/reagent_containers/food/snacks/store/bread,
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
/obj/item/weapon/reagent_containers/food/snacks/store/cake,
/obj/item/weapon/reagent_containers/food/snacks/cakeslice,
/obj/item/weapon/reagent_containers/food/snacks/store,
/obj/item/weapon/reagent_containers/food/snacks/pie,
/obj/item/weapon/reagent_containers/food/snacks/kebab,
/obj/item/weapon/reagent_containers/food/snacks/pizza,
/obj/item/weapon/reagent_containers/food/snacks/pizzaslice,
/obj/item/weapon/reagent_containers/food/snacks/salad,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/soup,
/obj/item/weapon/reagent_containers/food/snacks/grown,
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom
)
blocked |= typesof(/obj/item/weapon/reagent_containers/food/snacks/customizable)
var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/snacks) - /obj/item/weapon/reagent_containers/food/snacks
var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/snacks) - blocked
// BORK BORK BORK
playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)