Merge remote-tracking branch 'upstream/master' into FeedingTubePolish

GainStation13/code/clothing/gloves.dm

@@ -0,0 +1,15 @@
+// GS13 - Port CE Gloves
+/obj/item/clothing/gloves/color/yellow/ce //funky looking, basically combat gloves
+	desc = "Special Insulated gloves with pricy thermal shielding normally only found in combat gloves."
+	name = "Chief Engineer Insulated Gloves"
+	icon = 'GainStation13/icons/obj/clothing/gloves.dmi'
+	icon_state = "ce_insuls"
+	item_state = "blackgloves"
+	siemens_coefficient = 0
+	permeability_coefficient = 0.05
+	strip_delay = 80
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+	resistance_flags = NONE

GainStation13/code/clothing/haydee_suit.dm

@@ -4,7 +4,6 @@
 	icon = 'GainStation13/icons/obj/clothing/haydee_modular.dmi'
 	mob_overlay_icon = 'GainStation13/icons/obj/clothing/haydee_modular.dmi'
 	icon_state = "haydee_helmet"
-	item_state = "item_haydee_helmet"
 	armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 25, "fire" = 25, "acid" = 25)
 	slowdown = 0
 	mutantrace_variation = NONE

GainStation13/code/datums/traits.dm

@@ -125,3 +125,26 @@
 	mob_trait = TRAIT_DISTANT
 	value = 0
 	medical_record_text = "Patient cares little with or dislikes being touched."
+
+/datum/quirk/vegetarian
+	name = "Vegetarian"
+	desc = "You find the idea of eating meat morally and physically repulsive."
+	value = 0
+	gain_text = "<span class='notice'>You feel repulsion at the idea of eating meat.</span>"
+	lose_text = "<span class='notice'>You feel like eating meat isn't that bad.</span>"
+	medical_record_text = "Patient reports a vegetarian diet."
+
+/datum/quirk/vegetarian/add()
+	var/mob/living/carbon/human/H = quirk_holder
+	var/datum/species/species = H.dna.species
+	species.liked_food &= ~MEAT
+	species.disliked_food |= MEAT
+
+/datum/quirk/vegetarian/remove()
+	var/mob/living/carbon/human/H = quirk_holder
+	if(H)
+		var/datum/species/species = H.dna.species
+		if(initial(species.liked_food) & MEAT)
+			species.liked_food |= MEAT
+		else
+			species.disliked_food &= ~MEAT

GainStation13/code/modules/mob/living/belly.dm

@@ -18,7 +18,7 @@
 	layer_index = BELLY_LAYER_INDEX
 
 /obj/item/organ/genital/belly/modify_size(modifier, min = BELLY_SIZE_DEF, max = BELLY_SIZE_MAX)
-	var/new_value = clamp(size_cached + modifier, min, max)
+	var/new_value = clamp(size_cached + modifier, starting_size, max)
 	if(new_value == size_cached)
 		return
 	prev_size = size_cached
@@ -64,6 +64,7 @@
 	else
 		color = "#[D.features["belly_color"]]"
 	size = D.features["belly_size"]
+	starting_size = D.features["belly_size"]
 	shape = D.features["belly_shape"]
 	inflatable = D.features["inflatable_belly"]
 	toggle_visibility(D.features["belly_visibility"], FALSE)

code/controllers/subsystem/processing/quirks.dm

@@ -17,7 +17,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 /datum/controller/subsystem/processing/quirks/Initialize(timeofday)
 	if(!quirks.len)
 		SetupQuirks()
-		quirk_blacklist = list(list("Blind","Nearsighted"),list("Jolly","Depression","Apathetic"),list("Ageusia","Deviant Tastes"),list("Ananas Affinity","Ananas Aversion"),list("Alcohol Tolerance","Alcohol Intolerance"),list("Alcohol Intolerance","Drunken Resilience"), list("Weak Legs", "Strong Legs"), list("Fat Affinity","Fat Aversion")) //GS13 EDIT
+		quirk_blacklist = list(list("Blind","Nearsighted"),list("Jolly","Depression","Apathetic"),list("Ageusia", "Vegetarian", "Deviant Tastes"),list("Ananas Affinity","Ananas Aversion"),list("Alcohol Tolerance","Alcohol Intolerance"),list("Alcohol Intolerance","Drunken Resilience"), list("Weak Legs", "Strong Legs"), list("Fat Affinity","Fat Aversion")) //GS13 EDIT
 	return ..()
 
 /datum/controller/subsystem/processing/quirks/proc/SetupQuirks()

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -11,7 +11,7 @@
 	new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src)
 	new /obj/item/clothing/head/hardhat/white(src)
 	new /obj/item/clothing/head/hardhat/weldhat/white(src)
-	new /obj/item/clothing/gloves/color/yellow(src)
+	new /obj/item/clothing/gloves/color/yellow/ce(src)
 	new /obj/item/tank/jetpack/suit(src)
 	new /obj/item/cartridge/ce(src)
 	new /obj/item/radio/headset/heads/ce(src)

code/modules/arousal/genitals.dm

@@ -32,6 +32,7 @@
 	var/obj/item/equipment 		//for fun stuff that goes on the gentials/maybe rings down the line
 	var/dontlist				= FALSE
 	var/nochange				= FALSE //stops people changing visablity.
+	var/starting_size //GS13 EDIT
 
 
 /obj/item/organ/genital/Initialize(mapload, do_update = TRUE)

code/modules/arousal/organs/breasts.dm

@@ -75,7 +75,7 @@
 //this is far too lewd wah
 
 /obj/item/organ/genital/breasts/modify_size(modifier, min = -INFINITY, max = INFINITY)
-	var/new_value = clamp(cached_size + modifier, min, max)
+	var/new_value = clamp(cached_size + modifier, starting_size, max) //GS13 EDIT
 	if(new_value == cached_size)
 		return
 	prev_size = cached_size
@@ -115,6 +115,7 @@
 	else
 		color = "#[D.features["breasts_color"]]"
 	size = D.features["breasts_size"]
+	starting_size = D.features["breasts_size"]
 	shape = D.features["breasts_shape"]
 	if(!D.features["breasts_producing"])
 		genital_flags &= ~ (GENITAL_FUID_PRODUCTION|CAN_CLIMAX_WITH|CAN_MASTURBATE_WITH)

code/modules/arousal/organs/butt.dm

@@ -16,7 +16,7 @@
 	layer_index = BUTT_LAYER_INDEX
 
 /obj/item/organ/genital/butt/modify_size(modifier, min = -INFINITY, max = BUTT_SIZE_MAX)
-	var/new_value = clamp(size_cached + modifier, min, max)
+	var/new_value = clamp(size_cached + modifier, starting_size, max) //GS13 EDIT
 	if(new_value == size_cached)
 		return
 	prev_size = size_cached
@@ -47,6 +47,8 @@
 
 	//Reflect the size of dat ass on examine.
 	switch(round(size))
+		if(0)
+			size_name = "nonexistent" // GS13 EDIT
 		if(1)
 			size_name = "average"
 		if(2)
@@ -58,7 +60,7 @@
 		if(5)
 			size_name = pick("massive","extreme","enormous","very generous","humongous","big bubbly","dummy thicc")
 		else
-			size_name = "nonexistent"
+			size_name = "oversized" //GS13 edit
 
 	desc = "You see a [lowershape] of [size_name] asscheeks."
 
@@ -82,5 +84,6 @@
 	else
 		color = "#[D.features["butt_color"]]"
 	size = D.features["butt_size"]
+	starting_size = D.features["butt_size"] // GS13 EDIT
 	prev_size = size
 	toggle_visibility(D.features["butt_visibility"], FALSE)

tgstation.dme

@@ -3909,6 +3909,7 @@
 #include "GainStation13\code\clothing\backpacks.dm"
 #include "GainStation13\code\clothing\calorite_collar.dm"
 #include "GainStation13\code\clothing\fat_mask.dm"
+#include "GainStation13\code\clothing\gloves.dm"
 #include "GainStation13\code\clothing\haydee_suit.dm"
 #include "GainStation13\code\clothing\head.dm"
 #include "GainStation13\code\clothing\shoes.dm"