diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm
index 7dd535a2fe9..f014f67e5cd 100644
--- a/code/__HELPERS/names.dm
+++ b/code/__HELPERS/names.dm
@@ -43,13 +43,17 @@ var/religion_name = null
return capitalize(name)
+
/proc/station_name()
if (station_name)
return station_name
- var/random = rand(1,5)
var/name = ""
+/*
+ var/random = rand(1,5)
+
+
//Rare: Pre-Prefix
if (prob(10))
name = pick("Imperium", "Heretical", "Cuban", "Psychic", "Elegant", "Common", "Uncommon", "Rare", "Unique", "Houseruled", "Religious", "Atheist", "Traditional", "Houseruled", "Mad", "Super", "Ultra", "Secret", "Top Secret", "Deep", "Death", "Zybourne", "Central", "Main", "Government", "Uoi", "Fat", "Automated", "Experimental", "Augmented")
@@ -92,7 +96,7 @@ var/religion_name = null
station_name += pick("One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen")
if(13)
station_name += pick("13","XIII","Thirteen")
-
+*/
if (config && config.server_name)
world.name = "[config.server_name]: [name]"
@@ -101,6 +105,8 @@ var/religion_name = null
return station_name
+
+
/proc/world_name(var/name)
station_name = name
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 78a8fe69383..cb1b4de3221 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -286,7 +286,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)
+ //EquipCustomItems(player)
if(captainless)
for(var/mob/M in player_list)
if(!istype(M,/mob/new_player))
diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm
index 8485778e3cf..aacc9e17668 100644
--- a/code/modules/admin/verbs/deadsay.dm
+++ b/code/modules/admin/verbs/deadsay.dm
@@ -24,7 +24,7 @@
if (!msg)
return
- var/rendered = "DEAD: ADMIN([src.holder.fakekey ? pick("BADMIN", "hornigranny", "TLF", "scaredforshadows", "KSI", "Silnazi", "HerpEs", "BJ69", "SpoofedEdd", "Uhangay", "Wario90900", "Regarity", "MissPhareon", "LastFish", "unMportant", "Deurpyn", "Fatbeaver") : src.key]) says, \"[msg]\""
+ var/rendered = "DEAD: BADMIN says, \"[msg]\""
for (var/mob/M in player_list)
if (istype(M, /mob/new_player))
diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm
index ffcc19b7b76..a15e5503f00 100644
--- a/code/modules/customitems/item_spawning.dm
+++ b/code/modules/customitems/item_spawning.dm
@@ -4,6 +4,8 @@
//for multiple items just add mutliple entries, unless i change it to be a listlistlist
//yes, it has to be an item, you can't pick up nonitems
+/*
+
/proc/EquipCustomItems(mob/living/carbon/human/M)
// load lines
var/file = file2text("config/custom_items.txt")
@@ -70,4 +72,6 @@
skip:
if (ok == 0) // Finally, since everything else failed, place it on the ground
- Item.loc = get_turf(M.loc)
\ No newline at end of file
+ Item.loc = get_turf(M.loc)
+
+*/
\ No newline at end of file
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index c1e808a6bdc..db1eece5d31 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -281,7 +281,7 @@
var/mob/living/carbon/human/character = create_character() //creates the human and transfers vars and mind
job_master.EquipRank(character, rank, 1) //equips the human
- EquipCustomItems(character)
+ //EquipCustomItems(character)
character.loc = pick(latejoin)
character.lastarea = get_area(loc)