Merge pull request #1 from Tk420634/fenwork

title and lobby music

code/controllers/subsystem/artifacts.dm

@@ -20,7 +20,7 @@ PROCESSING_SUBSYSTEM_DEF(artifacts)
 		ART_RARITY_UNIQUE = 0,
 	)
 
-	var/spawn_chance = 1 // chance for an artifact to spawn per tick
+	var/spawn_chance = 0.000000000000000000000000000000000000000001 // chance for an artifact to spawn per tick
 	var/use_valid_ball_spawner_chance = 50 // chance for an artifact to use a valid ball spawner
 
 	var/list/buffs_by_rarity = list(
@@ -368,7 +368,6 @@ PROCESSING_SUBSYSTEM_DEF(artifacts)
 		/datum/quirk/alcohol_tolerance,
 		/datum/quirk/drunkhealing,
 		/datum/quirk/brickwall,
-		/datum/quirk/bowtrained
 	)
 
 	var/list/prefixes_speed_good = list()

code/controllers/subsystem/shuttle.dm

@@ -85,7 +85,7 @@ SUBSYSTEM_DEF(shuttle)
 		supply_packs[P.type] = P
 
 	initial_load()
-	// Not used on Knotingham Forest.
+	// Not used on the Bar at the End of the Universe.
 //	if(!arrivals)
 //		WARNING("No /obj/docking_port/mobile/arrivals placed on the map!")
 	if(!emergency)

code/datums/traits/good.dm

@@ -144,7 +144,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	value = 14
 	category = "Food Quirks"
 	mechanics = "Booze only delivers 70% of its alcohol power."
-	conflicts = list(/datum/quirk/alcohol_intolerance)
+	conflicts = list()
 	mob_trait = TRAIT_ALCOHOL_TOLERANCE
 	gain_text = span_notice("You feel like you could drink a whole keg!")
 	lose_text = span_danger("You don't feel as resistant to alcohol anymore. Somehow.")
@@ -220,7 +220,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	value = 14
 	category = "Food Quirks"
 	mechanics = "When drunk you slowly heal damage from all groups except wounds & bloodloss."
-	conflicts = list(/datum/quirk/alcohol_intolerance)
+	conflicts = list()
 	mob_trait = TRAIT_DRUNK_HEALING
 	gain_text = span_notice("You feel like a drink would do you good.")
 	lose_text = span_danger("You no longer feel like drinking would ease your pain.")
@@ -628,6 +628,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	new /obj/machinery/chem_master/primitive(H)
 */
 
+/*
 /datum/quirk/gunsmith
 	name = "Weaponsmith - Basic"
 	desc = "You know how to make various weapons, protective vests, gun mods, and can now forge weapons at an anvil. The list is too large to try and put here."
@@ -669,6 +670,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	gain_text = span_notice("Your smithed weapons will now be of masterwork quality.")
 	lose_text = span_danger("You seem less adept at crafting masterworks.")
 	medical_record_text = "Patient appears to be a well renowned gunsmith."
+*/
 
 /*
 /datum/quirk/voracious
@@ -706,7 +708,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 /datum/quirk/bloodpressure/remove()
 	if(quirk_holder)
 		quirk_holder.blood_ratio = 1
-*/
+
 
 //Can be turned into an alchemist quirk?
 /datum/quirk/tribal_tech
@@ -725,7 +727,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	locked = TRUE
 	human_only = FALSE
 
-/*
+
 /datum/quirk/dna_whiz
 	name = "Dna Whiz"
 	desc = "You can sequence plant genomes with a snap of your fingers!"
@@ -854,6 +856,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	if(soh)
 		qdel(soh)
 
+/*
 //Butcher quirk
 /datum/quirk/trapper
 	name = "Trapper"
@@ -870,6 +873,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	locked = FALSE
 	human_only = FALSE
 
+
 /datum/quirk/bigleagues
 	name = "Melee - Big Leagues"
 	desc = "Swing for the fences! You deal even more additional damage with melee weapons."
@@ -902,7 +906,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	locked = FALSE
 	human_only = FALSE
 
-/*
+
 /datum/quirk/chemwhiz
 	name = "Chem Whiz"
 	desc = "You've been playing around with chemicals all your life. You know how to use chemistry machinery."
@@ -933,7 +937,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	var/mob/living/carbon/human/H = quirk_holder
 	if(H)
 		H.mind.learned_recipes -= GLOB.chemwhiz_recipes
-*/
+
 
 /datum/quirk/pa_wear
 	name = "Power Armor Crafting"
@@ -949,7 +953,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	medical_record_text = "Patient claims to wear a powerful suit of metal."
 	locked = FALSE
 
-/*
+
 /datum/quirk/hard_yards
 	name = "Mobility - Wasteland Trekker"
 	desc = "You've spent a lot of time wandering the wastes, and for your hard work you out pace most folks when travelling across them."
@@ -986,7 +990,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	lose_text = span_danger("The world beneath your heels suddenly feels like tugging you down...")
 	medical_record_text = "Patient describes going on walks."
 	locked = FALSE
-*/
+
 
 /datum/quirk/lifegiver
 	name = "Health - Tough"
@@ -1030,7 +1034,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	H.maxHealth += 20
 	H.health += 20
 
-/*
+
 /datum/quirk/iron_fist
 	name = "Fists of Iron"
 	desc = "You have fists of kung-fury! Increases unarmed damage."
@@ -1074,7 +1078,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	var/mob/living/carbon/human/H = quirk_holder
 	H.dna.species.punchdamagelow = STEEL_FIST_PUNCH_DAMAGE_LOW
 	H.dna.species.punchdamagehigh = STEEL_FIST_PUNCH_DAMAGE_MAX
-*/
+
 
 /datum/quirk/surgerylow
 	name = "Minor Surgery"
@@ -1127,7 +1131,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	locked = FALSE
 	human_only = FALSE
 
-/*
+
 /datum/quirk/explosive_crafting
 	name = "Explosives Crafting"
 	desc = "You have strong feelings about the future of industrial society."
@@ -1686,7 +1690,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	medical_record_text = "Patient repeatedly scores baskets in the trashcan."
 	locked =  FALSE
 	human_only = FALSE
-*/
+
 
 //Should go to all the 'combat' classes
 /datum/quirk/bowtrained
@@ -1704,7 +1708,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	locked =  FALSE
 	human_only = FALSE
 
-/*
+
 /datum/quirk/masterrifleman
 	name = "Bolt Worker"
 	desc = "You've spent a lot of time working the bolt of a rifle, or the pump action of a shotgun. Your skill allows you to click to work the action instead of doing it manually."
@@ -1752,7 +1756,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	lose_text = span_danger("You feel that laying down in a field of gunfire may not be such a good idea after all.")
 	medical_record_text = "Patient has failed heart monitoring tests multiple times."
 	locked =  FALSE
-*/
+
 
 /datum/quirk/packrat
 	name = "Packrat"
@@ -1763,7 +1767,7 @@ GLOBAL_LIST_INIT(security_expert, list(
 	conflicts = list()
 	mob_trait = TRAIT_PACKRAT
 
-/*
+
 /datum/quirk/ratfriend
 	name = "Beast Friend - Rats"
 	desc = "Rats and wild mice of all kind outright ignore you now."

code/datums/traits/negative.dm

@@ -170,6 +170,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
 	lose_text = span_notice("You feel awake again.")
 	medical_record_text = "Patient has abnormal sleep study results and is difficult to wake up."
 
+/*
 /datum/quirk/brainproblems
 	name = "Brain Tumor"
 	desc = "You have a little friend in your brain that keeps growing back! Mannitol will keep it at bay, but it can't be cured!"
@@ -199,7 +200,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
 	if((bdam > 25) && COOLDOWN_FINISHED(src, annoying_message))
 		COOLDOWN_START(src, annoying_message, 3 MINUTES)
 		to_chat(quirk_holder, span_danger("I really need some mannitol!"))
-
+*/
 /*
 /datum/quirk/nearsighted //t. errorage
 	name = "Nearsighted - Corrected"
@@ -259,7 +260,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
 /datum/quirk/badeyes/add()
 	quirk_holder.become_mega_nearsighted(ROUNDSTART_TRAIT)
 
-
+/*
 /datum/quirk/nyctophobia
 	name = "Phobia - The Dark"
 	desc = "As far as you can remember, you've always been afraid of the dark. While in the dark without a light source, you instinctually act careful, and constantly feel a sense of dread."
@@ -280,14 +281,15 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
 			to_chat(quirk_holder, span_warning("Easy, easy, take it slow... you're in the dark..."))
 			quirk_holder.toggle_move_intent()
 		SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "nyctophobia", /datum/mood_event/nyctophobia)
+*/
 
 /datum/quirk/lightless
 	name = "Light Sensitivity"
 	desc = "Bright lights irritate you. Your eyes start to water, your skin feels itchy against the photon radiation, and your hair gets dry and frizzy. Maybe it's a medical condition."
 	value = -22
 	category = "Vision Quirks"
 	mechanics = "While in bright light without sunglasses, you get a negative moodlet and your eyes go blurry. Are you part molerat?"
-	conflicts = list(/datum/quirk/nyctophobia)
+	conflicts = list()
 	gain_text = span_danger("The light begins to hurt your eyes...")
 	lose_text = span_notice("Your eyes no longer sting in the light.")
 	medical_record_text = "Patient has acute light sensitivity, and insists it is physically harmful."
@@ -314,7 +316,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
 	value = -33 // This can kill you, which is extremely bad, and makes city play somewhat impossible
 	category = "Health Quirks"
 	mechanics = "While in the light, you slowly wither away, but the reverse happens in the dark, healing you and giving you nutrition."
-	conflicts = list(/datum/quirk/nyctophobia)
+	conflicts = list()
 
 /datum/quirk/lightburning/add()
 	var/mob/living/carbon/human/H = quirk_holder

code/datums/traits/neutral.dm

@@ -220,6 +220,7 @@
 	lose_text = span_notice("Pain has become less exciting for you.")
 */
 
+/*
 /datum/quirk/alcohol_intolerance
 	name = "Alcohol Intolerance"
 	desc = "You take toxin damage from alcohol rather than getting drunk."
@@ -242,6 +243,7 @@
 	if(H)
 		var/datum/species/species = H.dna.species
 		species.disliked_food &= ~ALCOHOL
+*/
 
 /*
 /datum/quirk/longtimer
@@ -827,7 +829,7 @@
 	lose_text = span_danger("The tingle in your mouth fades.")
 	locked = FALSE
 	human_only = FALSE
-*/
+
 
 /datum/quirk/touch_heal
 	name = "Innate healing - Magic"
@@ -842,7 +844,7 @@
 	locked = FALSE
 	human_only = FALSE
 
-/*
+
 /datum/quirk/tend_heal
 	name = "Innate healing - Triage"
 	desc = "You keep a tiny kit of medical supplies stashed away for emergencies."

code/game/objects/effects/spawners/f13lootdrop.dm

@@ -2387,7 +2387,7 @@ there should be very few of these spawns on the whole map. finding one should be
 				/obj/item/stack/crafting/goodparts/three = 2
 				)
 */
-// Updated money spawners to era match to Knotingham Forest's date, 2222. ~TK420634
+// Updated money spawners to era match to the Bar at the End of the Universe's date, 2222. ~TK420634
 // Also, fuck this multi-tiered way of trying to spawn money into the game.  Cludged together crap, my dude.
 
 

code/game/objects/items/storage/toolbox.dm

@@ -81,8 +81,8 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 	new /obj/item/wrench(src)
 	new /obj/item/weldingtool(src)
 	new /obj/item/crowbar(src)
-//	new /obj/item/analyzer(src)		// Knotingham Forest Edit, due to disabled atmos, analyzers are useless.
-	new /obj/item/multitool(src)	// Knotingham Forest Edit, no need to gatekeep the multitool?
+//	new /obj/item/analyzer(src)		// the Bar at the End of the Universe Edit, due to disabled atmos, analyzers are useless.
+	new /obj/item/multitool(src)	// the Bar at the End of the Universe Edit, no need to gatekeep the multitool?
 	new /obj/item/wirecutters(src)
 
 /obj/item/storage/toolbox/mechanical/old

code/game/world.dm

@@ -328,7 +328,7 @@ GLOBAL_LIST(topic_status_cache)
 	if(SSmapping.config) // this just stops the runtime, honk.
 		features += "[SSmapping.config.map_name]"	//CIT CHANGE - makes the hub entry display the current map
 
-	//if(NUM2SECLEVEL(GLOB.security_level)) // Knotingham Forest - We don't use alert levels.
+	//if(NUM2SECLEVEL(GLOB.security_level)) // the Bar at the End of the Universe - We don't use alert levels.
 	//	features += "[NUM2SECLEVEL(GLOB.security_level)] alert"
 
 	var/popcaptext = ""

code/modules/holiday/party_time.dm

@@ -26,7 +26,7 @@
 
 /datum/holiday/weekly/potluck/celebrate()
 	. = ..()
-	world.TgsTargetedChatBroadcast("<@&1147595783147880568> Come on down for the Knotingham Forest meet, greet, n' eat!  Gather in new folks, won't be so lonely if you're all new together!  Let's get y'all settled in!", FALSE)
+	world.TgsTargetedChatBroadcast("<@&1147595783147880568> Come on down for the the Bar at the End of the Universe meet, greet, n' eat!  Gather in new folks, won't be so lonely if you're all new together!  Let's get y'all settled in!", FALSE)
 	START_PROCESSING(SSevents, src) // I love processing nonprocessing subsystems
 
 /datum/holiday/weekly/potluck/greet()

code/modules/jobs/job_types/jobs_we_use.dm

@@ -59,7 +59,7 @@
 	description = "Yeah, lets go get something to drink yeah?"
 	supervisors = "fate"
 	selection_color = "#dddddd"
-	paycheck = 50
+	paycheck = 100
 	outfit = /datum/outfit/job/wasteland/f13wastelander
 	access = list()
 	minimal_access = list()
@@ -187,6 +187,9 @@
 	flag = F13BARKEEP	
 	description = "Time to go to work, serve drinks and have a good time!"
 	supervisors = "fate"
+	paycheck = 150
+	total_positions = 2
+	spawn_positions = 2
 	outfit = /datum/outfit/job/den/f13barkeep
 	access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_CARGO, ACCESS_GUILD)
 	minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_CARGO, ACCESS_GUILD)
@@ -221,6 +224,7 @@
 	flag = F13CLUBWORKER
 	department_head = list("Club Worker")
 	head_announce = list("Security")
+	paycheck = 50
 	faction = FACTION_CLUB
 	social_faction = FACTION_CLUB
 	description = "You're a worker at Heavens Night, be you a maid that cleans up, an escort, a dancer, or a waiter/waitress.  Your job is to service the customer!"

code/modules/mob/dead/new_player/new_player.dm

@@ -66,8 +66,8 @@
 		output += "<p><a href='byond://?src=[REF(src)];fit_viewport_lobby=1)'>(Fit Viewport)</a></p>"
 	else
 		output += "<p><a href='byond://?src=[REF(src)];directory=1'>View Character Directory</a></p>"
-		output += "<p><a href='byond://?src=[REF(src)];late_join=1'>Join Game!</a></p>"
-		output += "<p>[LINKIFY_READY("Observe", PLAYER_READY_TO_OBSERVE)]</p>"
+		output += "<p><a href='byond://?src=[REF(src)];late_join=1'>Come on down!</a></p>"
+		//output += "<p>[LINKIFY_READY("Observe", PLAYER_READY_TO_OBSERVE)]</p>"
 		output += "<p><a href='byond://?src=[REF(src)];refresh_chat=1)'>(Fix Chat Window)</a></p>"
 		output += "<p><a href='byond://?src=[REF(src)];fit_viewport_lobby=1)'>(Fit Viewport)</a></p>"
 

config/config.txt

@@ -21,15 +21,15 @@ $include policy.txt
 # There are various options which are hard-locked for security reasons.
 
 ## Server name: This appears at the top of the screen in-game and in the BYOND hub. Uncomment and replace 'tgstation' with the name of your choice.
-@SERVERNAME Knotingham Forest
+@SERVERNAME the Bar at the End of the Universe
 
 ## Server tagline: This will appear right below the server's title.
 SERVERTAGLINE [18+] CDDA/QoC/FO/Biomutant/STALKER inspired HRP Furry Roleplaying experience. Our newts go hard. Join at https://discord.gg/coyotebayou
 ## Server SQL name: This is the name used to identify the server to the SQL DB, distinct from SERVERNAME as it must be at most 32 characters.
 # SERVERSQLNAME fo13sql
 
 ## Station name: The name of the station as it is referred to in-game. If commented out, the game will generate a random name instead.
-STATIONNAME Knotingham Forest
+STATIONNAME the Bar at the End of the Universe
 
 ## Put on byond hub: Uncomment this to put your server on the byond hub.
 HUB

config/motd.txt

@@ -1,5 +1,8 @@
 <!-- Most valid html will work in here, excluding images. -->
 
-<h1>Welcome to Knotingham Forest!</h1>
+<h1>Welcome to the Bar at the End of the Universe!</h1>
 <br>
-Furry Fallout in east Texas, circa 2222!  Go gettem waster!<br>
+Welcome to the Bar at the End of the Universe, where all the timelines converge and you can take a load off.<br>
+Here at the Foxy Bar we strive to allow you to sit with others and talk about your experiences on any server or search out a scene for ERP.<br>
+We're extremely lax on OOC being talked about 'in character', because the reality of the matter is that here you're only as<br>
+'in character' as you want to be!  So take it easy!