diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm index 3cdd4798..5b3b7077 100644 --- a/code/modules/holiday/halloween/jacqueen.dm +++ b/code/modules/holiday/halloween/jacqueen.dm @@ -368,7 +368,7 @@ C.reagents.add_reagent(/datum/reagent/fermi/eigenstate, 30) if(5) visible_message("[src] waves their arms around, \"A new familiar for me, and you'll see it's thee!\"") - C.reagents.add_reagent("secretcatchem", 30) + C.reagents.add_reagent(/datum/reagent/fermi/secretcatchem, 30) if(6) visible_message("[src] waves their arms around, \"While you may not be a ghost, for this sheet you'll always be it's host.\"") var/mob/living/carbon/human/H = C diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index f3ee17a4..b842ba42 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -437,11 +437,11 @@ var/obj/item/reagent_containers/spray/cyborg_drying/CD = locate(/obj/item/reagent_containers/spray/cyborg_drying) in basic_modules if(CD) - CD.reagents.add_reagent("drying_agent", 5 * coeff) + CD.reagents.add_reagent(/datum/reagent/drying_agent, 5 * coeff) var/obj/item/reagent_containers/spray/cyborg_lube/CL = locate(/obj/item/reagent_containers/spray/cyborg_lube) in emag_modules if(CL) - CL.reagents.add_reagent("lube", 2 * coeff) + CL.reagents.add_reagent(/datum/reagent/lube, 2 * coeff) /obj/item/robot_module/clown name = "Clown" diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index cdb299b2..37ecfacf 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -176,8 +176,8 @@ icon_living = "mouse_plasma" icon_dead = "mouse_plasma" see_in_dark = 12 - maxHealth = 7 - health = 7 + maxHealth = 2 + health = 2 chew_probability = 0 /mob/living/simple_animal/mouse/boommouse/Initialize() diff --git a/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm b/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm index 9013468f..459747e0 100644 --- a/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm +++ b/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm @@ -316,9 +316,9 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0) to_chat(H, "WHAT THE FUCK IS THAT?!") to_chat(H, ".KNOH !nuf hcum os si uoy htiw gniyalP .KNOH KNOH KNOH") H.playsound_local(src,'sound/hallucinations/im_here1.ogg', 25) - H.reagents.add_reagent("mindbreaker", 3) - H.reagents.add_reagent("laughter", 5) - H.reagents.add_reagent("mercury", 3) + H.reagents.add_reagent(/datum/reagent/toxin/mindbreaker, 3) + H.reagents.add_reagent(/datum/reagent/consumable/laughter, 5) + H.reagents.add_reagent(/datum/reagent/mercury, 3) Appear() manifested = FALSE addtimer(CALLBACK(src, /mob/living/simple_animal/hostile/floor_cluwne/.proc/Manifest), 2) diff --git a/code/modules/pool/pool_main.dm b/code/modules/pool/pool_main.dm index f5ccc40f..a15f3427 100644 --- a/code/modules/pool/pool_main.dm +++ b/code/modules/pool/pool_main.dm @@ -171,7 +171,7 @@ /turf/open/pool/attackby(obj/item/W, mob/living/user) if(istype(W, /obj/item/mop) && filled) - W.reagents.add_reagent("water", 5) + W.reagents.add_reagent(/datum/reagent/water, 5) to_chat(user, "You wet [W] in [src].") playsound(src, 'sound/effects/slosh.ogg', 25, TRUE) else diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 9a1a46fe..ef45e07b 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -105,7 +105,7 @@ o.add_movespeed_modifier(BREAST_MOVEMENT_SPEED, TRUE, 100, NONE, override = TRUE, multiplicative_slowdown = moveCalc) sizeMoveMod(moveCalc) */ - if((B.cached_size) < 40) + if((B?.cached_size) < 40) ..() /*