Merge branch 'sheepishgoat:master' into feature/cegloves-and-others

GainStation13/code/game/donator.dm

@@ -149,3 +149,15 @@
 	category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
 	path = /obj/item/clothing/shoes/wheelys
 	ckeywhitelist = list("colorlessspy")
+
+/datum/gear/crowbars_plush
+	name = "Crowbars Plush"
+	category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
+	path = /obj/item/toy/plush/gs13/crowbars
+	ckeywhitelist = list("M16nPregnant")
+
+/datum/gear/sams_welder
+	name = "Sam's Unlucky Welder"
+	category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
+	path = /obj/item/weldingtool/bronze
+	ckeywhitelist = list("almaniak")

GainStation13/code/game/plushes.dm

@@ -76,3 +76,8 @@
 	desc = "A plush of black-furred nerdy goat."
 	icon_state = "metis"
 	attack_verb = list("squished", "goated", "baah'd")
+
+/obj/item/toy/plush/gs13/crowbars
+	desc = "A plush of a silly-eyed xeno seccie."
+	icon_state = "crowbars"
+	attack_verb = list("squished", "crowbared", "beno'd")

GainStation13/code/modules/clothing/under/jobs/modcivilian.dm

@@ -69,7 +69,8 @@
 	name = "grey modular jumpsuit" //change name from base clothes to distinguish them
 	desc = "A tasteful grey jumpsuit that reminds you of the good old days. Now adjusts to the match the wearer's size!" //description same as above
 
-	var/icon_location = 'GainStation13/icons/mob/modclothes/graymodular.dmi' //specify the file path where the modular overlays for those clothes are located
+	var/icon_location = 'GainStation13/icons/mob/modclothes/graymodular.dmi' //Default belly
+	var/icon_round_location = 'GainStation13/icons/mob/modclothes/graymodular_round.dmi'
 	var/icon_stuffed_location = 'GainStation13/icons/mob/modclothes/graymodular_stuffed.dmi'
 	var/mob/living/carbon/U //instance a variable for keeping track of the user
 
@@ -96,9 +97,16 @@
 					G = O //treat that organ as a genital
 					// Change to visually update sprite depending on fullness.
 					if(ishuman(O.owner))
+						// Get mob
 						var/mob/living/carbon/human/H = O.owner
+						// Check what belly shape the mob has
+						var/used_icon_location
+						switch(G.shape)
+							if("Soft Belly")
+								used_icon_location = icon_location
+							if("Round Belly")
+								used_icon_location = icon_round_location
 						var/size = 0
-						var/used_icon_location = icon_location
 
 						switch(H.fullness)
 							if(-100 to FULLNESS_LEVEL_BLOATED) // Normal

GainStation13/code/modules/events/vent_clog.dm/vent_clog.dm

@@ -3,7 +3,7 @@
 /datum/round_event_control/vent_clog/fattening
 	name = "Clogged Vents: Fattening"
 	typepath = /datum/round_event/vent_clog/fattening
-	max_occurrences = 2
+	max_occurrences = 0
 	min_players = 5
 	description = "Spits out lipoifier foam through the scrubber system."
 

GainStation13/code/modules/mob/dead/new_player/sprite_accessories/ears.dm

@@ -25,3 +25,17 @@
 	icon = 'GainStation13/icons/mob/markings/mam_ears.dmi'
 	color_src = MATRIXED
 	matrixed_sections = MATRIX_RED_GREEN
+
+/datum/sprite_accessory/ears/human/fennec_tall
+	name = "Fennec (Tall)"
+	icon = 'GainStation13/icons/mob/32x64_mam_ears.dmi'
+	icon_state = "fennectall"
+	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
+
+/datum/sprite_accessory/ears/mam_ears/fennec_tall
+	name = "Fennec (Tall)"
+	icon = 'GainStation13/icons/mob/32x64_mam_ears.dmi'
+	icon_state = "fennectall"
+	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN

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

@@ -7,8 +7,8 @@
 	slot 					= ORGAN_SLOT_BELLY
 	w_class 				= 3
 	size 					= 0
+	shape 					= DEF_BELLY_SHAPE
 	var/statuscheck			= FALSE
-	shape					= "belly"
 	genital_flags 			= UPDATE_OWNER_APPEARANCE
 	masturbation_verb 		= "massage"
 	var/sent_full_message	= TRUE //defaults to 1 since they're full to start
@@ -30,19 +30,22 @@
 /obj/item/organ/genital/belly/update_appearance()
 	//GS13 - Port Stuffed states
 	// Default settings
-	icon_state = "belly_[shape]_[size]"
-	icon = 'hyperstation/icons/obj/genitals/belly.dmi'
+	var/datum/sprite_accessory/S = GLOB.belly_shapes_list[shape] //GS13 - get belly shape
+	var/icon_shape_state = S ? S.icon_state : "belly" //fallback to default belly in case we cant find a shape
+	icon_state = "belly_[icon_shape_state]_[size]"
+	var/icon_shape = S ? S.icon : "hyperstation/icons/obj/genitals/belly.dmi" //fallback to default belly in case we cant find a shape
+	icon = icon_shape
 
 	// Change belly sprite and size based on current fullness
 	switch(owner.fullness)
 		if(FULLNESS_LEVEL_BLOATED to FULLNESS_LEVEL_BEEG)
-			icon = 'hyperstation/icons/obj/genitals/belly_stuffed.dmi'
+			icon = 'hyperstation/icons/obj/genitals/belly_round.dmi' //We use round belly to represent stuffedness
 		if(FULLNESS_LEVEL_BEEG to FULLNESS_LEVEL_NOMOREPLZ)
-			icon = 'hyperstation/icons/obj/genitals/belly_stuffed.dmi'
-			icon_state = "belly_[shape]_[size+1]"
+			icon = 'hyperstation/icons/obj/genitals/belly_round.dmi'
+			icon_state = "belly_[icon_shape_state]_[size+1]"
 		if(FULLNESS_LEVEL_NOMOREPLZ to INFINITY)
-			icon = 'hyperstation/icons/obj/genitals/belly_stuffed.dmi'
-			icon_state = "belly_[shape]_[size+2]"
+			icon = 'hyperstation/icons/obj/genitals/belly_round.dmi'
+			icon_state = "belly_[icon_shape_state]_[size+2]"
 
 	if(owner)
 		if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"])
@@ -61,6 +64,7 @@
 	else
 		color = "#[D.features["belly_color"]]"
 	size = D.features["belly_size"]
+	shape = D.features["belly_shape"]
 	inflatable = D.features["inflatable_belly"]
 	toggle_visibility(D.features["belly_visibility"], FALSE)