From 7915a9c9a89bea4ae659e405b5cfc3ffed2db651 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Tue, 30 Mar 2021 01:03:25 -0400 Subject: [PATCH] Update loadout_xeno.dm --- .../preference_setup/loadout/loadout_xeno.dm | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index f87cd92bc1..d402fd4c4e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -213,16 +213,8 @@ /datum/gear/uniform/dept/undercoat/security display_name = "security undercoat (Teshari)" -<<<<<<< HEAD - path = /obj/item/clothing/under/seromi/undercoat/jobs/sec - allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Security Pilot")//YW ADDITIONS -||||||| parent of b4d376553b... Merge pull request #10025 from VOREStation/upstream-merge-7991 - path = /obj/item/clothing/under/seromi/undercoat/jobs/sec - allowed_roles = list("Head of Security","Detective","Warden","Security Officer",) -======= path = /obj/item/clothing/under/teshari/undercoat/jobs/sec - allowed_roles = list("Head of Security","Detective","Warden","Security Officer",) ->>>>>>> b4d376553b... Merge pull request #10025 from VOREStation/upstream-merge-7991 + allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Security Pilot")//YW ADDITIONS /datum/gear/uniform/dept/undercoat/service display_name = "service undercoat (Teshari)" @@ -378,16 +370,8 @@ /datum/gear/suit/dept/cloak/security display_name = "security cloak (Teshari)" -<<<<<<< HEAD - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sec - allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Security Pilot")//YW ADDITIONS -||||||| parent of b4d376553b... Merge pull request #10025 from VOREStation/upstream-merge-7991 - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sec - allowed_roles = list("Head of Security","Detective","Warden","Security Officer") -======= path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/sec - allowed_roles = list("Head of Security","Detective","Warden","Security Officer") ->>>>>>> b4d376553b... Merge pull request #10025 from VOREStation/upstream-merge-7991 + allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Security Pilot")//YW ADDITIONS /datum/gear/suit/dept/cloak/security/New() ..()