Merge branch 'master' into master

modular_citadel/code/_onclick/hud/screen_objects.dm

@@ -1,25 +1,3 @@
-/obj/screen/mov_intent
-	icon = 'modular_citadel/icons/ui/screen_midnight.dmi'
-
-/obj/screen/sprintbutton
-	name = "toggle sprint"
-	icon = 'modular_citadel/icons/ui/screen_midnight.dmi'
-	icon_state = "act_sprint"
-	layer = ABOVE_HUD_LAYER - 0.1
-
-/obj/screen/sprintbutton/Click()
-	if(ishuman(usr))
-		var/mob/living/carbon/human/H = usr
-		H.togglesprint()
-
-/obj/screen/sprintbutton/proc/insert_witty_toggle_joke_here(mob/living/carbon/human/H)
-	if(!H)
-		return
-	if(H.sprinting)
-		icon_state = "act_sprint_on"
-	else
-		icon_state = "act_sprint"
-
 /obj/screen/restbutton
 	name = "rest"
 	icon = 'modular_citadel/icons/ui/screen_midnight.dmi'

modular_citadel/code/_onclick/hud/sprint.dm

@@ -0,0 +1,41 @@
+/obj/screen/mov_intent
+	icon = 'modular_citadel/icons/ui/screen_midnight.dmi'
+
+/obj/screen/sprintbutton
+	name = "toggle sprint"
+	icon = 'modular_citadel/icons/ui/screen_midnight.dmi'
+	icon_state = "act_sprint"
+	layer = ABOVE_HUD_LAYER - 0.1
+
+/obj/screen/sprintbutton/Click()
+	if(ishuman(usr))
+		var/mob/living/carbon/human/H = usr
+		H.togglesprint()
+
+/obj/screen/sprintbutton/proc/insert_witty_toggle_joke_here(mob/living/carbon/human/H)
+	if(!H)
+		return
+	if(H.sprinting)
+		icon_state = "act_sprint_on"
+	else
+		icon_state = "act_sprint"
+
+//Sprint buffer onscreen code.
+/datum/hud/var/obj/screen/sprint_buffer/sprint_buffer
+
+/obj/screen/sprint_buffer
+	name = "sprint buffer"
+	icon = 'icons/effects/progessbar.dmi'
+	icon_state = "prog_bar_100"
+
+/obj/screen/sprint_buffer/Click()
+	if(isliving(usr))
+		var/mob/living/L = usr
+		to_chat(L, "<span class='boldnotice'>Your sprint buffer's maximum capacity is [L.sprint_buffer_max]. It is currently at [L.sprint_buffer], regenerating at [L.sprint_buffer_regen_ds * 10] per second. \
+		Sprinting while this is empty will incur a [L.sprint_stamina_cost] stamina cost per tile.</span>")
+
+/obj/screen/sprint_buffer/proc/update_to_mob(mob/living/L)
+	var/amount = 0
+	if(L.sprint_buffer_max > 0)
+		amount = round(CLAMP((L.sprint_buffer / L.sprint_buffer_max) * 100, 0, 100), 5)
+	icon_state = "prog_bar_[amount]"

modular_citadel/code/modules/client/loadout/backpack.dm

@@ -23,6 +23,11 @@
 	category = SLOT_IN_BACKPACK
 	path = /obj/item/toy/plush/lampplushie
 
+/datum/gear/plushrng
+	name = "Random plushie"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/toy/plush/random
+
 /datum/gear/tennis
 	name = "Classic Tennis Ball"
 	category = SLOT_IN_BACKPACK

modular_citadel/code/modules/clothing/under/turtlenecks.dm

@@ -43,8 +43,8 @@
 	icon_state = "bb_turtle"
 	item_state = "w_suit"
 	item_color = "bb_turtle"
-	body_parts_covered = CHEST|ARMS
-	can_adjust = 1
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = TRUE
 	icon = 'modular_citadel/icons/obj/clothing/turtlenecks.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
 	mutantrace_variation = NO_MUTANTRACE_VARIATION

modular_citadel/code/modules/mentor/mentorpm.dm

@@ -3,7 +3,7 @@
 	set category = "Mentor"
 	set name = "Mentor PM"
 	if(!is_mentor())
-		to_chat(src, "<font color='red'>Error: Mentor-PM-Panel: Only Mentors and Admins may use this command.</font>")
+		to_chat(src, "<span class='danger'>Error: Mentor-PM-Panel: Only Mentors and Admins may use this command.</span>")
 		return
 	var/list/client/targets[0]
 	for(var/client/T)
@@ -27,24 +27,24 @@
 	else if(istype(whom,/client))
 		C = whom
 	if(!C)
-		if(is_mentor())	to_chat(src, "<font color='red'>Error: Mentor-PM: Client not found.</font>")
+		if(is_mentor())	to_chat(src, "<span class='danger'>Error: Mentor-PM: Client not found.</span>")
 		else		mentorhelp(msg)	//Mentor we are replying to left. Mentorhelp instead(check below)
 		return
 
 	if(is_mentor(whom))
-		to_chat(GLOB.admins | GLOB.mentors, "<font color='purple'>[src] has started replying to [whom]'s mhelp.</font color>")
+		to_chat(GLOB.admins | GLOB.mentors, "<font color='purple'>[src] has started replying to [whom]'s mhelp.</font>")
 
 	//get message text, limit it's length.and clean/escape html
 	if(!msg)
 		msg = input(src,"Message:", "Private message") as text|null
-		
+
 		if(!msg && is_mentor(whom))
-			to_chat(GLOB.admins | GLOB.mentors, "<font color='purple'>[src] has stopped their reply to [whom]'s mhelp.</font color>")
+			to_chat(GLOB.admins | GLOB.mentors, "<span class='purple'>[src] has stopped their reply to [whom]'s mhelp.</span>")
 			return
 
 		if(!C)
 			if(is_mentor())
-				to_chat(src, "<font color='red'>Error: Mentor-PM: Client not found.</font>")
+				to_chat(src, "<span class='danger'>Error: Mentor-PM: Client not found.</span>")
 			else
 				mentorhelp(msg)	//Mentor we are replying to has vanished, Mentorhelp instead (how the fuck does this work?let's hope it works,shrug)
 				return
@@ -54,8 +54,8 @@
 			return
 
 	msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))
-	if(!msg && is_mentor(whom))	
-		to_chat(GLOB.admins | GLOB.mentors, "<font color='purple'>[src] has stopped their reply to [whom]'s mhelp.</font color>")
+	if(!msg && is_mentor(whom))
+		to_chat(GLOB.admins | GLOB.mentors, "<span class='purple'>[src] has stopped their reply to [whom]'s mhelp.</span>")
 		return
 
 	log_mentor("Mentor PM: [key_name(src)]->[key_name(C)]: [msg]")
@@ -65,21 +65,21 @@
 	var/show_char = CONFIG_GET(flag/mentors_mobname_only)
 	if(C.is_mentor())
 		if(is_mentor())//both are mentors
-			to_chat(C, "<font color='purple'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0, 0)]</b>: [msg]</font>")
-			to_chat(src, "<font color='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, 0)]</b>: [msg]</font>")
+			to_chat(C, "<span class='purple'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0, 0)]</b>: [msg]</span>")
+			to_chat(src, "<span class='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, 0)]</b>: [msg]</font>")
 
-		else		//recipient is an mentor but sender is not
-			to_chat(C, "<font color='purple'>Reply PM from-<b>[key_name_mentor(src, C, 1, 0, show_char)]</b>: [msg]</font>")
-			to_chat(src, "<font color='brown'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, 0)]</b>: [msg]</font>")
+		else		//recipient is a mentor but sender is not
+			to_chat(C, "<span class='purple'>Reply PM from-<b>[key_name_mentor(src, C, 1, 0, show_char)]</b>: [msg]</span>")
+			to_chat(src, "<span class='pink'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, 0)]</b>: [msg]</span>")
 
 	else
-		if(is_mentor())	//sender is an mentor but recipient is not.
-			to_chat(C, "<font color='purple'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0, 0)]</b>: [msg]</font>")
-			to_chat(src, "<font color='brown'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, show_char)]</b>: [msg]</font>")
+		if(is_mentor())	//sender is a mentor but recipient is not.
+			to_chat(C, "<span class='purple'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0, 0)]</b>: [msg]</span>")
+			to_chat(src, "<span class='pink'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, show_char)]</b>: [msg]</span>")
 
 	//we don't use message_Mentors here because the sender/receiver might get it too
 	var/show_char_sender = !is_mentor() && CONFIG_GET(flag/mentors_mobname_only)
 	var/show_char_recip = !C.is_mentor() && CONFIG_GET(flag/mentors_mobname_only)
 	for(var/client/X in GLOB.mentors | GLOB.admins)
 		if(X.key!=key && X.key!=C.key)	//check client/X is an Mentor and isn't the sender or recipient
-			to_chat(X, "<B><font color='brown'>Mentor PM: [key_name_mentor(src, X, 0, 0, show_char_sender)]-&gt;[key_name_mentor(C, X, 0, 0, show_char_recip)]:</B> <font color ='blue'> [msg]</font>") //inform X
+			to_chat(X, "<B><span class='pink'>Mentor PM: [key_name_mentor(src, X, 0, 0, show_char_sender)]-&gt;[key_name_mentor(C, X, 0, 0, show_char_recip)]:</span></B> <span class='blue'>[msg]</span>") //inform X

modular_citadel/code/modules/mob/living/carbon/damage_procs.dm

@@ -18,3 +18,21 @@
 	if(recoveringstam && amount > 20)
 		incomingstammult = max(0.01, incomingstammult/(amount*0.05))
 	return amount
+
+/mob/living/carbon/doSprintLossTiles(tiles)
+	doSprintBufferRegen(FALSE)		//first regen.
+	if(sprint_buffer)
+		var/use = min(tiles, sprint_buffer)
+		sprint_buffer -= use
+		tiles -= use
+	update_hud_sprint_bar()
+	if(!tiles)		//we had enough, we're done!
+		return
+	adjustStaminaLoss(tiles * sprint_stamina_cost)		//use stamina to cover deficit.
+
+/mob/living/carbon/proc/doSprintBufferRegen(updating = TRUE)
+	var/diff = world.time - sprint_buffer_regen_last
+	sprint_buffer_regen_last = world.time
+	sprint_buffer = min(sprint_buffer_max, sprint_buffer + sprint_buffer_regen_ds * diff)
+	if(updating)
+		update_hud_sprint_bar()

modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm

@@ -5,7 +5,7 @@
 	var/oldpseudoheight = pseudo_z_axis
 	. = ..()
 	if(. && sprinting && !(movement_type & FLYING) && canmove && !resting && m_intent == MOVE_INTENT_RUN && has_gravity(loc) && !pulledby)
-		adjustStaminaLossBuffered(0.3)
+		doSprintLossTiles(1)
 		if((oldpseudoheight - pseudo_z_axis) >= 8)
 			to_chat(src, "<span class='warning'>You trip off of the elevated surface!</span>")
 			for(var/obj/item/I in held_items)

modular_citadel/code/modules/mob/living/carbon/life.dm

@@ -0,0 +1,3 @@
+/mob/living/carbon/Life()
+	. = ..()
+	doSprintBufferRegen()

modular_citadel/code/modules/mob/living/damage_procs.dm

@@ -1,2 +1,5 @@
 /mob/living/proc/adjustStaminaLossBuffered(amount, updating_stamina = TRUE, forced = FALSE)
 	return
+
+/mob/living/proc/doSprintLossTiles(amount)
+	return

modular_citadel/code/modules/mob/living/living.dm

@@ -8,6 +8,14 @@
 	var/intentionalresting = FALSE
 	var/attemptingcrawl = FALSE
 
+	//Sprint buffer---
+	var/sprint_buffer = 42					//Tiles
+	var/sprint_buffer_max = 42
+	var/sprint_buffer_regen_ds = 0.3		//Tiles per world.time decisecond
+	var/sprint_buffer_regen_last = 0		//last world.time this was regen'd for math.
+	var/sprint_stamina_cost = 0.55			//stamina loss per tile while insufficient sprint buffer.
+	//---End
+
 /mob/living/movement_delay(ignorewalk = 0)
 	. = ..()
 	if(resting)
@@ -118,3 +126,7 @@
 		filters -= CIT_FILTER_STAMINACRIT
 		update_canmove()
 	update_health_hud()
+
+/mob/living/proc/update_hud_sprint_bar()
+	if(hud_used && hud_used.sprint_buffer)
+		hud_used.sprint_buffer.update_to_mob(src)