From bfd0f5a9e2b318cf9fd6500c6ecc1a26df77dcd7 Mon Sep 17 00:00:00 2001 From: ReezeBL Date: Thu, 23 Nov 2023 22:32:16 +0300 Subject: [PATCH] mc resolve --- code/_globalvars/traits/_traits.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index 1a6ac3c8e09..02080256f9c 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -286,11 +286,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_NO_JUMPSUIT" = TRAIT_NO_JUMPSUIT, "TRAIT_NO_MINDSWAP" = TRAIT_NO_MINDSWAP, "TRAIT_NO_MIRROR_REFLECTION" = TRAIT_NO_MIRROR_REFLECTION, -<<<<<<< HEAD //"TRAIT_NO_PLASMA_TRANSFORM" = TRAIT_NO_PLASMA_TRANSFORM, SKYRAT EDIT - TODO - These require transformation sting pr -======= - "TRAIT_NO_PLASMA_TRANSFORM" = TRAIT_NO_PLASMA_TRANSFORM, ->>>>>>> 8d9a35a4f (Adds our traits define file to the linter steps (#25134)) "TRAIT_NO_SLIP_ALL" = TRAIT_NO_SLIP_ALL, "TRAIT_NO_SLIP_ICE" = TRAIT_NO_SLIP_ICE, "TRAIT_NO_SLIP_SLIDE" = TRAIT_NO_SLIP_SLIDE,