Merge pull request #64 from Superlagg/welcome-to-hornyhut-junior,-you…

…re-a-bottom

chud: dischuddle latechud chudue chund forchud everychud tchud chawn chus chudstomer.

code/controllers/subsystem/job.dm

@@ -19,6 +19,8 @@ SUBSYSTEM_DEF(job)
 
 	var/list/level_order = list(JP_HIGH,JP_MEDIUM,JP_LOW)
 
+	var/force_customer = TRUE
+
 /datum/controller/subsystem/job/Initialize(timeofday)
 	SSmapping.HACK_LoadMapConfig()
 	if(!occupations.len)

code/modules/holiday/party_time.dm

@@ -6,8 +6,11 @@
 /datum/holiday/weekly
 	/// Which day(s) of the week this holiday is celebrated on
 	var/list/weekdays = list()
+	var/enabled = TRUE
 
 /datum/holiday/weekly/shouldCelebrate(dd, mm, yy, ww, ddd)
+	if(!enabled)
+		return FALSE
 	var/adjustedDDD = time2text(world.realtime, "DDD", -6) //Fenny doesn't wanna use UTC, but instead Central Standard Time
 	return (adjustedDDD in weekdays) // ez
 
@@ -23,6 +26,7 @@
 	var/sparkling
 	var/pizza_time = 5 MINUTES
 	var/pillar_johned
+	enabled = FALSE
 
 /datum/holiday/weekly/potluck/celebrate()
 	. = ..()

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

@@ -68,7 +68,10 @@
 		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 in!</a></p>"
+		if(SSjob.force_customer)
+			output += "<p><a href='byond://?src=[REF(src)];SelectedJob=Customer'>Join in!</a></p>"
+		else
+			output += "<p><a href='byond://?src=[REF(src)];late_join=1'>Join in!</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>"

code/modules/reagents/chemistry/reagents/medicine_reagents.dm

@@ -1662,7 +1662,7 @@
 	M.confused = max(0, M.confused-6*REM)
 	M.disgust = max(0, M.disgust-6*REM)
 	var/datum/component/mood/mood = M.GetComponent(/datum/component/mood)
-	if(mood.sanity <= SANITY_NEUTRAL) // only take effect if in negative sanity and then...
+	if(mood && mood.sanity <= SANITY_NEUTRAL) // only take effect if in negative sanity and then...
 		mood.setSanity(min((mood.sanity+5)*REM, SANITY_NEUTRAL)) // set minimum to prevent unwanted spiking over neutral
 	..()
 	. = 1