diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index 159e9cccbad..ca088a0320a 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -56,6 +56,10 @@ /obj/dummy/spell_jaunt/relaymove(var/mob/user, direction) if (!src.canmove) return + var/turf/newLoc = get_step(src,direction) + if(!(newLoc.flags & NOJAUNT)) + loc = newLoc +/* switch(direction) if(NORTH) src.y++ @@ -76,7 +80,7 @@ src.x++ if(SOUTHWEST) src.y-- - src.x-- + src.x-- */ src.canmove = 0 spawn(2) src.canmove = 1 diff --git a/code/game/objects/storage/bible.dm b/code/game/objects/storage/bible.dm index 02685c7738a..d55368bdc2f 100644 --- a/code/game/objects/storage/bible.dm +++ b/code/game/objects/storage/bible.dm @@ -76,6 +76,11 @@ user << "\blue You hit the floor with the bible." if(user.mind && (user.mind.assigned_role == "Chaplain")) call(/obj/rune/proc/revealrunes)(src) + if(user.mind && (user.mind.assigned_role == "Chaplain")) + if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder + user << "\blue You bless [A]." + A.reagents.add_reagent("holywater",A.reagents.get_reagent_amount("water")) + A.reagents.del_reagent("water") /obj/item/weapon/storage/bible/attackby(obj/item/weapon/W as obj, mob/user as mob) playsound(src.loc, "rustle", 50, 1, -5) diff --git a/code/game/turf.dm b/code/game/turf.dm index 918067e0924..7de2cfbb287 100644 --- a/code/game/turf.dm +++ b/code/game/turf.dm @@ -1468,4 +1468,8 @@ turf/simulated/floor/return_siding_icon_state() M.death() for(var/obj/critter/M in src) spawn(0) - M.Die() \ No newline at end of file + M.Die() + +/turf/proc/Bless() + flags |= NOJAUNT + overlays += image('water.dmi',src,"holywater") \ No newline at end of file diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index e381cd29a67..8fdb7a92434 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -2433,7 +2433,7 @@ datum holywater name = "Holy Water" id = "holywater" - description = "The chaplains holy water." + description = "Water blessed by some deity." reagent_state = LIQUID color = "#E0E8EF" // rgb: 224, 232, 239 @@ -2449,6 +2449,10 @@ datum ..() return + reaction_turf(var/turf/simulated/T, var/volume) + if(!istype(T)) return + T.Bless() + tequilla name = "Tequila" id = "tequilla" diff --git a/code/setup.dm b/code/setup.dm index 03c2c84ae09..33af8fa97bf 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -118,6 +118,8 @@ #define PASSGLASS 2 #define PASSGRILLE 4 +//turf-only flags +#define NOJAUNT 1 // bitflags for clothing parts #define HEAD 1 diff --git a/icons/effects/water.dmi b/icons/effects/water.dmi index 1f875f86d79..1d73f506d35 100644 Binary files a/icons/effects/water.dmi and b/icons/effects/water.dmi differ