This commit is contained in:
Kashargul
2024-12-07 00:12:42 +01:00
parent 0b303a3ae5
commit 2bd0f9c14d
59 changed files with 385 additions and 323 deletions
+1 -1
View File
@@ -17,7 +17,7 @@
/obj/item/reagent_containers/glass/beaker/vial/random
flags = 0
var/list/random_reagent_list = list(list(REAGENT_ID_WATER = 15) = 1, list("cleaner" = 15) = 1)
var/list/random_reagent_list = list(list(REAGENT_ID_WATER = 15) = 1, list(REAGENT_ID_CLEANER = 15) = 1)
/obj/item/reagent_containers/glass/beaker/vial/random/toxin
random_reagent_list = list(
@@ -23,7 +23,7 @@
wet()
/obj/item/soap/proc/wet()
reagents.add_reagent("cleaner", 5)
reagents.add_reagent(REAGENT_ID_CLEANER, 5)
/obj/item/soap/Crossed(atom/movable/AM as mob|obj)
if(AM.is_incorporeal())
@@ -214,7 +214,7 @@
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent(REAGENT_ID_ALUMINIUM, 30)
B2.reagents.add_reagent("foaming_agent", 10)
B2.reagents.add_reagent(REAGENT_ID_FOAMINGAGENT, 10)
B2.reagents.add_reagent(REAGENT_ID_PACID, 10)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
@@ -282,9 +282,9 @@
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("fluorosurfactant", 40)
B1.reagents.add_reagent(REAGENT_ID_FLUOROSURFACTANT, 40)
B2.reagents.add_reagent(REAGENT_ID_WATER, 40)
B2.reagents.add_reagent("cleaner", 10)
B2.reagents.add_reagent(REAGENT_ID_CLEANER, 10)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
@@ -21,4 +21,4 @@
M.adjustToxLoss(rand(20,40))
/obj/item/material/star/ninja
default_material = "uranium"
default_material = MAT_URANIUM
@@ -107,7 +107,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
to_chat(user, span_notice("You bless [A]."))
var/water2holy = A.reagents.get_reagent_amount(REAGENT_ID_WATER)
A.reagents.del_reagent(REAGENT_ID_WATER)
A.reagents.add_reagent("holywater",water2holy)
A.reagents.add_reagent(REAGENT_ID_HOLYWATER,water2holy)
/obj/item/storage/bible/attackby(obj/item/W as obj, mob/user as mob)
if (src.use_sound)