Skip to content

Commit 7a0e04d

Browse files
Updating Pyrelight content to Neb dev.
1 parent fb4bfde commit 7a0e04d

File tree

5 files changed

+30
-32
lines changed

5 files changed

+30
-32
lines changed

code/modules/mob/living/human/human.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1145,7 +1145,7 @@
11451145
/mob/living/human/get_attack_telegraph_delay()
11461146
return client ? 0 : DEFAULT_ATTACK_COOLDOWN
11471147

1148-
/mob/living/human/set_status(condition, amount)
1148+
/mob/living/human/set_status_condition(condition, amount)
11491149
if(has_trait(/decl/trait/undead))
11501150
var/static/list/ignore_status_conditions = list(
11511151
STAT_BLIND,

mods/pyrelight/datum/traits/_wyrd_categories.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
anima of the wilds, carried down through blood and manifesting in strange ways. The \
5252
wyrdmarked are often treated with mistrust or fear by the general populace, leading \
5353
many to cover their wyrdmarks and hide their nature."
54-
permitted_species = list(SPECIES_HUMAN)
54+
permitted_species = list(/decl/species/human::uid)
5555
uid = "trait_wyrd_wild"
5656
/*
5757
incompatible_with = list(

mods/pyrelight/undead/undead.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/mob/living/human/proc/grant_basic_undead_equipment()
99

1010
var/species_name = get_species_name()
11-
if(species_name == SPECIES_HUMAN || species_name == SPECIES_HNOLL)
11+
if(species_name == /decl/species/human::name || species_name == /decl/species/hnoll::name)
1212
var/pants_type = pick(/obj/item/clothing/pants/trousers, /obj/item/clothing/pants/trousers/braies)
1313
equip_to_slot_or_del(new pants_type(src), slot_w_uniform_str)
1414

@@ -26,7 +26,7 @@
2626
put_in_inactive_hand(new /obj/item/shield/crafted/buckler(src))
2727
return
2828

29-
if(species_name == SPECIES_KOBALOI)
29+
if(species_name == /decl/species/kobaloi::name)
3030

3131
var/pants_type = pick(/obj/item/clothing/pants/trousers/braies, /obj/item/clothing/pants/loincloth)
3232
equip_to_slot_or_del(new pants_type(src), slot_w_uniform_str)

mods/pyrelight/undead/undead_skeleton.dm

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,28 +32,27 @@
3232
/mob/living/human/skeleton
3333
skillset = /datum/skillset/undead
3434

35-
/mob/living/human/skeleton/post_setup(species_name, datum/mob_snapshot/supplied_appearance)
35+
/mob/living/human/skeleton/post_setup(species_uid, datum/mob_snapshot/supplied_appearance)
3636
. = ..()
3737
make_skeleton()
3838
grant_basic_undead_equipment()
3939

40-
/mob/living/human/skeleton/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance)
41-
if(!species_name)
42-
species_name = SPECIES_HUMAN
40+
/mob/living/human/skeleton/Initialize(mapload, species_uid, datum/mob_snapshot/supplied_appearance)
41+
if(!species_uid)
42+
species_uid = /decl/species/human::uid
4343
. = ..()
4444

45-
/mob/living/human/skeleton/hnoll/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance)
46-
if(!species_name)
47-
species_name = SPECIES_HNOLL
45+
/mob/living/human/skeleton/hnoll/Initialize(mapload, species_uid, datum/mob_snapshot/supplied_appearance)
46+
if(!species_uid)
47+
species_uid = /decl/species/hnoll::uid
4848
. = ..()
4949

50-
/mob/living/human/skeleton/kobaloi/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance)
51-
if(!species_name)
52-
species_name = SPECIES_KOBALOI
50+
/mob/living/human/skeleton/kobaloi/Initialize(mapload, species_uid, datum/mob_snapshot/supplied_appearance)
51+
if(!species_uid)
52+
species_uid = /decl/species/kobaloi::uid
5353
. = ..()
5454

55-
/mob/living/human/skeleton/meredrake/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance)
56-
if(!species_name)
57-
var/decl/species/grafadreka/drakes = GET_DECL(/decl/species/grafadreka)
58-
species_name = drakes.name
55+
/mob/living/human/skeleton/meredrake/Initialize(mapload, species_uid, datum/mob_snapshot/supplied_appearance)
56+
if(!species_uid)
57+
species_uid = /decl/species/grafadreka::uid
5958
. = ..()

mods/pyrelight/undead/undead_zombie.dm

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,28 +58,27 @@
5858
/mob/living/human/zombie
5959
skillset = /datum/skillset/undead
6060

61-
/mob/living/human/zombie/post_setup(species_name, datum/mob_snapshot/supplied_appearance)
61+
/mob/living/human/zombie/post_setup(species_uid, datum/mob_snapshot/supplied_appearance)
6262
. = ..()
6363
make_zombie()
6464
grant_basic_undead_equipment()
6565

66-
/mob/living/human/zombie/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance)
67-
if(!species_name)
68-
species_name = SPECIES_HUMAN
66+
/mob/living/human/zombie/Initialize(mapload, species_uid, datum/mob_snapshot/supplied_appearance)
67+
if(!species_uid)
68+
species_uid = /decl/species/human::uid
6969
. = ..()
7070

71-
/mob/living/human/zombie/hnoll/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance)
72-
if(!species_name)
73-
species_name = SPECIES_HNOLL
71+
/mob/living/human/zombie/hnoll/Initialize(mapload, species_uid, datum/mob_snapshot/supplied_appearance)
72+
if(!species_uid)
73+
species_uid = /decl/species/hnoll::uid
7474
. = ..()
7575

76-
/mob/living/human/zombie/kobaloi/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance)
77-
if(!species_name)
78-
species_name = SPECIES_KOBALOI
76+
/mob/living/human/zombie/kobaloi/Initialize(mapload, species_uid, datum/mob_snapshot/supplied_appearance)
77+
if(!species_uid)
78+
species_uid = /decl/species/kobaloi::uid
7979
. = ..()
8080

81-
/mob/living/human/zombie/meredrake/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance)
82-
if(!species_name)
83-
var/decl/species/grafadreka/drakes = GET_DECL(/decl/species/grafadreka)
84-
species_name = drakes.name
81+
/mob/living/human/zombie/meredrake/Initialize(mapload, species_uid, datum/mob_snapshot/supplied_appearance)
82+
if(!species_uid)
83+
species_uid = /decl/species/grafadreka::uid
8584
. = ..()

0 commit comments

Comments
 (0)