Xenofauna map update. (#9135)

* Repaths badges, ribbons, pins and permits to /medal. * Drakes can now wear pride pins. * Updates xenofauna map, repaths some accessories. * Added fence door interaction for drakes (open but not close) * Adds stasis cages to the Xenofauna lab. * Corrects some Cynosure badge paths. * Allows mobs to climb into stasis cages themselves. * Added lower temperature sensor alarms to xenofauna.
2026-01-04 06:22:38 +00:00 · 2023-07-09 11:51:00 +10:00
parent 0e46b5880b
commit f192cfd812
39 changed files with 288 additions and 201 deletions
--- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm
@@ -336,28 +336,28 @@

 /datum/gear/accessory/pride
 	display_name = "pride pin selection"
-	path = /obj/item/clothing/accessory/pride
+	path = /obj/item/clothing/accessory/medal/pride

 /datum/gear/accessory/pride/New()
 	..()
 	var/list/pridepins = list()
-	for(var/pridepin in typesof(/obj/item/clothing/accessory/pride))
-		var/obj/item/clothing/accessory/pridepin_type = pridepin
+	for(var/pridepin in typesof(/obj/item/clothing/accessory/medal/pride))
+		var/obj/item/clothing/accessory/medal/pridepin_type = pridepin
 		pridepins[initial(pridepin_type.name)] = pridepin_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pridepins))

 /datum/gear/accessory/corpbadge
 	display_name = "investigator holobadge (IAA)"
-	path = /obj/item/clothing/accessory/badge/holo/investigator
+	path = /obj/item/clothing/accessory/medal/badge/holo/investigator
 	allowed_roles = list("Internal Affairs Agent")

 /datum/gear/accessory/pressbadge
 	display_name = "press pass, corporate"
-	path = /obj/item/clothing/accessory/badge/press
+	path = /obj/item/clothing/accessory/medal/badge/press

 /datum/gear/accessory/pressbadgefreelance
 	display_name = "press pass, freelance"
-	path = /obj/item/clothing/accessory/badge/press/independent
+	path = /obj/item/clothing/accessory/medal/badge/press/independent

 /datum/gear/accessory/legbrace
 	display_name = "leg braces"
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -465,37 +465,36 @@
 	icon_state = "sash"
 	slot = ACCESSORY_SLOT_OVER

-/obj/item/clothing/accessory/pride
+/obj/item/clothing/accessory/medal/pride
 	name = "pride pin"
 	desc = "A pin displaying pride in one's identity."
 	icon_state = "pride"
-	slot = ACCESSORY_SLOT_MEDAL

-/obj/item/clothing/accessory/pride/bi
+/obj/item/clothing/accessory/medal/pride/bi
 	name = "bisexual pride pin"
 	icon_state = "pride_bi"

-/obj/item/clothing/accessory/pride/trans
+/obj/item/clothing/accessory/medal/pride/trans
 	name = "transgender pride pin"
 	icon_state = "pride_trans"

-/obj/item/clothing/accessory/pride/ace
+/obj/item/clothing/accessory/medal/pride/ace
 	name = "asexual pride pin"
 	icon_state = "pride_ace"

-/obj/item/clothing/accessory/pride/enby
+/obj/item/clothing/accessory/medal/pride/enby
 	name = "nonbinary pride pin"
 	icon_state = "pride_enby"

-/obj/item/clothing/accessory/pride/pan
+/obj/item/clothing/accessory/medal/pride/pan
 	name = "pansexual pride pin"
 	icon_state = "pride_pan"

-/obj/item/clothing/accessory/pride/lesbian
+/obj/item/clothing/accessory/medal/pride/lesbian
 	name = "lesbian pride pin"
 	icon_state = "pride_lesbian"

-/obj/item/clothing/accessory/pride/intersex
+/obj/item/clothing/accessory/medal/pride/intersex
 	name = "intersex pride pin"
 	icon_state = "pride_intersex"

--- a/code/modules/clothing/under/accessories/badges.dm
+++ b/code/modules/clothing/under/accessories/badges.dm
@@ -4,23 +4,22 @@
 	or they can be emagged to accept any ID for use in disguises.
 */

-/obj/item/clothing/accessory/badge
+/obj/item/clothing/accessory/medal/badge
 	name = "detective's badge"
 	desc = "NanoTrasen Security Department detective's badge, made from gold."
 	icon_state = "marshalbadge"
 	slot_flags = SLOT_BELT | SLOT_TIE
-	slot = ACCESSORY_SLOT_MEDAL

 	var/stored_name
 	var/badge_string = "Corporate Security"

-/obj/item/clothing/accessory/badge/proc/set_name(var/new_name)
+/obj/item/clothing/accessory/medal/badge/proc/set_name(var/new_name)
 	stored_name = new_name
 	name = "[initial(name)] ([stored_name])"

-/obj/item/clothing/accessory/badge/proc/set_desc(var/mob/living/carbon/human/H)
+/obj/item/clothing/accessory/medal/badge/proc/set_desc(var/mob/living/carbon/human/H)

-/obj/item/clothing/accessory/badge/attack_self(mob/user as mob)
+/obj/item/clothing/accessory/medal/badge/attack_self(mob/user as mob)

 	if(!stored_name)
 		to_chat(user, "You polish your old badge fondly, shining up the surface.")
@@ -33,47 +32,47 @@
 		else
 			user.visible_message("<span class='notice'>[user] displays their [src.name].\nIt reads: [badge_string].</span>","<span class='notice'>You display your [src.name]. It reads: [badge_string].</span>")

-/obj/item/clothing/accessory/badge/attack(mob/living/carbon/human/M, mob/living/user)
+/obj/item/clothing/accessory/medal/badge/attack(mob/living/carbon/human/M, mob/living/user)
 	if(isliving(user))
 		user.visible_message("<span class='danger'>[user] invades [M]'s personal space, thrusting [src] into their face insistently.</span>","<span class='danger'>You invade [M]'s personal space, thrusting [src] into their face insistently.</span>")
 		user.do_attack_animation(M)
 		user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //to prevent spam

 // Sheriff Badge (toy)
-/obj/item/clothing/accessory/badge/sheriff
+/obj/item/clothing/accessory/medal/badge/sheriff
 	name = "sheriff badge"
 	desc = "This town ain't big enough for the two of us, pardner."
 	icon_state = "sheriff_toy"
 	item_state = "sheriff_toy"

-/obj/item/clothing/accessory/badge/sheriff/attack_self(mob/user as mob)
+/obj/item/clothing/accessory/medal/badge/sheriff/attack_self(mob/user as mob)
 	user.visible_message("[user] shows their sheriff badge. There's a new sheriff in town!",\
 		"You flash the sheriff badge to everyone around you!")

-/obj/item/clothing/accessory/badge/sheriff/attack(mob/living/carbon/human/M, mob/living/user)
+/obj/item/clothing/accessory/medal/badge/sheriff/attack(mob/living/carbon/human/M, mob/living/user)
 	if(isliving(user))
 		user.visible_message("<span class='danger'>[user] invades [M]'s personal space, the sheriff badge into their face!.</span>","<span class='danger'>You invade [M]'s personal space, thrusting the sheriff badge into their face insistently.</span>")
 		user.do_attack_animation(M)
 		user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //to prevent spam

 //Security Holobadges
-/obj/item/clothing/accessory/badge/holo
+/obj/item/clothing/accessory/medal/badge/holo
 	name = "holobadge"
 	desc = "This glowing blue badge marks the holder as law enforcement."
 	icon_state = "holobadge"
 	var/emagged //Emagging removes Sec check.

-/obj/item/clothing/accessory/badge/holo/cord
+/obj/item/clothing/accessory/medal/badge/holo/cord
 	icon_state = "holobadge-cord"
 	slot_flags = SLOT_MASK | SLOT_TIE | SLOT_BELT

-/obj/item/clothing/accessory/badge/holo/attack_self(mob/user as mob)
+/obj/item/clothing/accessory/medal/badge/holo/attack_self(mob/user as mob)
 	if(!stored_name)
 		to_chat(user, "Waving around a holobadge before swiping an ID would be pretty pointless.")
 		return
 	return ..()

-/obj/item/clothing/accessory/badge/holo/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/clothing/accessory/medal/badge/holo/emag_act(var/remaining_charges, var/mob/user)
 	if (emagged)
 		to_chat(user, "<span class='danger'>\The [src] is already cracked.</span>")
 		return
@@ -82,7 +81,7 @@
 		to_chat(user, "<span class='danger'>You crack the holobadge security checks.</span>")
 		return 1

-/obj/item/clothing/accessory/badge/holo/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/item/clothing/accessory/medal/badge/holo/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	if(istype(O, /obj/item/card/id) || istype(O, /obj/item/pda))

 		var/obj/item/card/id/id_card = null
@@ -105,30 +104,30 @@
 	name = "holobadge box"
 	desc = "A box claiming to contain holobadges."
 	starts_with = list(
-		/obj/item/clothing/accessory/badge/holo = 4,
-		/obj/item/clothing/accessory/badge/holo/officer = 2,
-		/obj/item/clothing/accessory/badge/holo/cord = 2
+		/obj/item/clothing/accessory/medal/badge/holo = 4,
+		/obj/item/clothing/accessory/medal/badge/holo/officer = 2,
+		/obj/item/clothing/accessory/medal/badge/holo/cord = 2
 	)

-/obj/item/clothing/accessory/badge/holo/officer
+/obj/item/clothing/accessory/medal/badge/holo/officer
 	name = "officer's badge"
 	desc = "A bronze corporate security badge. Stamped with the words 'Security Officer.'"
 	icon_state = "bronzebadge"
 	slot_flags = SLOT_TIE | SLOT_BELT

-/obj/item/clothing/accessory/badge/holo/warden
+/obj/item/clothing/accessory/medal/badge/holo/warden
 	name = "warden's holobadge"
 	desc = "A silver corporate security badge. Stamped with the words 'Warden.'"
 	icon_state = "silverbadge"
 	slot_flags = SLOT_TIE | SLOT_BELT

-/obj/item/clothing/accessory/badge/holo/hos
+/obj/item/clothing/accessory/medal/badge/holo/hos
 	name = "head of security's holobadge"
 	desc = "An immaculately polished gold security badge. Stamped with the words 'Head of Security.'"
 	icon_state = "goldbadge"
 	slot_flags = SLOT_TIE | SLOT_BELT

-/obj/item/clothing/accessory/badge/holo/detective
+/obj/item/clothing/accessory/medal/badge/holo/detective
 	name = "detective's holobadge"
 	desc = "An immaculately polished gold security badge on leather. Labeled 'Detective.'"
 	icon_state = "marshalbadge"
@@ -138,22 +137,22 @@
 	name = "holobadge box"
 	desc = "A box claiming to contain holobadges."
 	starts_with = list(
-		/obj/item/clothing/accessory/badge/holo = 2,
-		/obj/item/clothing/accessory/badge/holo/warden = 1,
-		/obj/item/clothing/accessory/badge/holo/detective = 2,
-		/obj/item/clothing/accessory/badge/holo/hos = 1,
-		/obj/item/clothing/accessory/badge/holo/cord = 1
+		/obj/item/clothing/accessory/medal/badge/holo = 2,
+		/obj/item/clothing/accessory/medal/badge/holo/warden = 1,
+		/obj/item/clothing/accessory/medal/badge/holo/detective = 2,
+		/obj/item/clothing/accessory/medal/badge/holo/hos = 1,
+		/obj/item/clothing/accessory/medal/badge/holo/cord = 1

 	)

-/obj/item/clothing/accessory/badge/holo/investigator
+/obj/item/clothing/accessory/medal/badge/holo/investigator
 	name = "\improper Internal Investigations holobadge"
 	desc = "This badge marks the holder as an internal affairs investigator."
 	icon_state = "invbadge"
 	badge_string = "Internal Investigations"
 	slot_flags = SLOT_TIE | SLOT_BELT

-/obj/item/clothing/accessory/badge/holo/sheriff
+/obj/item/clothing/accessory/medal/badge/holo/sheriff
 	name = "sheriff badge"
 	desc = "A star-shaped brass badge denoting who the law is around these parts."
 	icon_state = "sheriff"
@@ -161,24 +160,24 @@

 //Other badges

-/obj/item/clothing/accessory/badge/old
+/obj/item/clothing/accessory/medal/badge/old
 	name = "faded badge"
 	desc = "A faded law enforcement badge in an older design."
 	icon_state = "badge_round"

-/obj/item/clothing/accessory/badge/solid
+/obj/item/clothing/accessory/medal/badge/solid
 	name = "\improper SolGov ID badge"
 	desc = "A descriptive identification badge with the holder's credentials. This one indicates the holder is representing the SCG."
 	icon_state = "solbadge"
 	badge_string = null

-/obj/item/clothing/accessory/badge/ntid
+/obj/item/clothing/accessory/medal/badge/ntid
 	name = "\improper NT ID badge"
 	desc = "A descriptive identification badge with the holder's credentials. This one has red marks with the NanoTrasen logo on it."
 	icon_state = "ntbadge"
 	badge_string = null

-/obj/item/clothing/accessory/badge/press
+/obj/item/clothing/accessory/medal/badge/press
 	name = "corporate press pass"
 	desc = "A corporate reporter's pass, emblazoned with the NanoTrasen logo."
 	icon_state = "pressbadge"
@@ -189,13 +188,13 @@
 	drop_sound = 'sound/items/drop/rubber.ogg'
 	pickup_sound = 'sound/items/pickup/rubber.ogg'

-/obj/item/clothing/accessory/badge/press/independent
+/obj/item/clothing/accessory/medal/badge/press/independent
 	name = "press pass"
 	desc = "A freelance journalist's pass, certified by Oculum Broadcast."
 	icon_state = "pressbadge-i"
 	badge_string = "Freelance Journalist"

-/obj/item/clothing/accessory/badge/press/plastic
+/obj/item/clothing/accessory/medal/badge/press/plastic
 	name = "plastic press pass"
 	desc = "A journalist's 'pass' shaped, for whatever reason, like a security badge. It is made of plastic."
 	icon_state = "pbadge"
@@ -204,62 +203,62 @@

 // Synthmorph bag / Corporation badges. Primarily used on the robobag, but can be worn. Default is NT.

-/obj/item/clothing/accessory/badge/corporate_tag
+/obj/item/clothing/accessory/medal/badge/corporate_tag
 	name = "NanoTrasen Badge"
 	desc = "A plain metallic plate that might denote the wearer as a member of NanoTrasen."
 	icon_state = "tag_nt"
 	item_state = "badge"
 	badge_string = "NanoTrasen"

-/obj/item/clothing/accessory/badge/corporate_tag/morpheus
+/obj/item/clothing/accessory/medal/badge/corporate_tag/morpheus
 	name = "Morpheus Badge"
 	desc = "A plain metallic plate that might denote the wearer as a member of Morpheus Cyberkinetics."
 	icon_state = "tag_blank"
 	badge_string = "Morpheus"

-/obj/item/clothing/accessory/badge/corporate_tag/wardtaka
+/obj/item/clothing/accessory/medal/badge/corporate_tag/wardtaka
 	name = "Ward-Takahashi Badge"
 	desc = "A plain metallic plate that might denote the wearer as a member of Ward-Takahashi."
 	icon_state = "tag_ward"
 	badge_string = "Ward-Takahashi"

-/obj/item/clothing/accessory/badge/corporate_tag/zenghu
+/obj/item/clothing/accessory/medal/badge/corporate_tag/zenghu
 	name = "Zeng-Hu Badge"
 	desc = "A plain metallic plate that might denote the wearer as a member of Zeng-Hu."
 	icon_state = "tag_zeng"
 	badge_string = "Zeng-Hu"

-/obj/item/clothing/accessory/badge/corporate_tag/gilthari
+/obj/item/clothing/accessory/medal/badge/corporate_tag/gilthari
 	name = "Gilthari Badge"
 	desc = "An opulent metallic plate that might denote the wearer as a member of Gilthari."
 	icon_state = "tag_gil"
 	badge_string = "Gilthari"

-/obj/item/clothing/accessory/badge/corporate_tag/veymed
+/obj/item/clothing/accessory/medal/badge/corporate_tag/veymed
 	name = "Vey-Medical Badge"
 	desc = "A plain metallic plate that might denote the wearer as a member of Vey-Medical."
 	icon_state = "tag_vey"
 	badge_string = "Vey-Medical"

-/obj/item/clothing/accessory/badge/corporate_tag/hephaestus
+/obj/item/clothing/accessory/medal/badge/corporate_tag/hephaestus
 	name = "Hephaestus Badge"
 	desc = "A rugged metallic plate that might denote the wearer as a member of Hephaestus."
 	icon_state = "tag_heph"
 	badge_string = "Hephaestus"

-/obj/item/clothing/accessory/badge/corporate_tag/grayson
+/obj/item/clothing/accessory/medal/badge/corporate_tag/grayson
 	name = "Grayson Badge"
 	desc = "A rugged metallic plate that might denote the wearer as a member of Grayson."
 	icon_state = "tag_grayson"
 	badge_string = "Grayson"

-/obj/item/clothing/accessory/badge/corporate_tag/xion
+/obj/item/clothing/accessory/medal/badge/corporate_tag/xion
 	name = "Xion Badge"
 	desc = "A rugged metallic plate that might denote the wearer as a member of Xion."
 	icon_state = "tag_xion"
 	badge_string = "Xion"

-/obj/item/clothing/accessory/badge/corporate_tag/bishop
+/obj/item/clothing/accessory/medal/badge/corporate_tag/bishop
 	name = "Bishop Badge"
 	desc = "A sleek metallic plate that might denote the wearer as a member of Bishop."
 	icon_state = "tag_bishop"
--- a/code/modules/clothing/under/accessories/permits.dm
+++ b/code/modules/clothing/under/accessories/permits.dm
@@ -1,15 +1,14 @@
 //This'll be used for gun permits, such as for heads of staff, antags, and bartenders

-/obj/item/clothing/accessory/permit
+/obj/item/clothing/accessory/medal/permit
 	name = "permit"
 	desc = "A permit for something."
 	icon = 'icons/obj/card_new.dmi'
 	icon_state = "permit-generic"
 	w_class = ITEMSIZE_TINY
-	slot = ACCESSORY_SLOT_MEDAL
 	var/owner = 0	//To prevent people from just renaming the thing if they steal it

-/obj/item/clothing/accessory/permit/attack_self(mob/user as mob)
+/obj/item/clothing/accessory/medal/permit/attack_self(mob/user as mob)
 	if(isliving(user))
 		if(!owner)
 			set_name(user.name)
@@ -17,31 +16,31 @@
 		else
 			to_chat(user, "[src] already has an owner!")

-/obj/item/clothing/accessory/permit/proc/set_name(var/new_name)
+/obj/item/clothing/accessory/medal/permit/proc/set_name(var/new_name)
 	owner = 1
 	if(new_name)
 		src.name += " ([new_name])"
 		desc += " It belongs to [new_name]."

-/obj/item/clothing/accessory/permit/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/clothing/accessory/medal/permit/emag_act(var/remaining_charges, var/mob/user)
 	to_chat(user, "You reset the naming locks on [src]!")
 	owner = 0

-/obj/item/clothing/accessory/permit/gun
+/obj/item/clothing/accessory/medal/permit/gun
 	name = "weapon permit"
 	desc = "A card indicating that the owner is allowed to carry a firearm."
 	icon_state = "permit-security"

-/obj/item/clothing/accessory/permit/gun/bar
+/obj/item/clothing/accessory/medal/permit/gun/bar
 	name = "bar shotgun permit"
 	desc = "A card indicating that the owner is allowed to carry a shotgun in the bar."

-/obj/item/clothing/accessory/permit/gun/planetside
+/obj/item/clothing/accessory/medal/permit/gun/planetside
 	name = "planetside gun permit"
 	desc = "A card indicating that the owner is allowed to carry a firearm while on the surface."
 	icon_state = "permit-science"

-/obj/item/clothing/accessory/permit/drone
+/obj/item/clothing/accessory/medal/permit/drone
 	name = "drone identification card"
 	desc = "A card issued by the EIO, indicating that the owner is a Drone Intelligence. Drones are mandated to carry this card within SolGov space, by law."
-	icon_state = "permit-drone"
+	icon_state = "permit-drone"
--- a/code/modules/clothing/under/accessories/torch.dm
+++ b/code/modules/clothing/under/accessories/torch.dm
@@ -111,30 +111,29 @@ medals
 /******
 ribbons
 ******/
-/obj/item/clothing/accessory/ribbon/solgov
+/obj/item/clothing/accessory/medal/ribbon/solgov
 	name = "ribbon"
 	desc = "A simple military decoration."
 	icon_state = "ribbon_marksman"
 	on_rolled = list("down" = "none")
-	slot = ACCESSORY_SLOT_MEDAL
 	w_class = ITEMSIZE_TINY

-/obj/item/clothing/accessory/ribbon/solgov/marksman
+/obj/item/clothing/accessory/medal/ribbon/solgov/marksman
 	name = "marksmanship ribbon"
 	desc = "A military decoration awarded to members of the SCG for good marksmanship scores in training. Common in the days of energy weapons."
 	icon_state = "ribbon_marksman"

-/obj/item/clothing/accessory/ribbon/solgov/peace
+/obj/item/clothing/accessory/medal/ribbon/solgov/peace
 	name = "peacekeeping ribbon"
 	desc = "A military decoration awarded to members of the SCG for service during a peacekeeping operation."
 	icon_state = "ribbon_peace"

-/obj/item/clothing/accessory/ribbon/solgov/frontier
+/obj/item/clothing/accessory/medal/ribbon/solgov/frontier
 	name = "frontier ribbon"
 	desc = "A military decoration awarded to members of the SCG for service along the frontier."
 	icon_state = "ribbon_frontier"

-/obj/item/clothing/accessory/ribbon/solgov/instructor
+/obj/item/clothing/accessory/medal/ribbon/solgov/instructor
 	name = "instructor ribbon"
 	desc = "A military decoration awarded to members of the SCG for service as an instructor."
 	icon_state = "ribbon_instructor"
@@ -196,14 +195,14 @@ specialty pins
 /*****
 badges
 *****/
-/obj/item/clothing/accessory/badge/solgov/security
+/obj/item/clothing/accessory/medal/badge/solgov/security
 	name = "security forces badge"
 	desc = "A silver law enforcement badge. Stamped with the words 'Master at Arms'."
 	icon_state = "silverbadge"
 	slot_flags = SLOT_TIE
 	badge_string = "Sol Central Government"

-/obj/item/clothing/accessory/badge/solgov/tags
+/obj/item/clothing/accessory/medal/badge/solgov/tags
 	name = "dog tags"
 	desc = "Plain identification tags made from a durable metal. They are stamped with a variety of informational details."
 	gender = PLURAL
@@ -211,7 +210,7 @@ badges
 	badge_string = "Sol Central Government"
 	slot_flags = SLOT_MASK | SLOT_TIE

-/obj/item/clothing/accessory/badge/solgov/tags/Initialize()
+/obj/item/clothing/accessory/medal/badge/solgov/tags/Initialize()
 	. = ..()
 	var/mob/living/carbon/human/H
 	H = get_holder_of_type(src, /mob/living/carbon/human)
@@ -219,13 +218,13 @@ badges
 		set_name(H.real_name)
 		set_desc(H)

-/obj/item/clothing/accessory/badge/solgov/tags/set_desc(var/mob/living/carbon/human/H)
+/obj/item/clothing/accessory/medal/badge/solgov/tags/set_desc(var/mob/living/carbon/human/H)
 	if(!istype(H))
 		return
 	var/religion = "Unset"
 	desc = "[initial(desc)]\nName: [H.real_name] ([H.get_species_name()])\nReligion: [religion]\nBlood type: [H.b_type]"

-/obj/item/clothing/accessory/badge/solgov/representative
+/obj/item/clothing/accessory/medal/badge/solgov/representative
 	name = "representative's badge"
 	desc = "A leather-backed plastic badge with a variety of information printed on it. Belongs to a representative of the Sol Central Government."
 	icon_state = "solbadge"
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1518,7 +1518,7 @@
 	var/braintype = get_FBP_type()
 	if(braintype == FBP_DRONE)
 		var/turf/T = get_turf(src)
-		var/obj/item/clothing/accessory/permit/drone/permit = new(T)
+		var/obj/item/clothing/accessory/medal/permit/drone/permit = new(T)
 		permit.set_name(real_name)
 		equip_to_appropriate_slot(permit) // If for some reason it can't find room, it'll still be on the floor.

--- a/code/modules/mob/living/carbon/human/stripping.dm
+++ b/code/modules/mob/living/carbon/human/stripping.dm
@@ -46,7 +46,7 @@
 			if(!A || suit.loc != src || !(A in suit.accessories))
 				return

-			if(istype(A, /obj/item/clothing/accessory/badge) || istype(A, /obj/item/clothing/accessory/medal))
+			if(istype(A, /obj/item/clothing/accessory/medal/badge) || istype(A, /obj/item/clothing/accessory/medal))
 				user.visible_message("<span class='danger'>\The [user] tears off \the [A] from [src]'s [suit.name]!</span>")
 			add_attack_logs(user,src,"Stripped [A.name] off [suit.name]")
 			A.on_removed(user)
@@ -67,7 +67,7 @@
 			var/obj/item/grab/grab = held
 			if(istype(grab) && grab.affecting == src)
 				stripping = TRUE
-		
+
 	if(stripping)
 		if(!istype(target_slot))  // They aren't holding anything valid and there's nothing to remove, why are we even here?
 			return
--- a/code/modules/mob/living/simple_mob/subtypes/animal/_animal_harness.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/_animal_harness.dm
@@ -14,6 +14,7 @@
 	var/const/ATTACHED_ARMOR = "armor plate"
 	var/const/ATTACHED_LIGHT = "light"
 	var/const/ATTACHED_ID =    "access card"
+	var/const/ATTACHED_TAG =   "tag"

 	/// Contains valid types that the harness will attach to.
 	var/list/harnessable_types
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka/grafadreka_harness.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka/grafadreka_harness.dm
@@ -19,7 +19,8 @@
 			/obj/item/storage/animal_harness/grafadreka/proc/UpdateArmor
 		),
 		/obj/item/card/id = ATTACHED_ID,
-		/obj/item/flashlight = ATTACHED_LIGHT
+		/obj/item/flashlight = ATTACHED_LIGHT,
+		/obj/item/clothing/accessory/medal = ATTACHED_TAG
 	)


--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka/grafadreka_interaction.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka/grafadreka_interaction.dm
@@ -13,6 +13,14 @@
 		Open()


+/obj/structure/fence/door/interaction_grafadreka(mob/living/simple_mob/animal/sif/grafadreka/drake)
+	. = TRUE
+	if (drake.a_intent == I_HURT)
+		return ..()
+	if (!open && !locked)
+		toggle(drake)
+
+
 /obj/structure/loot_pile/interaction_grafadreka(mob/living/simple_mob/animal/sif/grafadreka/drake)
 	. = TRUE
 	if (drake.a_intent == I_HURT)
--- a/code/modules/research/prosfab_designs.dm
+++ b/code/modules/research/prosfab_designs.dm
@@ -455,35 +455,35 @@
 	desc = "Used to identify an empty NanoTrasen FBP."
 	id = "misc_synth_bag_tag_nt"
 	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000)
-	build_path = /obj/item/clothing/accessory/badge/corporate_tag
+	build_path = /obj/item/clothing/accessory/medal/badge/corporate_tag

 /datum/design/item/prosfab/badge_morph
 	name = "Morpheus Tag"
 	desc = "Used to identify an empty Morpheus FBP."
 	id = "misc_synth_bag_tag_morph"
 	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000)
-	build_path = /obj/item/clothing/accessory/badge/corporate_tag/morpheus
+	build_path = /obj/item/clothing/accessory/medal/badge/corporate_tag/morpheus

 /datum/design/item/prosfab/badge_wardtaka
 	name = "Ward-Takahashi Tag"
 	desc = "Used to identify an empty Ward-Takahashi FBP."
 	id = "misc_synth_bag_tag_wardtaka"
 	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000)
-	build_path = /obj/item/clothing/accessory/badge/corporate_tag/wardtaka
+	build_path = /obj/item/clothing/accessory/medal/badge/corporate_tag/wardtaka

 /datum/design/item/prosfab/badge_zenghu
 	name = "Zeng-Hu Tag"
 	desc = "Used to identify an empty Zeng-Hu FBP."
 	id = "misc_synth_bag_tag_zenghu"
 	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000)
-	build_path = /obj/item/clothing/accessory/badge/corporate_tag/zenghu
+	build_path = /obj/item/clothing/accessory/medal/badge/corporate_tag/zenghu

 /datum/design/item/prosfab/badge_gilthari
 	name = "Gilthari Tag"
 	desc = "Used to identify an empty Gilthari FBP."
 	id = "misc_synth_bag_tag_gilthari"
 	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_GOLD = 1000)
-	build_path = /obj/item/clothing/accessory/badge/corporate_tag/gilthari
+	build_path = /obj/item/clothing/accessory/medal/badge/corporate_tag/gilthari
 	req_tech = list(TECH_MATERIAL = 4, TECH_ILLEGAL = 2, TECH_PHORON = 2)

 /datum/design/item/prosfab/badge_veymed
@@ -491,7 +491,7 @@
 	desc = "Used to identify an empty Vey-Medical FBP."
 	id = "misc_synth_bag_tag_veymed"
 	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000)
-	build_path = /obj/item/clothing/accessory/badge/corporate_tag/veymed
+	build_path = /obj/item/clothing/accessory/medal/badge/corporate_tag/veymed
 	req_tech = list(TECH_MATERIAL = 3, TECH_ILLEGAL = 1, TECH_BIO = 4)

 /datum/design/item/prosfab/badge_hephaestus
@@ -499,25 +499,25 @@
 	desc = "Used to identify an empty Hephaestus FBP."
 	id = "misc_synth_bag_tag_heph"
 	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000)
-	build_path = /obj/item/clothing/accessory/badge/corporate_tag/hephaestus
+	build_path = /obj/item/clothing/accessory/medal/badge/corporate_tag/hephaestus

 /datum/design/item/prosfab/badge_grayson
 	name = "Grayson Tag"
 	desc = "Used to identify an empty Grayson FBP."
 	id = "misc_synth_bag_tag_grayson"
 	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000)
-	build_path = /obj/item/clothing/accessory/badge/corporate_tag/grayson
+	build_path = /obj/item/clothing/accessory/medal/badge/corporate_tag/grayson

 /datum/design/item/prosfab/badge_xion
 	name = "Xion Tag"
 	desc = "Used to identify an empty Xion FBP."
 	id = "misc_synth_bag_tag_xion"
 	materials = list(MAT_STEEL = 1000, MAT_GLASS = 500, MAT_PLASTIC = 1000)
-	build_path = /obj/item/clothing/accessory/badge/corporate_tag/xion
+	build_path = /obj/item/clothing/accessory/medal/badge/corporate_tag/xion

 /datum/design/item/prosfab/badge_bishop
 	name = "Bishop Tag"
 	desc = "Used to identify an empty Bishop FBP."
 	id = "misc_synth_bag_tag_bishop"
 	materials = list(MAT_STEEL = 500, MAT_GLASS = 2000, MAT_PLASTIC = 500)
-	build_path = /obj/item/clothing/accessory/badge/corporate_tag/bishop
+	build_path = /obj/item/clothing/accessory/medal/badge/corporate_tag/bishop