Merge pull request #143 from Alphas00/master

Modular graysuit update, rolling paper crafting, bartender 2

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

@@ -12,6 +12,10 @@
 	..()
 	U = null
 
+/obj/item/clothing/under/rank/chef/modular/jumpsuit_adjust()
+	..()
+	worn_overlays()
+
 /obj/item/clothing/under/rank/chef/modular/worn_overlays(isinhands = FALSE)
 	if(!isinhands)
 		. = list()
@@ -42,3 +46,52 @@
 			. += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = blood_DNA_to_color())
 		if(accessory_overlay)
 			. += accessory_overlay
+
+/obj/item/clothing/under/color/grey/modular
+	name = "grey modular jumpsuit"
+	desc = "A tasteful grey jumpsuit that reminds you of the good old days. Now adjusts to the match the wearer's size!"
+
+	var/mob/living/carbon/U
+
+/obj/item/clothing/under/color/grey/modular/equipped(mob/user, slot)
+	..()
+	U = user
+
+/obj/item/clothing/under/color/grey/modular/dropped()
+	..()
+	U = null
+
+/obj/item/clothing/under/color/grey/modular/jumpsuit_adjust()
+	..()
+	worn_overlays()
+
+/obj/item/clothing/under/color/grey/modular/worn_overlays(isinhands = FALSE)
+	if(!isinhands)
+		. = list()
+		var/obj/item/organ/O
+		var/obj/item/organ/genital/G
+		for(O in U.internal_organs)
+			if(istype(O, /obj/item/organ/genital/belly))
+				G = O
+				if(!adjusted)
+					. += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "belly_[G.size]", GENITALS_UNDER_LAYER)
+				else
+					. += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "belly_[G.size]_d", GENITALS_UNDER_LAYER)
+			if(istype(O, /obj/item/organ/genital/anus))
+				G = O
+				if(suit_style == DIGITIGRADE_SUIT_STYLE)
+					. += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "butt_[G.size]_l", GENITALS_FRONT_LAYER)
+					. += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "butt_[G.size]_l_NORTH", GENITALS_FRONT_LAYER)
+				else
+					. += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "butt_[G.size]", GENITALS_FRONT_LAYER)
+					. += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "butt_[G.size]_NORTH", GENITALS_FRONT_LAYER)
+			if(istype(O, /obj/item/organ/genital/breasts))
+				G = O
+				. += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "breasts_[G.size]", GENITALS_BEHIND_LAYER)	//nearest
+				. += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "breasts_[G.size]_NORTH", BODY_FRONT_LAYER)	//farthest
+		if(damaged_clothes)
+			. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
+		if(blood_DNA)
+			. += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = blood_DNA_to_color())
+		if(accessory_overlay)
+			. += accessory_overlay

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -360,6 +360,8 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 	new/datum/stack_recipe("19x19 canvas", /obj/item/canvas/nineteenXnineteen, 3), \
 	new/datum/stack_recipe("23x19 canvas", /obj/item/canvas/twentythreeXnineteen, 4), \
 	new/datum/stack_recipe("23x23 canvas", /obj/item/canvas/twentythreeXtwentythree, 5), \
+	null, \
+	new/datum/stack_recipe("rolling paper", /obj/item/rollingpaper, 1), \
 	))
 
 /obj/item/stack/sheet/cloth

code/modules/jobs/job_types/cargo_service.dm

@@ -163,7 +163,7 @@ Bartender
 	department_head = list("Head of Personnel")
 	department_flag = CIVILIAN
 	faction = "Station"
-	total_positions = 1
+	total_positions = 2
 	spawn_positions = 1
 	supervisors = "the head of personnel"
 	selection_color = "#bbe291"

modular_citadel/code/modules/arousal/organs/genitals.dm

@@ -46,6 +46,7 @@
 	update_size()
 	update_appearance()
 	update_link()
+	owner.regenerate_icons()
 
 //exposure and through-clothing code
 /mob/living/carbon