Skip to content

Commit

Permalink
Fix skeleton and deathknight latejoin (#627)
Browse files Browse the repository at this point in the history
* fix skeleton latejoin

* skeleton job title
  • Loading branch information
PotatoTomahto authored Feb 5, 2025
1 parent 28bf0c2 commit aef1409
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
7 changes: 6 additions & 1 deletion code/__DEFINES/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
#define ADVENTURER (1<<9)
#define COOK (1<<10)
#define GRABBER (1<<11)
#define BARD (1<<12)
#define BARD (1<<12)
#define CHEESEMAKER (1<<13)
#define MIGRANT (1<<16)
#define BANDIT (1<<17)
Expand All @@ -167,6 +167,11 @@
#define CHURCHLING (1<<2)
#define ORPHAN (1<<3)

#define UNDEAD (1<<10)

#define DEATHKNIGHT (1<<0)
#define SKELETON (1<<1)

#define JCOLOR_NOBLE "#9c40bf"
#define JCOLOR_MERCHANT "#c2b449"
#define JCOLOR_SOLDIER "#b64949"
Expand Down
6 changes: 3 additions & 3 deletions code/modules/jobs/job_types/roguetown/other/deathknight.dm
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/datum/job/roguetown/deathknight
title = "Death Knight"
flag = GRAVETENDER
department_flag = PEASANTS
flag = DEATHKNIGHT
department_flag = UNDEAD
faction = "Station"
total_positions = 0
total_positions = -1
spawn_positions = 0

allowed_sexes = list(MALE, FEMALE)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/jobs/job_types/roguetown/other/skeleton.dm
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/datum/job/roguetown/skeleton
title = "skeleton"
flag = GRAVETENDER
// department_flag = PEASANTS
title = "Skeleton"
flag = SKELETON
department_flag = UNDEAD
faction = "Station"
total_positions = 0
total_positions = -1
spawn_positions = 0

allowed_sexes = list(MALE, FEMALE)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/dead/new_player/new_player.dm
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/Lore_Primer.json")
var/datum/game_mode/chaosmode/C = SSticker.mode
if(istype(C))
if(C.skeletons)
dat += "<a class='job command' href='byond://?src=[REF(src)];SelectedJob=skeleton'>BECOME AN EVIL SKELETON</a>"
dat += "<a class='job command' href='byond://?src=[REF(src)];SelectedJob=Skeleton'>BECOME AN EVIL SKELETON</a>"
dat += "</fieldset><br>"
column_counter++
if(column_counter > 0 && (column_counter % 3 == 0))
Expand Down

0 comments on commit aef1409

Please sign in to comment.