Merge branch 'master' into typoFixes

code/_onclick/hud/parallax.dm

@@ -170,12 +170,13 @@
 
 		L.transform = newtransform
 
-		animate(L, transform = matrix(), time = T, loop = -1, flags = ANIMATION_END_NOW)
+		animate(L, transform = L.transform, time = 0, loop = -1, flags = ANIMATION_END_NOW)
+		animate(transform = matrix(), time = T)
 
 /datum/hud/proc/update_parallax()
 	var/client/C = mymob.client
 	var/turf/posobj = get_turf(C.eye)
-	if(!posobj)	
+	if(!posobj)
 		return
 	var/area/areaobj = posobj.loc
 
@@ -341,7 +342,7 @@
 //Layenia parallaxes
 
 /obj/screen/parallax_layer/layenia
-	icon_state = null 
+	icon_state = null
 	blend_mode = BLEND_OVERLAY
 	absolute = TRUE
 	speed = 0.6

code/game/turfs/simulated/chasm.dm

@@ -121,7 +121,7 @@
 	gender = PLURAL
 	desc = "Clouds as far as the eye can see... Watch your step."
 	icon = 'icons/turf/space.dmi'
-	icon_state = "clouds"
+	icon_state = "cloud"
 	plane = PLANE_SPACE
 	tiled_dirt = FALSE
 	baseturfs = /turf/open/chasm/cloud
@@ -132,10 +132,8 @@
 
 /turf/open/chasm/cloud/Initialize()
 	. = ..()
-	icon_state = SPACE_ICON_STATE
 
 /turf/open/chasm/cloud/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
 	underlay_appearance.icon = 'icons/turf/space.dmi'
-	underlay_appearance.icon_state = SPACE_ICON_STATE
 	underlay_appearance.plane = PLANE_SPACE
 	return TRUE

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

@@ -130,11 +130,11 @@
 	if(LAZYLEN(internal_organs) && user.client?.prefs.cit_toggles)
 		for(var/obj/item/organ/genital/dicc in internal_organs)
 			if(istype(dicc) && dicc.is_exposed())
-				if(!dicc.limited)
-					if(!dicc.equipment)
-						. += "[dicc.desc]"
-					else
-						. += "[dicc.desc] <span class='love'>It's equipped with a [dicc.equipment.name].</span>"
+
+				if(!dicc.equipment)
+					. += "[dicc.desc]"
+				else
+					. += "[dicc.desc] <span class='love'>It's equipped with a [dicc.equipment.name].</span>"
 
 
 	if(user.client?.prefs.cit_toggles & VORE_EXAMINE)

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

@@ -182,10 +182,24 @@
 	if(legcuffed)
 		dat += "<tr><td><A href='?src=[REF(src)];item=[SLOT_LEGCUFFED]'>Legcuffed</A></td></tr>"
 
+
+	var/mob/living/carbon/U = src //for carbon genitals
+	if(U)
+		for(var/obj/item/organ/genital/G in U.internal_organs)
+			if(G.is_exposed())
+				if(!G.equipment)
+					dat += "<tr><td><B>[G.name]:</B></td><td><A href='?src=[REF(src)];item=[G.equipment]'>["<font color=grey>Empty</font>"]</A></td></tr>"
+				else
+					dat += "<tr><td><B>[G.name]:</B></td><td><A href='?src=[REF(src)];gitem=\ref[G.equipment]'>[G.equipment.name]</A></td></tr>"
+			else
+				dat += "<tr><td><font color=grey><B>[G.name]:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
+
 	dat += {"</table>
 	<A href='?src=[REF(user)];mach_close=mob[REF(src)]'>Close</A>
 	"}
 
+
+
 	var/datum/browser/popup = new(user, "mob[REF(src)]", "[src]", 440, 510)
 	popup.set_content(dat.Join())
 	popup.open()
@@ -237,6 +251,23 @@
 				to_chat(usr, "<span class='warning'>You can't reach that! Something is covering it.</span>")
 				return
 
+		if(href_list["gitem"])//remove gential item
+			var/obj/item/I = locate(href_list["gitem"])
+			var/obj/item/organ/genital/G = I.loc
+			if(G.is_exposed())
+				to_chat(usr, "<span class='notice'>You try to remove [src]'s [I].</span>")
+				to_chat(src, "<span class='warning'>[usr] is trying to remove your [I].</span>")
+				if(!do_mob(usr, src, 3 SECONDS))
+					return
+				SEND_SIGNAL(I, "detach_genital_equipment",usr)
+				usr.put_in_hands(I)
+				G.equipment = null
+				return
+			else
+				to_chat(usr, "<span class='warning'>You can't reach that! Something is covering it.</span>")
+				return
+
+
 		if(href_list["pockets"])
 			var/pocket_side = href_list["pockets"]
 			var/pocket_id = (pocket_side == "right" ? SLOT_R_STORE : SLOT_L_STORE)