diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 43dcdb2f93a..919f4bc6868 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -122,8 +122,6 @@ GLOBAL_PROTECT(admin_ranks) // this shit is being protected for obvious reasons if(admin_datum) admin_datum.associate(GLOB.directory[admin_ckey]) - if(admin_ckey in GLOB.directory) - var/client/admin = GLOB.directory[admin_ckey] if(!silent) message_admins("Admin permissions for [admin_ckey] have been reloaded.") @@ -172,7 +170,7 @@ GLOBAL_PROTECT(admin_ranks) // this shit is being protected for obvious reasons var/datum/db_query/get_admins = SSdbcore.NewQuery({" SELECT - admin.ckey, + admin.ckey, -- Use the display_rank if set, otherwise the name of their permissions_rank. IFNULL(admin.display_rank, admin_ranks.name), -- Permissions start with their admin rank permissions (if any) diff --git a/paradise.dme b/paradise.dme index dec989b5452..ed69b1cf3da 100644 --- a/paradise.dme +++ b/paradise.dme @@ -466,8 +466,8 @@ #include "code\datums\ai\basic_mobs\basic_ai_behaviors\nearest_targeting.dm" #include "code\datums\ai\basic_mobs\basic_ai_behaviors\run_away_from_target.dm" #include "code\datums\ai\basic_mobs\basic_ai_behaviors\stop_and_stare.dm" -#include "code\datums\ai\basic_mobs\basic_ai_behaviors\targeted_mob_abilities.dm" #include "code\datums\ai\basic_mobs\basic_ai_behaviors\swirl_around.dm" +#include "code\datums\ai\basic_mobs\basic_ai_behaviors\targeted_mob_abilities.dm" #include "code\datums\ai\basic_mobs\basic_ai_behaviors\targeting.dm" #include "code\datums\ai\basic_mobs\basic_ai_behaviors\tipped_reaction.dm" #include "code\datums\ai\basic_mobs\basic_ai_behaviors\travel_towards.dm" @@ -483,8 +483,8 @@ #include "code\datums\ai\basic_mobs\basic_subtrees\simple_attack_target.dm" #include "code\datums\ai\basic_mobs\basic_subtrees\simple_find_nearest_target_to_flee.dm" #include "code\datums\ai\basic_mobs\basic_subtrees\simple_find_target.dm" -#include "code\datums\ai\basic_mobs\basic_subtrees\swirl_around_target.dm" #include "code\datums\ai\basic_mobs\basic_subtrees\stare_at_thing.dm" +#include "code\datums\ai\basic_mobs\basic_subtrees\swirl_around_target.dm" #include "code\datums\ai\basic_mobs\basic_subtrees\target_retaliate.dm" #include "code\datums\ai\basic_mobs\basic_subtrees\targeted_mob_ability.dm" #include "code\datums\ai\basic_mobs\basic_subtrees\tip_reaction.dm" @@ -2423,6 +2423,11 @@ #include "code\modules\mob\living\taste.dm" #include "code\modules\mob\living\basic\basic_emotes.dm" #include "code\modules\mob\living\basic\basic_mob.dm" +#include "code\modules\mob\living\basic\posessed_object.dm" +#include "code\modules\mob\living\basic\farm_animals\cow.dm" +#include "code\modules\mob\living\basic\farm_animals\deer.dm" +#include "code\modules\mob\living\basic\farm_animals\deer_ai.dm" +#include "code\modules\mob\living\basic\farm_animals\pig.dm" #include "code\modules\mob\living\basic\friendly\basic_pet.dm" #include "code\modules\mob\living\basic\friendly\bunny.dm" #include "code\modules\mob\living\basic\friendly\butterfly.dm" @@ -2431,36 +2436,26 @@ #include "code\modules\mob\living\basic\friendly\penguin.dm" #include "code\modules\mob\living\basic\friendly\sloth.dm" #include "code\modules\mob\living\basic\friendly\snake.dm" -#include "code\modules\mob\living\basic\posessed_object.dm" -#include "code\modules\mob\living\basic\farm_animals\cow.dm" -#include "code\modules\mob\living\basic\farm_animals\deer.dm" -#include "code\modules\mob\living\basic\farm_animals\deer_ai.dm" -#include "code\modules\mob\living\basic\farm_animals\pig.dm" #include "code\modules\mob\living\basic\hostile\bats.dm" #include "code\modules\mob\living\basic\hostile\bear.dm" #include "code\modules\mob\living\basic\hostile\carp.dm" -#include "code\modules\mob\living\basic\hostile\drakehound.dm" -#include "code\modules\mob\living\basic\hostile\pirate.dm" -#include "code\modules\mob\living\basic\hostile\soviet.dm" #include "code\modules\mob\living\basic\hostile\creature.dm" +#include "code\modules\mob\living\basic\hostile\drakehound.dm" #include "code\modules\mob\living\basic\hostile\feral_cat.dm" #include "code\modules\mob\living\basic\hostile\hellhound.dm" #include "code\modules\mob\living\basic\hostile\hellhound_ai.dm" #include "code\modules\mob\living\basic\hostile\hivebot.dm" #include "code\modules\mob\living\basic\hostile\hivebot_ai.dm" #include "code\modules\mob\living\basic\hostile\killertomato.dm" +#include "code\modules\mob\living\basic\hostile\pirate.dm" #include "code\modules\mob\living\basic\hostile\skeleton_mob.dm" +#include "code\modules\mob\living\basic\hostile\soviet.dm" #include "code\modules\mob\living\basic\hostile\alien\alien_mob_ai.dm" #include "code\modules\mob\living\basic\hostile\alien\alien_mob_drone.dm" #include "code\modules\mob\living\basic\hostile\alien\alien_mob_hunter.dm" #include "code\modules\mob\living\basic\hostile\alien\alien_mob_maid.dm" #include "code\modules\mob\living\basic\hostile\alien\alien_mob_queen.dm" #include "code\modules\mob\living\basic\hostile\alien\alien_mob_sentinel.dm" -#include "code\modules\mob\living\basic\mining\basilisk.dm" -#include "code\modules\mob\living\basic\mining\basilisk_ai.dm" -#include "code\modules\mob\living\basic\mining\hivelord.dm" -#include "code\modules\mob\living\basic\mining\hivelord_ai.dm" -#include "code\modules\mob\living\basic\mining\mining_mobs.dm" #include "code\modules\mob\living\basic\hostile\giant_spider\giant_spider.dm" #include "code\modules\mob\living\basic\hostile\giant_spider\giant_spider_actions.dm" #include "code\modules\mob\living\basic\hostile\giant_spider\giant_spider_ai.dm" @@ -2470,12 +2465,17 @@ #include "code\modules\mob\living\basic\minebots\minebot_abilities.dm" #include "code\modules\mob\living\basic\minebots\minebot_ai.dm" #include "code\modules\mob\living\basic\minebots\minebot_upgrades.dm" -#include "code\modules\mob\living\basic\retaliate\kangaroo.dm" +#include "code\modules\mob\living\basic\mining\basilisk.dm" +#include "code\modules\mob\living\basic\mining\basilisk_ai.dm" +#include "code\modules\mob\living\basic\mining\hivelord.dm" +#include "code\modules\mob\living\basic\mining\hivelord_ai.dm" +#include "code\modules\mob\living\basic\mining\mining_mobs.dm" #include "code\modules\mob\living\basic\nether_mobs\blankbody.dm" #include "code\modules\mob\living\basic\nether_mobs\faithless.dm" #include "code\modules\mob\living\basic\nether_mobs\migo.dm" #include "code\modules\mob\living\basic\nether_mobs\nether_mobs.dm" #include "code\modules\mob\living\basic\retaliate\clown.dm" +#include "code\modules\mob\living\basic\retaliate\kangaroo.dm" #include "code\modules\mob\living\brain\brain_death.dm" #include "code\modules\mob\living\brain\brain_emote.dm" #include "code\modules\mob\living\brain\brain_life.dm"