Merge pull request #12578 from GhostActual/tg-port-4

The Grand /TG Port - Part 4

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -357,3 +357,35 @@
 
 /obj/structure/bed/alien/attackby(obj/item/weapon/W, mob/user)
 	return // No deconning.
+
+/*
+ * Dirty Mattress
+ */
+/obj/structure/dirtybed
+	name = "dirty mattress"
+	desc = "A stained matress. Guess it's better than sleeping on the floor."
+	icon = 'icons/obj/furniture.dmi'
+	icon_state = "dirtybed"
+	pressure_resistance = 15
+	anchored = TRUE
+	can_buckle = TRUE
+	buckle_dir = SOUTH
+	buckle_lying = 1
+
+/obj/structure/dirtybed/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(W.is_wrench())
+		playsound(src, W.usesound, 100, 1)
+		if(anchored)
+			user.visible_message("[user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.")
+		else
+			user.visible_message("[user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.")
+
+		if(do_after(user, 20 * W.toolspeed))
+			if(!src) return
+			to_chat(user, "<span class='notice'>You [anchored? "un" : ""]secured \the [src]!</span>")
+			anchored = !anchored
+		return
+
+	if(!anchored)
+		to_chat(user,"<span class='notice'> The bed isn't secured.</span>")
+		return

code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm

@@ -2,6 +2,10 @@
 	display_name = "nudity permit"
 	path = /obj/item/clothing/under/permit
 
+/datum/gear/uniform/suit/natureist_talisman
+	display_name = "naturist talisman"
+	path = /obj/item/clothing/under/permit/natureist_talisman
+
 //Polaris overrides
 /datum/gear/uniform/solgov/pt/sifguard
 	display_name = "pt uniform, planetside sec"

code/modules/clothing/shoes/miscellaneous.dm

@@ -227,14 +227,6 @@
 /obj/item/clothing/shoes/boots/ranger/yellow
 	bootcolor = "yellow"
 
-/obj/item/clothing/shoes/primitive
-	name = "primitive shoes"
-	desc = "Some patched together rags. Better than being barefoot."
-	icon_state = "rag"
-	force = 0
-	drop_sound = 'sound/items/drop/clothing.ogg'
-	pickup_sound = 'sound/items/pickup/clothing.ogg'
-
 /*
  * 80s
  */

code/modules/clothing/under/miscellaneous.dm

@@ -1257,13 +1257,6 @@
 	icon_state = "cowboy_grey"
 	worn_state = "cowboy_grey"
 
-/obj/item/clothing/under/primitive
-	name = "primitive clothes"
-	desc = "Some patched together rags. Better than being naked."
-	force = 0
-	icon_state = "rag"
-	worn_state = "rag"
-
 /obj/item/clothing/under/curator
 	name = "curator uniform"
 	desc = "A rugged uniform suitable for treasure hunting."

code/modules/clothing/under/miscellaneous_vr.dm

@@ -6,8 +6,8 @@
 /obj/item/clothing/under/permit
 	name = "public nudity permit"
 	desc = "This permit entitles the bearer to conduct their duties without a uniform. Normally issued to furred crewmembers or those with nothing to hide."
-	icon = 'icons/obj/card.dmi'
-	icon_state = "guest"
+	icon = 'icons/obj/card_new.dmi'
+	icon_state = "permit-nude"
 	body_parts_covered = 0
 	equip_sound = null
 
@@ -299,7 +299,7 @@
 /obj/item/clothing/under/summerdress/blue
 	icon_state = "summerdress2"
 
-/obj/item/clothing/under/dress/dress_cap/femformal // formal in the loosest sense. because it's going to be taken off. or something. funnier in my head i swear 
+/obj/item/clothing/under/dress/dress_cap/femformal // formal in the loosest sense. because it's going to be taken off. or something. funnier in my head i swear
 	name = "site manager's feminine formalwear"
 	desc = "Essentially a skimpy...dress? Leotard? Whatever it is, it has the coloration and markings suitable for a site manager or rough equivalent."
 	icon = 'icons/inventory/uniform/item_vr.dmi'

code/modules/clothing/under/tribal.dm

@@ -0,0 +1,70 @@
+/* Tribal Clothing
+ * Contains:
+ *		Primitive Clothing
+ *		Tribal Clothing
+ */
+
+/*
+ * Primitive Clothing
+ */
+/obj/item/clothing/under/primitive
+	name = "primitive clothes"
+	desc = "Some patched together rags. Better than being naked."
+	force = 0
+	icon_state = "rag"
+	worn_state = "rag"
+
+/obj/item/clothing/shoes/primitive
+	name = "primitive shoes"
+	desc = "Some patched together rags. Better than being barefoot."
+	icon_state = "rag"
+	force = 0
+	drop_sound = 'sound/items/drop/clothing.ogg'
+	pickup_sound = 'sound/items/pickup/clothing.ogg'
+
+/*
+ * Tribal Clothing
+ */
+/obj/item/clothing/under/permit/natureist_talisman //Tribal version of the Nudity Permit
+	name = "naturist talisman"
+	desc = "This ancient talisman gives rights to those that wish to be closer to nature by casting their constricting clothes aside."
+	icon = 'icons/inventory/accessory/item.dmi'
+	icon_override = 'icons/inventory/accessory/mob.dmi'
+	icon_state = "talisman"
+	item_state = "talisman"
+	worn_state = "talisman"
+
+/obj/item/clothing/under/tribalwear
+	item_state_slots = list(slot_r_hand_str = "tribalwear", slot_l_hand_str = "tribalwear")
+
+/obj/item/clothing/under/tribalwear/common1
+	name = "tribalwear"
+	desc = "A traditionally woven robe made with locally sourced material."
+	icon_state = "tribal_common1"
+
+/obj/item/clothing/under/tribalwear/common2
+	name = "tribalwear"
+	desc = "A traditionally woven outfit made with locally sourced material."
+	icon_state = "tribal_common2"
+
+/obj/item/clothing/under/tribalwear/hunter
+	name = "hunting tribalwear"
+	desc = "Dusty rags decorated with strips of leather and small pieces of cyan colored stones."
+	icon_state = "tribal_hunter"
+
+/obj/item/clothing/under/tribalwear/chief
+	name = "chief's tribalwear"
+	desc = "Well maintained robe adorned with fine leather and polished cyan stones."
+	icon_state = "tribal_chief"
+
+/obj/item/clothing/under/tribalwear/shaman
+	name = "shaman robes"
+	desc = "Carefully hand wozen cloth robes with heavy colored stones jewelry drapped over top."
+	icon_state = "tribal_shaman"
+
+/obj/item/clothing/shoes/tribalwear
+	name = "tribal sandals"
+	desc = "Traditionally made sandals made with local materials."
+	icon_state = "tribal_sandals"
+	species_restricted = null
+	body_parts_covered = 0

vorestation.dme

@@ -2216,6 +2216,7 @@
 #include "code\modules\clothing\under\solgov.dm"
 #include "code\modules\clothing\under\solgov_vr.dm"
 #include "code\modules\clothing\under\syndicate.dm"
+#include "code\modules\clothing\under\tribal.dm"
 #include "code\modules\clothing\under\accessories\accessory.dm"
 #include "code\modules\clothing\under\accessories\accessory_ch.dm"
 #include "code\modules\clothing\under\accessories\accessory_vr.dm"