cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8103 from FalseIncarnate/reagents

Browse Source 
Silver Slime Core and Random Reagent changes
This commit is contained in:
tigercat2000
2017-10-27 09:23:50 -07:00
committed by GitHub
parent 4ab4c2adcf 58bfb314d0
commit a5e4ccdc18
4 changed files with 208 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/vent_clog.dm
+2 -2
View File
@@ -22,8 +22,8 @@
var/list/gunk = list("water","carbon","flour","radium","toxin","cleaner","nutriment","condensedcapsaicin","psilocybin","lube",
"atrazine","banana","charcoal","space_drugs","methamphetamine","holywater","ethanol","hot_coco","facid",
"blood","morphine","ether","fluorine","mutadone","mutagen","hydrocodone","fuel",
"haloperidol","lsd","nanites","lipolicide","frostoil","salglu_solution","beepskysmash",
"omnizine", "amanitin", "adminordrazine", "neurotoxin", "synaptizine")
"haloperidol","lsd","syndicate_nanites","lipolicide","frostoil","salglu_solution","beepskysmash",
"omnizine", "amanitin", "neurotoxin", "synaptizine")
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = vent
R.add_reagent(pick(gunk), 50)
code/modules/reagents/chemistry/recipes/slime_extracts.dm
+16
View File
@@ -159,6 +159,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/slab,
/obj/item/weapon/reagent_containers/food/snacks/grown,
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
/obj/item/weapon/reagent_containers/food/snacks/deepfryholder
)
blocked |= typesof(/obj/item/weapon/reagent_containers/food/snacks/customizable)
@@ -193,6 +194,21 @@
feedback_add_details("slime_cores_used","[type]")
var/list/borks = subtypesof(/obj/item/weapon/reagent_containers/food/drinks)
var/list/blocked = list(/obj/item/weapon/reagent_containers/food/drinks/cans/adminbooze,
/obj/item/weapon/reagent_containers/food/drinks/cans/madminmalt,
/obj/item/weapon/reagent_containers/food/drinks/shaker,
/obj/item/weapon/reagent_containers/food/drinks/britcup,
/obj/item/weapon/reagent_containers/food/drinks/sillycup,
/obj/item/weapon/reagent_containers/food/drinks/cans,
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass,
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass,
/obj/item/weapon/reagent_containers/food/drinks/bottle,
/obj/item/weapon/reagent_containers/food/drinks/mushroom_bowl
)
blocked += typesof(/obj/item/weapon/reagent_containers/food/drinks/flask)
blocked += typesof(/obj/item/weapon/reagent_containers/food/drinks/trophy)
blocked += typesof(/obj/item/weapon/reagent_containers/food/drinks/cans/bottler)
borks -= blocked
// BORK BORK BORK
playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)