From 0ac27ecbe3b61d0070c2dc9857ab6d476e704acb Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Fri, 30 Apr 2021 01:14:57 -0400 Subject: [PATCH] Update 03_body.dm --- code/modules/client/preference_setup/general/03_body.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 6230efe6eb..c3349721a6 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -1376,10 +1376,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O dat += "" user << browse(dat, "window=species;size=700x400") -<<<<<<< HEAD - -||||||| parent of 0c51187d69... Merge pull request #10223 from VOREStation/upstream-merge-8030 -======= /datum/category_item/player_setup_item/general/body/proc/get_tail_styles() var/list/pretty_tail_styles = list("Normal" = null) @@ -1404,4 +1400,3 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O if(((!instance.ckeys_allowed) || (pref.client.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (pref.species in instance.species_allowed)) || check_rights(R_ADMIN | R_EVENT | R_FUN, 0, pref.client)) //VOREStation Edit pretty_wing_styles[instance.name] = path return pretty_wing_styles ->>>>>>> 0c51187d69... Merge pull request #10223 from VOREStation/upstream-merge-8030