Cult hoods can be toggled (#45497)

* Cult hoods can be toggled

* oops
This commit is contained in:
Garen Crownguard
2019-07-28 05:00:50 -07:00
committed by Rob Bailey
parent 1a6bee1cdb
commit e851b6550a
8 changed files with 17 additions and 25 deletions
@@ -44,7 +44,7 @@
"l" = (
/obj/effect/decal/remains/human,
/obj/item/clothing/shoes/cult,
/obj/item/clothing/suit/cultrobes,
/obj/item/clothing/suit/hooded/cultrobes,
/turf/open/floor/engine/cult{
initial_gas_mix = "LAVALAND_ATMOS"
},
@@ -80,7 +80,7 @@
"q" = (
/obj/effect/decal/remains/human,
/obj/item/clothing/shoes/cult,
/obj/item/clothing/suit/cultrobes,
/obj/item/clothing/suit/hooded/cultrobes,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/engine/cult{
initial_gas_mix = "LAVALAND_ATMOS"
+2 -2
View File
@@ -111,8 +111,8 @@ SUBSYSTEM_DEF(traumas)
/obj/item/card/id/captains_spare, /obj/item/card/id/centcom, /obj/machinery/door/airlock/command)),
"the supernatural" = typecacheof(list(/obj/structure/destructible/cult, /obj/item/tome,
/obj/item/melee/cultblade, /obj/item/twohanded/required/cult_bastard, /obj/item/restraints/legcuffs/bola/cult,
/obj/item/clothing/suit/cultrobes, /obj/item/clothing/suit/space/hardsuit/cult,
/obj/item/melee/cultblade, /obj/item/twohanded/required/cult_bastard,
/obj/item/restraints/legcuffs/bola/cult, /obj/item/clothing/suit/space/hardsuit/cult,
/obj/item/clothing/suit/hooded/cultrobes, /obj/item/clothing/head/hooded/cult_hoodie, /obj/effect/rune,
/obj/item/stack/sheet/runed_metal, /obj/machinery/door/airlock/cult, /obj/singularity/narsie,
/obj/item/soulstone,
+1 -2
View File
@@ -663,8 +663,7 @@
var/mob/living/carbon/C = target
C.visible_message("<span class='warning'>Otherworldly armor suddenly appears on [C]!</span>")
C.equip_to_slot_or_del(new /obj/item/clothing/under/color/black,SLOT_W_UNIFORM)
C.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(user), SLOT_HEAD)
C.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(user), SLOT_WEAR_SUIT)
C.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), SLOT_WEAR_SUIT)
C.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult/alt(user), SLOT_SHOES)
C.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), SLOT_BACK)
if(C == user)
+10 -15
View File
@@ -273,7 +273,7 @@
. = ..()
/obj/item/clothing/head/culthood
/obj/item/clothing/head/hooded/cult_hoodie
name = "ancient cultist hood"
icon_state = "culthood"
desc = "A torn, dust-caked hood. Strange letters line the inside."
@@ -285,7 +285,7 @@
heat_protection = HEAD
max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
/obj/item/clothing/suit/cultrobes
/obj/item/clothing/suit/hooded/cultrobes
name = "ancient cultist robes"
desc = "A ragged, dusty set of robes. Strange letters line the inside."
icon_state = "cultrobes"
@@ -298,31 +298,26 @@
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
heat_protection = CHEST|GROIN|LEGS|ARMS
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
hoodtype = /obj/item/clothing/head/hooded/cult_hoodie
/obj/item/clothing/head/culthood/alt
/obj/item/clothing/head/hooded/cult_hoodie/alt
name = "cultist hood"
desc = "An armored hood worn by the followers of Nar'Sie."
icon_state = "cult_hoodalt"
item_state = "cult_hoodalt"
/obj/item/clothing/head/culthood/alt/ghost
item_flags = DROPDEL
/obj/item/clothing/head/culthood/alt/ghost/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)
/obj/item/clothing/suit/cultrobes/alt
/obj/item/clothing/suit/hooded/cultrobes/alt
name = "cultist robes"
desc = "An armored set of robes worn by the followers of Nar'Sie."
icon_state = "cultrobesalt"
item_state = "cultrobesalt"
hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/alt
/obj/item/clothing/suit/cultrobes/alt/ghost
/obj/item/clothing/suit/hooded/cultrobes/alt/ghost
item_flags = DROPDEL
/obj/item/clothing/suit/cultrobes/alt/ghost/Initialize()
/obj/item/clothing/suit/hooded/cultrobes/alt/ghost/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)
@@ -387,9 +382,9 @@
body_parts_covered = CHEST|GROIN|LEGS|ARMS
allowed = list(/obj/item/tome, /obj/item/melee/cultblade)
var/current_charges = 3
hoodtype = /obj/item/clothing/head/hooded/cult_hoodie
hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/cult_shield
/obj/item/clothing/head/hooded/cult_hoodie
/obj/item/clothing/head/hooded/cult_hoodie/cult_shield
name = "empowered cultist armor"
desc = "Empowered garb which creates a powerful shield around the user."
icon_state = "cult_hoodalt"
+1 -2
View File
@@ -262,9 +262,8 @@
name = "Cultist Ghost"
uniform = /obj/item/clothing/under/color/black/ghost
suit = /obj/item/clothing/suit/cultrobes/alt/ghost
suit = /obj/item/clothing/suit/hooded/cultrobes/alt/ghost
shoes = /obj/item/clothing/shoes/cult/alt/ghost
head = /obj/item/clothing/head/culthood/alt/ghost
r_hand = /obj/item/melee/cultblade/ghost
/datum/outfit/wizard
@@ -363,8 +363,7 @@
mask = /obj/item/clothing/mask/breath
if("Cultist")
uniform = /obj/item/clothing/under/roman
suit = /obj/item/clothing/suit/cultrobes
head = /obj/item/clothing/head/culthood
suit = /obj/item/clothing/suit/hooded/cultrobes
suit_store = /obj/item/tome
r_pocket = /obj/item/restraints/legcuffs/bola/cult
l_pocket = /obj/item/melee/cultblade/dagger
Binary file not shown.

Before

Width:  |  Height:  |  Size: 349 KiB

After

Width:  |  Height:  |  Size: 342 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 124 KiB

After

Width:  |  Height:  |  Size: 121 KiB