Plasmamen can now wear Cult Robes. The old "armor" is still available from vox traders. Also fixed lots of plasmamen cult robes/armor interactions. And adding winter robes too why not. Can this title get any longer? (#34676)

* Fixed Plasmaman Cult Robes and Armor

* plasmaman cult armor temp management

* plasmaman plasmatank

* and tank back

* ok let's do this differently

* alright

* hurr

* heh

* winter cult clothes
This commit is contained in:
DeityLink
2023-07-17 17:45:42 +02:00
committed by GitHub
parent 97f02e1df8
commit e265328273
21 changed files with 164 additions and 33 deletions

View File

@@ -1156,11 +1156,17 @@ var/list/arcane_tomes = list()
body_parts_visible_override = FACE
siemens_coefficient = 0
heat_conductivity = SPACESUIT_HEAT_CONDUCTIVITY
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED, PLASMAMAN_SHAPED)
clothing_flags = PLASMAGUARD|CONTAINPLASMAMAN
mech_flags = MECH_SCAN_FAIL
actions_types = list(/datum/action/item_action/toggle_anon)
var/anon_mode = FALSE
/obj/item/clothing/head/culthood/snow
name = "cult winter hood"
desc = "A warm hood worn by the followers of Nar-Sie."
icon_state = "culthood_snow"
/obj/item/clothing/head/culthood/NoiseDampening() // those hoods cover the ears
return TRUE
@@ -1181,13 +1187,13 @@ var/list/arcane_tomes = list()
return
if(!anon_mode)
icon_state = "culthood_anon"
icon_state = initial(icon_state) + "_anon"
body_parts_covered = FULL_HEAD|HIDEHAIR
body_parts_visible_override = 0
hides_identity = HIDES_IDENTITY_ALWAYS
to_chat(user, "<span class='notice'>The hood's textile reacts with your soul and produces a shadow over your face that will hide your identity.</span>")
else
icon_state = "culthood"
icon_state = initial(icon_state)
body_parts_covered = EARS|HEAD|HIDEHAIR
body_parts_visible_override = FACE
hides_identity = HIDES_IDENTITY_DEFAULT
@@ -1198,12 +1204,22 @@ var/list/arcane_tomes = list()
/obj/item/clothing/head/culthood/unequipped(mob/user, var/from_slot = null)
..()
icon_state = "culthood"
icon_state = initial(icon_state)
body_parts_covered = EARS|HEAD|HIDEHAIR
body_parts_visible_override = FACE
hides_identity = HIDES_IDENTITY_DEFAULT
anon_mode = FALSE
//plasmaman stuff
/obj/item/clothing/head/culthood/mob_can_equip(mob/M, slot, disable_warning = 0, automatic = 0)
. = ..()
if (.)
if(isplasmaman(M))
body_parts_covered = FULL_HEAD|HIDEHAIR
body_parts_visible_override = 0
else
body_parts_covered = EARS|HEAD|HIDEHAIR
body_parts_visible_override = FACE
/obj/item/clothing/head/culthood/get_cult_power()
return 20
@@ -1272,13 +1288,24 @@ var/list/arcane_tomes = list()
icon_state = "cultrobes"
item_state = "cultrobes"
flags = FPRINT
allowed = list(/obj/item/weapon/melee/cultblade,/obj/item/weapon/melee/soulblade,/obj/item/weapon/tome,/obj/item/weapon/talisman,/obj/item/weapon/blood_tesseract)
allowed = list(/obj/item/weapon/melee/cultblade,/obj/item/weapon/melee/soulblade,/obj/item/weapon/tome,/obj/item/weapon/talisman,/obj/item/weapon/blood_tesseract,/obj/item/weapon/tank)
armor = list(melee = 50, bullet = 30, laser = 30,energy = 20, bomb = 25, bio = 25, rad = 0)
siemens_coefficient = 0
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
clothing_flags = ONESIZEFITSALL
heat_conductivity = ARMOUR_HEAT_CONDUCTIVITY
species_fit = list(VOX_SHAPED, INSECT_SHAPED, PLASMAMAN_SHAPED)
clothing_flags = PLASMAGUARD|CONTAINPLASMAMAN|ONESIZEFITSALL
mech_flags = MECH_SCAN_FAIL
//plasmaman stuff
var/next_extinguish=0
var/extinguish_cooldown=10 SECONDS
/obj/item/clothing/suit/cultrobes/snow
name = "cult winter robes"
desc = "A set of warm armored robes worn by the followers of Nar-Sie."
icon_state = "cultrobes_snow"
heat_conductivity = SPACESUIT_HEAT_CONDUCTIVITY
/obj/item/clothing/suit/cultrobes/get_cult_power()
return 50
@@ -1288,6 +1315,31 @@ var/list/arcane_tomes = list()
/obj/item/clothing/suit/cultrobes/salt_act()
acid_melt()
//plasmaman stuff
/obj/item/clothing/suit/cultrobes/mob_can_equip(mob/M, slot, disable_warning = 0, automatic = 0)
. = ..()
if (.)
if(isplasmaman(M))
body_parts_covered = ARMS|LEGS|FULL_TORSO|FEET|HANDS
else
body_parts_covered = ARMS|LEGS|FULL_TORSO
//plasmaman stuff
/obj/item/clothing/suit/cultrobes/Extinguish(var/mob/living/carbon/human/H)
if(next_extinguish > world.time)
return
next_extinguish = world.time + extinguish_cooldown
to_chat(H, "<span class='warning'>Your armor automatically extinguishes the fire.</span>")
H.ExtinguishMob()
//plasmaman stuff
/obj/item/clothing/suit/cultrobes/regulate_temp_of_wearer(var/mob/living/carbon/human/H)
if(H.bodytemperature < T0C+37)
H.bodytemperature = min(H.bodytemperature+5,T0C+37)
else
H.bodytemperature = max(H.bodytemperature-5,T0C+37)
///////////////////////////////////////CULT BACKPACK (TROPHY RACK)////////////////////////////////////////////////
/obj/item/weapon/storage/backpack/cultpack
@@ -1342,7 +1394,7 @@ var/list/arcane_tomes = list()
item_state = "culthelmet"
armor = list(melee = 60, bullet = 50, laser = 50,energy = 15, bomb = 50, bio = 30, rad = 30)
siemens_coefficient = 0
species_fit = list(VOX_SHAPED, UNDEAD_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, UNDEAD_SHAPED, INSECT_SHAPED, PLASMAMAN_SHAPED)
clothing_flags = PLASMAGUARD|CONTAINPLASMAMAN
max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
mech_flags = MECH_SCAN_FAIL
@@ -1371,11 +1423,15 @@ var/list/arcane_tomes = list()
slowdown = HARDSUIT_SLOWDOWN_MED
armor = list(melee = 60, bullet = 50, laser = 50,energy = 15, bomb = 50, bio = 30, rad = 30)
siemens_coefficient = 0
species_fit = list(VOX_SHAPED, UNDEAD_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, UNDEAD_SHAPED, INSECT_SHAPED, PLASMAMAN_SHAPED)
clothing_flags = PLASMAGUARD|CONTAINPLASMAMAN|ONESIZEFITSALL
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
mech_flags = MECH_SCAN_FAIL
//plasmaman stuff
var/next_extinguish=0
var/extinguish_cooldown=10 SECONDS
/obj/item/clothing/suit/space/cult/get_cult_power()
return 60
@@ -1385,6 +1441,23 @@ var/list/arcane_tomes = list()
/obj/item/clothing/suit/space/cult/salt_act()
acid_melt()
//plasmaman stuff
/obj/item/clothing/suit/space/cult/Extinguish(var/mob/living/carbon/human/H)
if(next_extinguish > world.time)
return
next_extinguish = world.time + extinguish_cooldown
to_chat(H, "<span class='warning'>Your armor automatically extinguishes the fire.</span>")
H.ExtinguishMob()
//plasmaman stuff
/obj/item/clothing/suit/space/cult/regulate_temp_of_wearer(var/mob/living/carbon/human/H)
if(H.bodytemperature < T0C+37)
H.bodytemperature = min(H.bodytemperature+5,T0C+37)
else
H.bodytemperature = max(H.bodytemperature-5,T0C+37)
///////////////////////////////////////I'LL HAVE TO DEAL WITH THIS STUFF LATER////////////////////////////////////////////////
/obj/item/clothing/head/culthood/old
@@ -1429,6 +1502,42 @@ var/list/arcane_tomes = list()
armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
siemens_coefficient = 0
///////////////////////////////////////OLD PLASMAMAN ARMOR (can be obtained from vox traders)///////////////////////////////////
/obj/item/clothing/suit/space/plasmaman/cultist
name = "plasmaman cultist armor"
icon_state = "plasmaman_cult"
item_state = "plasmaman_cult"
desc = "A bulky suit of armour, menacing with red energy. It looks like it would fit a plasmaman."
slowdown = NO_SLOWDOWN
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 30)
mech_flags = MECH_SCAN_FAIL
/obj/item/clothing/suit/space/plasmaman/cultist/get_cult_power()
return 60
/obj/item/clothing/suit/space/plasmaman/cultist/cultify()
return
/obj/item/clothing/suit/space/plasmaman/cultist/salt_act()
acid_melt()
/obj/item/clothing/head/helmet/space/plasmaman/cultist
name = "plasmaman cultist helmet"
icon_state = "plasmamanCult_helmet0"
base_state = "plasmamanCult_helmet"
desc = "A containment suit designed by the followers of Nar-Sie. It glows menacingly with unearthly flames."
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 30)
mech_flags = MECH_SCAN_FAIL
/obj/item/clothing/head/helmet/space/plasmaman/cultist/get_cult_power()
return 30
/obj/item/clothing/head/helmet/space/plasmaman/cultist/cultify()
return
/obj/item/clothing/head/helmet/space/plasmaman/cultist/salt_act()
acid_melt()
///////////////////////////////////////DEBUG ITEMS////////////////////////////////////////////////
//Pamphlet: turns you into a cultist
@@ -1685,6 +1794,8 @@ var/list/arcane_tomes = list()
/obj/item/clothing/shoes/cult,
/obj/item/clothing/suit/cultrobes,
/obj/item/clothing/gloves/black/cult,
/obj/item/clothing/suit/space/plasmaman/cultist,
/obj/item/clothing/head/helmet/space/plasmaman/cultist,
)
var/list/stored_gear = list()
@@ -1696,7 +1807,7 @@ var/list/arcane_tomes = list()
var/turf/T = get_turf(src)
for(var/slot in stored_gear)
var/obj/item/I = stored_gear[slot]
stored_gear.Remove(I)
stored_gear -= slot
I.forceMove(T)
if (remaining)
QDEL_NULL(remaining)
@@ -1723,6 +1834,10 @@ var/list/arcane_tomes = list()
user.put_in_hands(remaining)
remaining = null
var/obj/item/plasma_tank = null
if(isplasmaman(user))
plasma_tank = user.get_item_by_slot(slot_s_store)
for(var/obj/item/I in user)
if (is_type_in_list(I, discarded_types))
user.u_equip(I)
@@ -1758,6 +1873,8 @@ var/list/arcane_tomes = list()
else
user.equip_to_slot_or_drop(stored_slot,nslot)
stored_gear.Remove(slot)
if (plasma_tank)
user.equip_to_slot_or_drop(plasma_tank,slot_s_store)
qdel(src)
/obj/item/weapon/blood_tesseract/cultify()

View File

@@ -1979,8 +1979,15 @@ var/list/seer_rituals = list()
if (istype(R))
R.one_pulse()
var/list/potential_targets = list()
var/turf/TU = get_turf(spell_holder)
var/snow = FALSE
var/datum/zLevel/Z = map.zLevels[TU.z]
if (istype(Z, /datum/zLevel/snowsurface))
snow = TRUE
for(var/mob/living/carbon/C in TU)
potential_targets += C
if(potential_targets.len == 0)
@@ -2028,9 +2035,12 @@ var/list/seer_rituals = list()
target.u_equip(user_slot)
user_slot.forceMove(BT)
if(isplasmaman(target))
target.equip_to_slot_or_drop(new /obj/item/clothing/head/helmet/space/plasmaman/cultist(target), slot_head)
target.equip_to_slot_or_drop(new /obj/item/clothing/suit/space/plasmaman/cultist(target), slot_wear_suit)
if(snow)
target.equip_to_slot_or_drop(new /obj/item/clothing/head/culthood/snow(target), slot_head)
if (ismonkey(target))
target.equip_to_slot_or_drop(new /obj/item/clothing/monkeyclothes/cultrobes/snow(target), slot_w_uniform)
else
target.equip_to_slot_or_drop(new /obj/item/clothing/suit/cultrobes/snow(target), slot_wear_suit)
else
target.equip_to_slot_or_drop(new /obj/item/clothing/head/culthood(target), slot_head)
if (ismonkey(target))
@@ -2038,6 +2048,13 @@ var/list/seer_rituals = list()
else
target.equip_to_slot_or_drop(new /obj/item/clothing/suit/cultrobes(target), slot_wear_suit)
if(isplasmaman(target))
if (num2text(slot_s_store) in BT.stored_gear)
var/obj/item/I = BT.stored_gear[num2text(slot_s_store)]
BT.stored_gear -= num2text(slot_s_store)
I.forceMove(target)
target.equip_to_slot_or_drop(I, slot_s_store)
if (!ismonkey(target))
target.equip_to_slot_or_drop(new /obj/item/clothing/shoes/cult(target), slot_shoes)
target.equip_to_slot_or_drop(new /obj/item/clothing/gloves/black/cult(target), slot_gloves)

View File

@@ -637,6 +637,12 @@ var/global/maxStackDepth = 10
/obj/item/clothing/suit/proc/vine_protected()
return FALSE
/obj/item/clothing/suit/proc/Extinguish(var/mob/living/carbon/human/H)
return
/obj/item/clothing/suit/proc/regulate_temp_of_wearer(var/mob/living/carbon/human/H)
return
//Spacesuit
//Note: Everything in modules/clothing/spacesuits should have the entire suit grouped together.
// Meaning the the suit is defined directly after the corresponding helmet. Just like below!

View File

@@ -4,6 +4,7 @@
icon = 'icons/mob/monkey.dmi'
icon_state = "punpunsuit_icon"
item_state = "punpunsuit_item"
inhand_states = list("left_hand" = 'icons/mob/in-hand/left/monkeyclothes.dmi', "right_hand" = 'icons/mob/in-hand/right/monkeyclothes.dmi')
force = 0
throwforce = 0
throw_speed = 2
@@ -30,6 +31,12 @@
item_state = "cult_item"
armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
/obj/item/clothing/monkeyclothes/cultrobes/snow
name = "size S cult winter robes"
icon_state = "cultsnow_icon"
item_state = "cultsnow_item"
heat_conductivity = SPACESUIT_HEAT_CONDUCTIVITY
/obj/item/clothing/monkeyclothes/jumpsuit_red
name = "monkey-sized red jumpsuit"
desc = "They wear these at the thunderdome."
@@ -55,3 +62,4 @@
icon_state = "space_icon"
item_state = "space_item"
sterility = 100
heat_conductivity = SPACESUIT_HEAT_CONDUCTIVITY

View File

@@ -20,7 +20,7 @@
var/next_extinguish=0
var/extinguish_cooldown=10 SECONDS
/obj/item/clothing/suit/space/plasmaman/proc/Extinguish(var/mob/living/carbon/human/H)
/obj/item/clothing/suit/space/plasmaman/Extinguish(var/mob/living/carbon/human/H)
if(next_extinguish > world.time)
return
@@ -28,7 +28,7 @@
to_chat(H, "<span class='warning'>Your suit automatically extinguishes the fire.</span>")
H.ExtinguishMob()
/obj/item/clothing/suit/space/plasmaman/proc/regulate_temp_of_wearer(var/mob/living/carbon/human/H)
/obj/item/clothing/suit/space/plasmaman/regulate_temp_of_wearer(var/mob/living/carbon/human/H)
if(H.bodytemperature < T0C+37)
H.bodytemperature = min(H.bodytemperature+5,T0C+37)
else
@@ -407,23 +407,6 @@
to_chat(user, "<span class='info'>This helmet has a built-in camera. It's [camera ? "" : "in"]active.</span>")
//CULT
/obj/item/clothing/suit/space/plasmaman/cultist
name = "plasmaman cultist armor"
icon_state = "plasmaman_cult"
item_state = "plasmaman_cult"
desc = "A bulky suit of armour, menacing with red energy. It looks like it would fit a plasmaman."
slowdown = 1
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
/obj/item/clothing/head/helmet/space/plasmaman/cultist
name = "plasmaman cultist helmet"
icon_state = "plasmamanCult_helmet0"
base_state = "plasmamanCult_helmet"
desc = "A containment suit designed by the followers of Nar-Sie. It glows menacingly with unearthly flames."
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
//Sith
/obj/item/clothing/suit/space/plasmaman/sith

View File

@@ -71,7 +71,7 @@
host.adjust_fire_stacks(0.5)
host.IgniteMob()
else
var/obj/item/clothing/suit/space/plasmaman/PS=host.wear_suit
var/obj/item/clothing/suit/PS=host.wear_suit
if(istype(PS))
if(host.fire_stacks > 0)
PS.Extinguish(host)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 238 KiB

After

Width:  |  Height:  |  Size: 240 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 666 B

After

Width:  |  Height:  |  Size: 1005 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 633 B

After

Width:  |  Height:  |  Size: 1002 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 KiB

After

Width:  |  Height:  |  Size: 171 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 128 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 KiB

After

Width:  |  Height:  |  Size: 272 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 KiB

After

Width:  |  Height:  |  Size: 220 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 458 KiB

After

Width:  |  Height:  |  Size: 457 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 159 KiB

After

Width:  |  Height:  |  Size: 159 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 198 KiB

After

Width:  |  Height:  |  Size: 198 KiB