Label GS13 changes

Since commit 5084020 on Jan 30, 2023

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

@@ -290,7 +290,7 @@
 
 	observer.started_as_observer = TRUE
 	src.client.respawn_observing = 1
-	src.client.lastrespawn = world.time + 180 SECONDS //reset respawn.
+	src.client.lastrespawn = world.time + respawn_time SECONDS
 	close_spawn_windows()
 	var/obj/effect/landmark/observer_start/O = locate(/obj/effect/landmark/observer_start) in GLOB.landmarks_list
 	to_chat(src, "<span class='notice'>Now teleporting.</span>")

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

@@ -833,8 +833,7 @@
 	icon_state = "hair_tailhair2"
 	ckeys_allowed = list("quotefox")
 
-//Hair gradients
-
+// GS13: Hair gradients from Skyrat
 
 /datum/sprite_accessory/hair_gradient
 	icon = 'icons/mob/hair_gradients.dmi'

code/modules/mob/dead/observer/observer.dm

@@ -287,9 +287,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 // CITADEL EDIT
 	if(istype(loc, /obj/machinery/cryopod))
-		var/response = alert(src, "Are you -sure- you want to ghost?\n(If you ghost now, you will have to wait a minute before you are able to respawn!)","Are you sure you want to ghost?","Ghost","Stay in body")
+		// GS13: "a minute"
+		var/response = alert(src, "Are you -sure- you want to ghost?\n(If you ghost now, you will have to wait [respawn_time] seconds before you are able to respawn!)","Are you sure you want to ghost?","Ghost","Stay in body")
 		if(response != "Ghost")//darn copypaste
-			client.lastrespawn = world.time + 180 SECONDS //set respawn time
+			client.lastrespawn = world.time + respawn_time SECONDS
 			return
 		var/obj/machinery/cryopod/C = loc
 		C.despawn_occupant()

code/modules/mob/living/carbon/human/examine.dm

@@ -386,7 +386,7 @@
 		if(digitalcamo)
 			msg += "[t_He] [t_is] moving [t_his] body in an unnatural and blatantly inhuman manner.\n"
 
-	if(client?.prefs?.noncon_weight_gain)
+	if(client?.prefs?.noncon_weight_gain) // GS13
 		msg += "<span class='purple'><b>Non-con fattening is allowed</b></span>\n"	
 
 	if (length(msg))

code/modules/mob/living/carbon/human/human_defines.dm

@@ -10,13 +10,9 @@
 	var/hair_color = "000"
 	var/hair_style = "Bald"
 
-
-	///Colour used for the hair gradient.
-	var/grad_color = "000"
-	///Style used for the hair gradient.
-	var/grad_style
-
-
+	// GS13: Hair gradients from Skyrat
+	var/grad_color = "FFFFFF"
+	var/grad_style = "000"
 
 	//Facial hair colour and style
 	var/facial_hair_color = "000"

code/modules/mob/living/carbon/human/species.dm

@@ -16,10 +16,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	var/hair_alpha = 255	// the alpha used by the hair. 255 is completely solid, 0 is transparent.
 	var/wing_color
 
-	///The gradient style used for the mob's hair.
-	var/grad_style
-	///The gradient color used to color the gradient.
-	var/grad_color
+	// GS13: Hair gradients from Skyrat
+	var/grad_style // The gradient style used for the mob's hair.
+	var/grad_color // The gradient color used to color the gradient.
 
 	var/use_skintones = 0	// does it use skintones or not? (spoiler alert this is only used by humans)
 	var/exotic_blood = ""	// If your race wants to bleed something other than bog standard blood, change this to reagent id.
@@ -468,8 +467,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 					else
 						hair_overlay.color = "#" + H.hair_color
 
-
-					//Gradients
+					// GS13: Hair gradients from Skyrat
 					grad_style = H.grad_style
 					grad_color = H.grad_color
 					if(grad_style)
@@ -480,7 +478,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 						gradient_overlay.icon = temp
 						gradient_overlay.color = "#" + grad_color
 
-
 				else
 					hair_overlay.color = forced_colour
 				hair_overlay.alpha = hair_alpha
@@ -1249,6 +1246,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	//LIFE//
 	////////
 
+// GS13 Procs to handle fatness
 /datum/species/proc/update_body_size(mob/living/carbon/human/H, size_change)
 	if (!H)
 		return
@@ -1647,32 +1645,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			var/grav_force = min(gravity - STANDARD_GRAVITY,3)
 			. += 1 + grav_force
 
-		/*var/datum/component/mood/mood = H.GetComponent(/datum/component/mood)
-		//removed because mood now influences action speed. Hyperstation 13.
-		if(mood && !flight) //How can depression slow you down if you can just fly away from your problems?
-			switch(mood.sanity)
-				if(SANITY_INSANE to SANITY_CRAZY)
-					. += 1.5
-				if(SANITY_CRAZY to SANITY_UNSTABLE)
-					. += 1
-				if(SANITY_UNSTABLE to SANITY_DISTURBED)
-					. += 0.5
-		*/
-/*		if(HAS_TRAIT(H, TRAIT_FAT))
-			. += (1 - flight)
-		if(HAS_TRAIT(H, TRAIT_OBESE))//GS13 fat levels move speed decrease
-			. += (1.5 - flight)
-		if(HAS_TRAIT(H, TRAIT_MORBIDLYOBESE))
-			. += (2 - flight)
-		if(HAS_TRAIT(H, TRAIT_IMMOBILE))
-			. += 3 // No wings are going to lift that much off the ground
-		if(HAS_TRAIT(H, TRAIT_BLOB))
-			. += 4
-		if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !HAS_TRAIT(H, TRAIT_RESISTCOLD))
-			. += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR
-	return .
-*/
-		if(H.fatness)
+		// Hyperstation 13: Mood now influences action speed.
+
+		if(H.fatness) // GS13
 			var/fatness_delay = (H.fatness / FATNESS_DIVISOR)
 			if(H.fatness < FATNESS_LEVEL_BARELYMOBILE)
 				fatness_delay = fatness_delay - flight
@@ -1681,6 +1656,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 				fatness_delay = fatness_delay * FATNESS_STRONGLEGS_MODIFIER
 
 			fatness_delay = min(fatness_delay, FATNESS_MAX_MOVE_PENALTY)
+
 			if(HAS_TRAIT(H, TRAIT_WEAKLEGS))
 				if(H.fatness <= FATNESS_LEVEL_IMMOBILE)
 					fatness_delay += fatness_delay * FATNESS_WEAKLEGS_MODIFIER / 100
@@ -1694,9 +1670,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			. += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR
 
 	return .
-//////////////////
-// ATTACK PROCS //
-//////////////////
 
 //////////////////
 // ATTACK PROCS //

code/modules/mob/living/carbon/human/species_types/podpeople.dm

@@ -3,6 +3,7 @@
 	name = "Podperson"
 	id = "pod"
 	default_color = "59CE00"
+	// GS13: Podpeople Customisation
 	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,FACEHAIR,WINGCOLOR)
 	inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID
 	mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts","mam_waggingtail","spines", "horns", "frills", "legs", "taur", "deco_wings")
@@ -31,7 +32,7 @@
 	C.faction -= "plants"
 	C.faction -= "vines"
 
-/datum/species/pod/qualifies_for_rank(rank, list/features)
+/datum/species/pod/qualifies_for_rank(rank, list/features) // GS13
 	return TRUE
 
 
@@ -75,6 +76,7 @@
 		if(/obj/item/projectile/energy/florayield)
 			H.nutrition = min(H.nutrition+30, NUTRITION_LEVEL_FULL)
 
+// GS13 edit
 /datum/species/pod/spec_death(gibbed, mob/living/carbon/human/H)
 	if(H)
 		stop_wagging_tail(H)
@@ -101,6 +103,7 @@
 		mutant_bodyparts -= "mam_waggingtail"
 		mutant_bodyparts |= "mam_tail"
 	H.update_body()
+// GS13 edit end
 
 /datum/species/pod/pseudo_weak
 	id = "podweak"

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

@@ -628,7 +628,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
 	if(slurring || drunkenness)
 		slurring = max(slurring-1,0,drunkenness)
 
-	if(burpslurring)
+	if(burpslurring) // GS13
 		burpslurring = max(burpslurring-1,0)
 
 	if(cultslurring)

code/modules/mob/living/death.dm

@@ -93,7 +93,7 @@
 
 	if (client)
 		client.move_delay = initial(client.move_delay)
-		client.lastrespawn = world.time + 1800 SECONDS //on death, 30 min respawn time.
+		client.lastrespawn = world.time + respawn_time SECONDS
 
 	for(var/s in ownedSoullinks)
 		var/datum/soullink/S = s

code/modules/mob/mob.dm

@@ -1,4 +1,5 @@
-
+/mob
+	var/respawn_time = 60
 
 /mob/Destroy()//This makes sure that mobs with clients/keys are not just deleted from the game.
 	GLOB.mob_list -= src
@@ -473,7 +474,7 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA
 		qdel(M)
 		return
 
-	usr.client.lastrespawn = world.time + 180 SECONDS
+	usr.client.lastrespawn = world.time + respawn_time SECONDS
 	usr.client.respawn_observing = 0
 	message_admins("[client.ckey] respawned.")
 	M.ckey = ckey //shamelessly copied to

code/modules/mob/mob_defines.dm

@@ -61,8 +61,7 @@
 	var/dizziness = 0//Carbon
 	var/jitteriness = 0//Carbon
 
-	///How full is the parent mob?
-	var/fullness = FULLNESS_LEVEL_HALF_FULL
+	var/fullness = FULLNESS_LEVEL_HALF_FULL // GS13
 	var/nutrition = NUTRITION_LEVEL_START_MIN // randomised in Initialize
 	var/thirst = THIRST_LEVEL_START_MIN	//same for this
 	var/satiety = 0//Carbon