diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm
index 37e7a2f52b3..1d95041df3c 100644
--- a/code/game/asteroid.dm
+++ b/code/game/asteroid.dm
@@ -73,11 +73,11 @@ var/global/max_secret_rooms = 6
theme = "cult"
walltypes = list(/turf/closed/wall/cult=3,/turf/closed/mineral/random/high_chance=1)
floortypes = list(/turf/open/floor/plasteel/cult)
- treasureitems = list(/obj/item/device/soulstone/anybody=1, /obj/item/clothing/suit/space/cult=1, /obj/item/weapon/bedsheet/cult=2,
+ treasureitems = list(/obj/item/device/soulstone/anybody=1, /obj/item/clothing/suit/space/hardsuit/cult=1, /obj/item/weapon/bedsheet/cult=2,
/obj/item/clothing/suit/cultrobes=2, /mob/living/simple_animal/hostile/creature=3)
fluffitems = list(/obj/effect/gateway=1,/obj/effect/gibspawner=1,/obj/structure/cult/talisman=1,/obj/item/toy/crayon/red=2,
/obj/item/organ/heart=2, /obj/effect/decal/cleanable/blood=4,/obj/structure/table/wood=2,/obj/item/weapon/ectoplasm=3,
- /obj/item/clothing/head/helmet/space/cult=1, /obj/item/clothing/shoes/cult=1)
+ /obj/item/clothing/shoes/cult=1)
if("wizden")
theme = "wizden"
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index 179d87099e2..d4b1affc1f6 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -117,14 +117,16 @@
armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-/obj/item/clothing/head/helmet/space/cult
+/obj/item/clothing/head/helmet/space/hardsuit/cult
name = "nar-sien hardened helmet"
desc = "A heavily-armored helmet worn by warriors of the Nar-Sien cult. It can withstand hard vacuum."
icon_state = "cult_helmet"
item_state = "cult_helmet"
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+ brightness_on = 0
+ actions_types = list()
-/obj/item/clothing/suit/space/cult
+/obj/item/clothing/suit/space/hardsuit/cult
name = "nar-sien hardened armor"
icon_state = "cult_armor"
item_state = "cult_armor"
@@ -132,6 +134,7 @@
w_class = 2
allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank/internals/)
armor = list(melee = 70, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/cult
/obj/item/weapon/sharpener/cult
name = "eldritch whetstone"
@@ -151,10 +154,9 @@
body_parts_covered = CHEST|GROIN|LEGS|ARMS
allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade)
var/current_charges = 3
- var/shield_state = "shield-red"
hooded = 1
hoodtype = /obj/item/clothing/head/cult_hoodie
-
+
/obj/item/clothing/head/cult_hoodie
name = "empowered cultist armor"
desc = "Empowered garb which creates a powerful shield around the user."
@@ -163,8 +165,8 @@
body_parts_covered = HEAD
flags = NODROP
flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
-
-/obj/item/clothing/suit/hooded/cultrobes/cult_shield/pickup(mob/living/user)
+
+/obj/item/clothing/suit/hooded/cultrobes/cult_shield/equipped(mob/user, slot)
..()
if(!iscultist(user))
user << "\"I wouldn't advise that.\""
@@ -172,26 +174,22 @@
user.unEquip(src, 1)
user.Dizzy(30)
user.Weaken(5)
-
/obj/item/clothing/suit/hooded/cultrobes/cult_shield/hit_reaction(mob/living/carbon/human/owner, attack_text, isinhands)
- if(current_charges > 0)
- var/datum/effect_system/spark_spread/s = new
- s.set_up(2, 1, src)
- s.start()
- owner.visible_message("[owner]'s shields deflect [attack_text] in a shower of sparks!")
+ if(current_charges)
+ owner.visible_message("\The [attack_text] is deflected by a burst of blood-red sparks!")
current_charges--
- if(current_charges <= 0)
- owner.visible_message("[owner]'s shield is destroyed!")
- shield_state = "broken"
+ PoolOrNew(/obj/effect/overlay/temp/cult/sparks, get_turf(owner))
+ if(!current_charges)
+ owner.visible_message("The glowing sparks around [owner] suddenly disappear!")
owner.update_inv_wear_suit()
return 1
return 0
/obj/item/clothing/suit/hooded/cultrobes/cult_shield/worn_overlays(isinhands)
. = list()
- if(!isinhands)
- . += image(icon = 'icons/effects/effects.dmi', icon_state = "[shield_state]")
+ if(!isinhands && current_charges)
+ . += image(icon = 'icons/effects/effects.dmi', icon_state = "bloodsparkles_shield")
/obj/item/clothing/suit/hooded/cultrobes/berserker
name = "flagellant's robes"
@@ -205,7 +203,7 @@
slowdown = -1
hooded = 1
hoodtype = /obj/item/clothing/head/berserkerhood
-
+
/obj/item/clothing/head/berserkerhood
name = "flagellant's robes"
desc = "Blood-soaked garb infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage."
@@ -214,8 +212,8 @@
flags = NODROP
flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
armor = list(melee = -100, bullet = -100, laser = -100,energy = -100, bomb = -100, bio = -100, rad = -100)
-
-/obj/item/clothing/suit/hooded/cultrobes/berserker/pickup(mob/living/user)
+
+/obj/item/clothing/suit/hooded/cultrobes/berserker/equipped(mob/user, slot)
..()
if(!iscultist(user))
user << "\"I wouldn't advise that.\""
@@ -223,7 +221,7 @@
user.unEquip(src, 1)
user.Dizzy(30)
user.Weaken(5)
-
+
/obj/item/clothing/glasses/night/cultblind
desc = "May nar-sie guide you through the darkness and shield you from the light."
name = "zealot's blindfold"
@@ -231,15 +229,15 @@
item_state = "blindfold"
darkness_view = 8
flash_protect = 1
-
-/obj/item/clothing/glasses/night/cultblind/pickup(mob/living/user)
+
+/obj/item/clothing/glasses/night/cultblind/equipped(mob/user, slot)
..()
if(!iscultist(user))
- user << "\"I wouldn't advise that.\""
- user << "An overwhelming sense of nausea overpowers you!"
+ user << "\"You want to be blind, do you?\""
user.unEquip(src, 1)
user.Dizzy(30)
user.Weaken(5)
+ user.blind_eyes(30)
/obj/item/weapon/reagent_containers/food/drinks/bottle/unholywater
name = "flask of unholy water"
@@ -255,7 +253,7 @@
icon_state ="bluespace"
color = "#ff0000"
var/global/curselimit = 0
-
+
/obj/item/device/shuttle_curse/attack_self(mob/user)
if(!iscultist(user))
user.unEquip(src, 1)
@@ -284,48 +282,58 @@
var/message = pick_n_take(curses)
priority_announce("[message]", "System Failure", 'sound/misc/notice1.ogg')
curselimit++
-
+
/obj/item/device/cult_shift
name = "veil shifter"
- desc = "The veil between worlds is weak, this relic teleports you forward a small distance. It may be used twice before its power is lost."
+ desc = "This relic teleports you forward a medium distance."
icon = 'icons/obj/cult.dmi'
icon_state ="shifter"
var/uses = 2
-
+
+/obj/item/device/cult_shift/examine(mob/user)
+ ..()
+ if(uses)
+ user << "It has [uses] uses remaining."
+ else
+ user << "It seems drained."
+
/obj/item/device/cult_shift/proc/handle_teleport_grab(turf/T, mob/user)
- var/mob/living/carbon/human/H = user
- if(H.pulling && (istype(H.pulling, /mob/living)))
- var/mob/living/victim = H.pulling
- if(!victim.anchored)
- victim.forceMove(locate(T.x+rand(-1,1),T.y+rand(-1,1),T.z))
- return
+ . = null
+ var/mob/living/carbon/C = user
+ if(C.pulling)
+ var/atom/movable/pulled = C.pulling
+ pulled.forceMove(T)
+ . = pulled
/obj/item/device/cult_shift/attack_self(mob/user)
+ if(!uses || !iscarbon(user))
+ user << "\The [src] is dull and unmoving in your hands."
+ return
if(!iscultist(user))
user.unEquip(src, 1)
- user.Weaken(5)
- user << "A powerful force shoves you away from [src]!"
+ step(src, pick(alldirs))
+ user << "\The [src] flickers out of your hands, too eager to move!"
return
- uses--
- if (uses<1)
- qdel(src)
- var/mob/living/carbon/human/H = user
- var/turf/destination = get_teleport_loc(H.loc,H,9,1,3,1,0,1)
- var/turf/mobloc = get_turf(H.loc)//Safety
- if(destination&&istype(mobloc, /turf))//So we don't teleport out of containers
- spawn(0)
- playsound(H.loc, "sparks", 50, 1)
- anim(mobloc,src,'icons/mob/mob.dmi',,"cultout",,H.dir)
+ var/mob/living/carbon/C = user
+ var/turf/mobloc = get_turf(C)
+ var/turf/destination = get_teleport_loc(mobloc,C,9,1,3,1,0,1)
- handle_teleport_grab(destination, H)
- H.loc = destination
+ if(destination)
+ uses--
+ if(uses <= 0)
+ icon_state ="shifter_drained"
+ playsound(mobloc, "sparks", 50, 1)
+ PoolOrNew(/obj/effect/overlay/temp/cult/phase/out, list(mobloc, C.dir))
+
+ var/atom/movable/pulled = handle_teleport_grab(destination, C)
+ C.forceMove(destination)
+ if(pulled)
+ C.start_pulling(pulled) //forcemove resets pulls, so we need to re-pull
+
+ PoolOrNew(/obj/effect/overlay/temp/cult/phase, list(destination, C.dir))
+ playsound(destination, 'sound/effects/phasein.ogg', 25, 1)
+ playsound(destination, "sparks", 50, 1)
- spawn(0)
- PoolOrNew(/obj/effect/particle_effect/sparks, H.loc)
- playsound(H.loc, 'sound/effects/phasein.ogg', 25, 1)
- playsound(H.loc, "sparks", 50, 1)
- anim(H.loc,H,'icons/mob/mob.dmi',,"cultin",,H.dir)
-
else
- H << "The veil cannot be torn here!"
+ C << "The veil cannot be torn here!"
diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm
index 3c3ccf77cdb..a4648b5fac6 100644
--- a/code/game/gamemodes/cult/cult_structures.dm
+++ b/code/game/gamemodes/cult/cult_structures.dm
@@ -6,42 +6,46 @@
var/health = 100
var/maxhealth = 100
+/obj/structure/cult/examine(mob/user)
+ ..()
+ if(iscultist(user) && cooldowntime > world.time)
+ user << "The magic in [src] is weak, it will be ready to use again in [getETA()]."
+
/obj/structure/cult/proc/getETA()
- var/time = round((0-(world.time-cooldowntime))/600, 1)
- var/eta = "[time] minutes."
- if(time == 1)
- eta = "about one minute."
- else if(time == 0)
- eta = "less than thirty seconds."
- return eta
-
+ var/time = (cooldowntime - world.time)/600
+ var/eta = "[round(time, 1)] minutes"
+ if(time <= 1)
+ time = (cooldowntime - world.time)*0.1
+ eta = "[round(time, 1)] seconds"
+ return eta
+
/obj/structure/cult/talisman
name = "altar"
desc = "A bloodstained altar dedicated to Nar-Sie."
icon_state = "talismanaltar"
-
/obj/structure/cult/talisman/attack_hand(mob/living/user)
if(!iscultist(user))
- user << "You don't even begin to understand what these words mean..."
+ user << "You're pretty sure you know exactly what this is used for and you can't seem to touch it."
return
if(cooldowntime > world.time)
- user << "The magic here is weak, it will be ready to use again in [getETA()]. "
+ user << "The magic in [src] is weak, it will be ready to use again in [getETA()]."
return
- cooldowntime = world.time + 2400
var/choice = alert(user,"You study the schematics etched into the forge...",,"Eldritch Whetstone","Zealot's Blindfold","Flask of Unholy Water")
+ var/pickedtype
switch(choice)
if("Eldritch Whetstone")
- var/obj/item/weapon/sharpener/cult/N = new(get_turf(src))
- user << "You kneel before the altar and your faith is rewarded with an [N.name]!"
+ pickedtype = /obj/item/weapon/sharpener/cult
if("Zealot's Blindfold")
- var/obj/item/clothing/glasses/night/cultblind/N = new(get_turf(src))
- user << "You kneel before the altar and your faith is rewarded with a [N.name]!"
+ pickedtype = /obj/item/clothing/glasses/night/cultblind
if("Flask of Unholy Water")
- var/obj/item/weapon/reagent_containers/food/drinks/bottle/unholywater/N = new(get_turf(src))
- user << "You kneel before the altar and your faith is rewarded with a [N.name]!"
-
-
+ pickedtype = /obj/item/weapon/reagent_containers/food/drinks/bottle/unholywater
+ if(pickedtype && Adjacent(user) && src && !qdeleted(src) && !user.incapacitated() && cooldowntime <= world.time)
+ cooldowntime = world.time + 2400
+ var/obj/item/N = new pickedtype(get_turf(src))
+ user << "You kneel before the altar and your faith is rewarded with an [N]!"
+
+
/obj/structure/cult/forge
name = "daemon forge"
desc = "A forge used in crafting the unholy weapons used by the armies of Nar-Sie."
@@ -50,24 +54,25 @@
/obj/structure/cult/forge/attack_hand(mob/living/user)
if(!iscultist(user))
- user << "You don't even begin to understand what these words mean..."
+ user << "The heat radiating from [src] pushes you back."
return
if(cooldowntime > world.time)
- user << "The magic here is weak, it will be ready to use again in [getETA()]. "
+ user << "The magic in [src] is weak, it will be ready to use again in [getETA()]."
return
- cooldowntime = world.time + 2400
var/choice = alert(user,"You study the schematics etched into the forge...",,"Shielded Robe","Flagellant's Robe","Nar-Sien Hardsuit")
+ var/pickedtype
switch(choice)
if("Shielded Robe")
- var/obj/item/clothing/suit/hooded/cultrobes/cult_shield/N = new(get_turf(src))
- user << "You work the forge as dark knowledge guides your hands, creating [N]!"
+ pickedtype = /obj/item/clothing/suit/hooded/cultrobes/cult_shield
if("Flagellant's Robe")
- var/obj/item/clothing/suit/hooded/cultrobes/berserker/N = new(get_turf(src))
- user << "You work the forge as dark knowledge guides your hands, creating [N]!"
+ pickedtype = /obj/item/clothing/suit/hooded/cultrobes/berserker
if("Nar-Sien Hardsuit")
- new /obj/item/clothing/head/helmet/space/cult(get_turf(src))
- var /obj/item/clothing/suit/space/cult/N = new(get_turf(src))
- user << "You work the forge as dark knowledge guides your hands, creating [N]!"
+ pickedtype = /obj/item/clothing/suit/space/hardsuit/cult
+ if(pickedtype && Adjacent(user) && src && !qdeleted(src) && !user.incapacitated() && cooldowntime <= world.time)
+ cooldowntime = world.time + 2400
+ var/obj/item/N = new pickedtype(get_turf(src))
+ user << "You work the forge as dark knowledge guides your hands, creating [N]!"
+
/obj/structure/cult/pylon
name = "pylon"
@@ -84,13 +89,13 @@
for(var/i in 1 to 5)
for(var/t in corruption)
var/turf/T = t
- corruption |= T.GetAtmosAdjacentTurfs()
+ corruption |= T.GetAtmosAdjacentTurfs()
..()
/obj/structure/cult/pylon/Destroy()
SSobj.processing.Remove(src)
return ..()
-
+
/obj/structure/cult/pylon/process()
if((last_shot + heal_delay) <= world.time)
last_shot = world.time
@@ -108,10 +113,11 @@
if(corruption.len)
var/turf/T = pick_n_take(corruption)
corruption -= T
- if (istype(T, /turf/open/floor/engine/cult) || istype(T, /turf/open/space) || istype(T, /turf/open/floor/plating/lava))
+ if(istype(T, /turf/open/floor/engine/cult) || istype(T, /turf/open/space) || istype(T, /turf/open/floor/plating/lava))
return
T.ChangeTurf(/turf/open/floor/engine/cult)
+
/obj/structure/cult/tome
name = "archives"
desc = "A desk covered in arcane manuscripts and tomes in unknown languages. Looking at the text makes your skin crawl."
@@ -120,25 +126,25 @@
/obj/structure/cult/tome/attack_hand(mob/living/user)
if(!iscultist(user))
- user << "You don't even begin to understand what these words mean..."
+ user << "All of these books seem to be gibberish."
return
if(cooldowntime > world.time)
- user << "The magic here is weak, it will be ready to use again in [getETA()]. "
+ user << "The magic in [src] is weak, it will be ready to use again in [getETA()]."
return
- cooldowntime = world.time + 2400
- var/choice = alert(user,"You flip through the black pages of the archives...",,"Supply Talisman","Shuttle Curse","Veil Shift")
+ var/choice = alert(user,"You flip through the black pages of the archives...",,"Supply Talisman","Shuttle Curse","Veil Shifter")
+ var/pickedtype
switch(choice)
if("Supply Talisman")
- var/obj/item/weapon/paper/talisman/supply/N = new(get_turf(src))
- N.uses = 2
- user << "You summon [N] from the archives!"
+ pickedtype = /obj/item/weapon/paper/talisman/supply/weak
if("Shuttle Curse")
- var/obj/item/device/shuttle_curse/N = new(get_turf(src))
- user << "You summon [N] from the archives!"
- if("Veil Shift")
- var /obj/item/device/cult_shift/N = new(get_turf(src))
- user << "You summon [N] from the archives!"
-
+ pickedtype = /obj/item/device/shuttle_curse
+ if("Veil Shifter")
+ pickedtype = /obj/item/device/cult_shift
+ if(pickedtype && Adjacent(user) && src && !qdeleted(src) && !user.incapacitated() && cooldowntime <= world.time)
+ cooldowntime = world.time + 2400
+ var/obj/item/N = new pickedtype(get_turf(src))
+ user << "You summon [N] from the archives!"
+
/obj/effect/gateway
name = "gateway"
desc = "You're pretty sure that abyss is staring back."
diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm
index 09d2e4be1c3..e1c5f6c3350 100644
--- a/code/game/gamemodes/cult/talisman.dm
+++ b/code/game/gamemodes/cult/talisman.dm
@@ -101,6 +101,9 @@
visible_message("[src] crumbles to dust.")
qdel(src)
+/obj/item/weapon/paper/talisman/supply/weak
+ uses = 2
+
//Rite of Translocation: Same as rune
/obj/item/weapon/paper/talisman/teleport
cultist_name = "Talisman of Teleportation"
@@ -330,19 +333,17 @@
new /obj/structure/constructshell(T)
user << "The talisman clings to the metal and twists it into a construct shell!"
user << sound('sound/effects/magic.ogg',0,1,25)
- PoolOrNew(/obj/effect/overlay/temp/cult/turf/open/floor, T)
qdel(src)
if(istype(target, /obj/item/stack/sheet/plasteel))
var/quantity = target.amount
var/turf/T = get_turf(target)
new /obj/item/stack/sheet/runed_metal(T,quantity)
target.use(quantity)
- user << "The talisman clings to the plasteel and runes of power appear on the surface!"
+ user << "The talisman clings to the plasteel, transforming it into runed metal!"
user << sound('sound/effects/magic.ogg',0,1,25)
- PoolOrNew(/obj/effect/overlay/temp/cult/turf/open/floor, T)
qdel(src)
else
- user << "The talisman requires metal or plasteel!"
+ user << "The talisman must be used on metal or plasteel!"
//Talisman of Shackling: Applies special cuffs directly from the talisman
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index f265bfe46ef..836b1fc81d0 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -320,20 +320,27 @@
doortype = /obj/structure/door_assembly/door_assembly_cult
hackProof = 1
aiControlDisabled = 1
+ var/openingoverlaytype = /obj/effect/overlay/temp/cult/door
/obj/machinery/door/airlock/cult/allowed(mob/M)
- if(!iscultist(M))
+ if(!density)
+ return 1
+ if(iscultist(M) || istype(M, /mob/living/simple_animal/shade) || istype(M, /mob/living/simple_animal/hostile/construct))
+ PoolOrNew(openingoverlaytype, src.loc)
+ return 1
+ else
PoolOrNew(/obj/effect/overlay/temp/cult/sac, src.loc)
var/atom/throwtarget
throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(M, src)))
M << pick(sound('sound/hallucinations/turn_around1.ogg',0,1,50), sound('sound/hallucinations/turn_around2.ogg',0,1,50))
+ if(M.client)
+ var/old_color = M.client.color
+ M.client.color = "#960000"
+ spawn(0)//animate is a delay, avoid delay, etc
+ animate(M.client,color = old_color, time = 20)
M.Weaken(2)
M.throw_at_fast(throwtarget, 5, 1,src)
return 0
- else
- PoolOrNew(/obj/effect/overlay/temp/cult/door, src.loc)
- return 1
-
/obj/machinery/door/airlock/cult/narsie_act()
return
@@ -347,6 +354,7 @@
icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi'
overlays_file = 'icons/obj/doors/airlocks/cult/unruned/overlays.dmi'
doortype = /obj/structure/door_assembly/door_assembly_cult/unruned
+ openingoverlaytype = /obj/effect/overlay/temp/cult/door/unruned
/obj/machinery/door/airlock/cult/unruned/glass
doortype = /obj/structure/door_assembly/door_assembly_cult/unruned/glass
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index 0c0b566390a..dfb1f8c5656 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -90,6 +90,24 @@
randomdir = 0
duration = 10
+/obj/effect/overlay/temp/cult/sparks
+ randomdir = 1
+ name = "blood sparks"
+ icon_state = "bloodsparkles"
+
+/obj/effect/overlay/temp/cult/phase
+ name = "phase glow"
+ duration = 7
+ icon_state = "cultin"
+
+/obj/effect/overlay/temp/cult/phase/New(loc, set_dir)
+ ..()
+ if(set_dir)
+ dir = set_dir
+
+/obj/effect/overlay/temp/cult/phase/out
+ icon_state = "cultout"
+
/obj/effect/overlay/temp/cult/sac
name = "maw of Nar-Sie"
icon_state = "sacconsume"
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 010789c22e2..a781894bfc5 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -328,7 +328,7 @@
add_fingerprint(user)
if(istype(W, /obj/item/weapon/tome) && iscultist(user)) //Cultists can demolish cult girders instantly with their tomes
user.visible_message("[user] strikes [src] with [W]!", "You demolish [src].")
- var/obj/item/stack/sheet/metal/R = new(get_turf(src))
+ var/obj/item/stack/sheet/runed_metal/R = new(get_turf(src))
R.amount = 1
qdel(src)
@@ -342,7 +342,7 @@
return
user << "You slice apart the girder."
var/obj/item/stack/sheet/runed_metal/R = new(get_turf(src))
- R.amount = 2
+ R.amount = 1
transfer_fingerprints_to(R)
qdel(src)
@@ -352,7 +352,7 @@
if(do_after(user, 30, target = src))
user << "You slice apart the girder."
var/obj/item/stack/sheet/runed_metal/R = new(get_turf(src))
- R.amount = 2
+ R.amount = 1
transfer_fingerprints_to(R)
qdel(src)
@@ -367,15 +367,16 @@
else if(istype(W, /obj/item/stack/sheet/runed_metal))
var/obj/item/stack/sheet/runed_metal/R = W
- if(R.amount < 2)
- user << "You need at least two sheets of runed metal to construct a runed wall!"
+ if(R.amount < 1)
+ user << "You need at least one sheet of runed metal to construct a runed wall!"
return 0
user.visible_message("[user] begins laying runed metal on [src]...", "You begin constructing a runed wall...")
if(!do_after(user, 50, target = src))
return 0
user.visible_message("[user] plates [src] with runed metal.", "You construct a runed wall.")
- R.use(2)
- new/turf/closed/wall/cult(get_turf(src))
+ R.use(1)
+ var/turf/T = get_turf(src)
+ T.ChangeTurf(/turf/closed/wall/cult)
qdel(src)
else
@@ -390,9 +391,9 @@
qdel(src)
if(2)
if(prob(30))
- new/obj/item/stack/sheet/runed_metal/(get_turf(src), 2)
+ new/obj/item/stack/sheet/runed_metal/(get_turf(src), 1)
qdel(src)
if(3)
if(prob(5))
- new/obj/item/stack/sheet/runed_metal/(get_turf(src), 2)
+ new/obj/item/stack/sheet/runed_metal/(get_turf(src), 1)
qdel(src)
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index 038bfb3fd26..4807d34115a 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -12,12 +12,11 @@
..()
/turf/closed/wall/cult/break_wall()
- new/obj/item/stack/sheet/metal/(get_turf(src), 1)
+ new/obj/item/stack/sheet/runed_metal(get_turf(src), 1)
return (new /obj/structure/girder/cult(src))
/turf/closed/wall/cult/devastate_wall()
- new /obj/effect/decal/cleanable/blood(src)
- new /obj/effect/decal/remains/human(src)
+ new/obj/item/stack/sheet/runed_metal(get_turf(src), 1)
/turf/closed/wall/cult/narsie_act()
return
diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm
index 79c29d2b705..e213e8e3e3c 100644
--- a/code/modules/awaymissions/mission_code/stationCollision.dm
+++ b/code/modules/awaymissions/mission_code/stationCollision.dm
@@ -151,8 +151,7 @@ var/sc_safecode5 = "[rand(0,9)]"
l_set = 1
new /obj/item/weapon/gun/energy/mindflayer(src)
new /obj/item/device/soulstone(src)
- new /obj/item/clothing/head/helmet/space/cult(src)
- new /obj/item/clothing/suit/space/cult(src)
+ new /obj/item/clothing/suit/space/hardsuit/cult(src)
//new /obj/item/weapon/teleportation_scroll(src)
new /obj/item/weapon/ore/diamond(src)
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 4ff2c3d0c03..e0ff1667a90 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -15,8 +15,7 @@
if(1)
new /obj/item/device/shared_storage/red(src)
if(2)
- new /obj/item/clothing/suit/space/cult(src)
- new /obj/item/clothing/head/helmet/space/cult(src)
+ new /obj/item/clothing/suit/space/hardsuit/cult(src)
if(3)
new /obj/item/device/soulstone/anybody(src)
if(4)
diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm
index 3adfc081740..54c5a5a6b93 100644
--- a/code/modules/spells/spell.dm
+++ b/code/modules/spells/spell.dm
@@ -115,10 +115,10 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
H << "I don't feel strong enough without my hat."
return 0
if(cult_req) //CULT_REQ CLOTHES CHECK
- if(!istype(H.wear_suit, /obj/item/clothing/suit/magusred) && !istype(H.wear_suit, /obj/item/clothing/suit/space/cult))
+ if(!istype(H.wear_suit, /obj/item/clothing/suit/magusred) && !istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/cult))
H << "I don't feel strong enough without my armor."
return 0
- if(!istype(H.head, /obj/item/clothing/head/magus) && !istype(H.head, /obj/item/clothing/head/helmet/space/cult))
+ if(!istype(H.head, /obj/item/clothing/head/magus) && !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/cult))
H << "I don't feel strong enough without my helmet."
return 0
else
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 94f1d9d735c..8b54effacbe 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 24ca7afeeac..116fbe4090c 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 11f55cbc902..0386a8e4f74 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/cult.dmi b/icons/obj/cult.dmi
index 95712fe106c..4b28d871c3e 100644
Binary files a/icons/obj/cult.dmi and b/icons/obj/cult.dmi differ