diff --git a/baystation12.dme b/baystation12.dme index 13f0147d9f7..18ec77a7490 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -139,6 +139,7 @@ #define FILE_DIR "code/unused/spacecraft" #define FILE_DIR "code/WorkInProgress" #define FILE_DIR "code/WorkInProgress/mapload" +#define FILE_DIR "code/WorkInProgress/Mini" #define FILE_DIR "code/WorkInProgress/organs" #define FILE_DIR "code/WorkInProgress/virus2" #define FILE_DIR "code/WorkInProgress/virus2/Disease2" @@ -975,6 +976,7 @@ #include "code\WorkInProgress\explosion_particles.dm" #include "code\WorkInProgress\mapload\dmm_suite.dm" #include "code\WorkInProgress\mapload\reader.dm" +#include "code\WorkInProgress\Mini\customitems.dm" #include "code\WorkInProgress\virus2\Prob.dm" #include "code\WorkInProgress\virus2\Disease2\analyser.dm" #include "code\WorkInProgress\virus2\Disease2\base.dm" diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 7c7c30c880a..996e82385f7 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -150,6 +150,7 @@ var/global/datum/controller/gameticker/ticker captainless=0 if(player.mind.assigned_role != "MODE") job_master.EquipRank(player, player.mind.assigned_role, 0) + EquipCustomItems(player) if(captainless) world << "Captainship not forced on anyone." diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 3add40623f9..057c76bb0f5 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -231,6 +231,7 @@ var/icon/char_icon = getFlatIcon(character,0)//We're creating out own cache so it's not needed. job_master.AssignRole(character, rank, 1) job_master.EquipRank(character, rank, 1) + EquipCustomItems(character) character.loc = pick(latejoin) AnnounceArrival(character, rank)