From 82abec0bd07b2b70f35a261d18c1e412c1d3e97e Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 18 Aug 2016 19:49:31 -0400 Subject: [PATCH] moar updates... --- code/game/gamemodes/cult/cult_structures.dm | 6 +++--- code/game/turfs/simulated/walls_misc.dm | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 42da9da4bef..a8d5b5fea98 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -91,7 +91,7 @@ if(cooldowntime > world.time) to_chat(user, "The magic in [src] is weak, it will be ready to use again in [getETA()].") return - var/choice = alert(user,"You study the schematics etched into the forge...","Cultist Dagger", "Eldritch Whetstone","Zealot's Blindfold","Flask of Unholy Water") + var/choice = input(user,"You study the rituals on the alter...","Alter") as null|anything in list("Cultist Dagger", "Eldritch Whetstone","Zealot's Blindfold","Flask of Unholy Water") var/pickedtype switch(choice) if("Eldritch Whetstone") @@ -145,7 +145,7 @@ if(cooldowntime > world.time) to_chat(user, "The magic in [src] is weak, it will be ready to use again in [getETA()].") return - var/choice = alert(user,"You study the schematics etched into the forge...",, "Shielded Hardsuit", "Flagellant's Robe","Cultist Hardsuit") + var/choice = input(user,"You study the schematics etched on the force...","Forge") as null|anything in list("Shielded Hardsuit", "Flagellant's Robe","Cultist Hardsuit") var/pickedtype var/otheritem //ie:helmet.. switch(choice) @@ -236,7 +236,7 @@ if(cooldowntime > world.time) to_chat(user, "The magic in [src] is weak, it will be ready to use again in [getETA()].") return - var/choice = alert(user,"You flip through the black pages of the archives...",,"Supply Talisman","Shuttle Curse","Veil Shifter") + var/choice = input(user,"You flip through the black pages of the archives...","Archives") as null|anything in list("Supply Talisman","Shuttle Curse","Veil Shifter") var/pickedtype switch(choice) if("Supply Talisman") diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm index c1e7e6b2c31..f1bce2642a0 100644 --- a/code/game/turfs/simulated/walls_misc.dm +++ b/code/game/turfs/simulated/walls_misc.dm @@ -8,7 +8,8 @@ /turf/simulated/wall/cult/New() new /obj/effect/overlay/temp/cult/turf(src) - icon_state = ticker.mode.cultdat.cult_wall_icon_state + if(!ticker.mode.cultdat) + icon_state = ticker.mode.cultdat.cult_wall_icon_state ..() /turf/simulated/wall/cult/artificer