From cfb73d68624afb71c1a38f3079a41de41c688733 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Mon, 7 Dec 2020 21:37:06 -0700 Subject: [PATCH] Update loadout_xeno.dm --- code/modules/client/preference_setup/loadout/loadout_xeno.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 543d47a351..697dc9df97 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -373,10 +373,6 @@ path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sec <<<<<<< HEAD allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Security Pilot")//YW ADDITIONS -||||||| parent of 39fe761eee... Merge pull request #9394 from VOREStation/upstream-merge-7760 - allowed_roles = list("Head of Security","Detective","Warden","Security Officer",) -======= - allowed_roles = list("Head of Security","Detective","Warden","Security Officer") /datum/gear/suit/dept/cloak/security/New() ..() @@ -385,7 +381,6 @@ var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) ->>>>>>> 39fe761eee... Merge pull request #9394 from VOREStation/upstream-merge-7760 /datum/gear/suit/dept/cloak/service display_name = "service cloak (Teshari)"