diff --git a/code/__DEFINES/~~bubber_defines/robot_defines.dm b/code/__DEFINES/~~bubber_defines/robot_defines.dm index ca4db0b1612..9bb8e0a6abd 100644 --- a/code/__DEFINES/~~bubber_defines/robot_defines.dm +++ b/code/__DEFINES/~~bubber_defines/robot_defines.dm @@ -96,6 +96,7 @@ // SMOLRAPTOR BORG DEFINES BELOW #define CYBORG_ICON_TYPE_SMOLRAPTOR "smolraptor" +#define CYBORG_ICON_TYPE_SMOLRAPTOR_ALT "smolraptor_alt" #define CYBORG_ICON_GEN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_gen.dmi' #define CYBORG_ICON_SCI_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_sci.dmi' @@ -104,7 +105,7 @@ #define CYBORG_ICON_CAR_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_car.dmi' #define CYBORG_ICON_SERV_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_serv.dmi' #define CYBORG_ICON_PK_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_pk.dmi' -#define CYBORG_ICON_JANI_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_jani.dmi' +#define CYBORG_ICON_SEC_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_sec.dmi' #define CYBORG_ICON_MIN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_min.dmi' #define CYBORG_ICON_CC_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_cc.dmi' #define CYBORG_ICON_SYN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_syndie.dmi' diff --git a/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm b/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm index 701b5637f2a..11490474545 100644 --- a/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm +++ b/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm @@ -385,8 +385,8 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), RAPTOR_HAT_OFFSET ), - "SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, - SKIN_ICON = CYBORG_ICON_JANI_SMOLRAPTOR, + "SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR_ALT, + SKIN_ICON = CYBORG_ICON_SERV_SMOLRAPTOR, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), SMOL_RAPTOR_HAT_OFFSET ), @@ -501,6 +501,18 @@ SKIN_ICON = CYBORG_ICON_SEC_CATBORG, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), ), + "SmolRaptor" = list( + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, + SKIN_ICON = CYBORG_ICON_SEC_SMOLRAPTOR, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), + SMOL_RAPTOR_HAT_OFFSET + ), + "SmolRaptor BLU" = list( + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR_ALT, + SKIN_ICON = CYBORG_ICON_SEC_SMOLRAPTOR, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), + SMOL_RAPTOR_HAT_OFFSET + ), //32x64 Sprites below (Tall) "Meka - Bluesec" = list( SKIN_ICON_STATE = "mekasecalt", @@ -559,10 +571,11 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), RAPTOR_HAT_OFFSET ), - "SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, - SKIN_ICON = CYBORG_ICON_PK_SMOLRAPTOR, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), - SMOL_RAPTOR_HAT_OFFSET + "SmolRaptor" = list( + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, + SKIN_ICON = CYBORG_ICON_PK_SMOLRAPTOR, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), + SMOL_RAPTOR_HAT_OFFSET ), "Dullahan" = list( SKIN_ICON_STATE = "dullahanpeace", @@ -609,10 +622,11 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), RAPTOR_HAT_OFFSET ), - "SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, - SKIN_ICON = CYBORG_ICON_SERV_SMOLRAPTOR, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), - SMOL_RAPTOR_HAT_OFFSET + "SmolRaptor" = list( + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, + SKIN_ICON = CYBORG_ICON_SERV_SMOLRAPTOR, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), + SMOL_RAPTOR_HAT_OFFSET ), "Dullahan" = list( SKIN_ICON_STATE = "dullahanserv", @@ -749,10 +763,11 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET ), - "SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, - SKIN_ICON = CYBORG_ICON_SYN_SMOLRAPTOR, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), - SMOL_RAPTOR_HAT_OFFSET + "SmolRaptor" = list( + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, + SKIN_ICON = CYBORG_ICON_SYN_SMOLRAPTOR, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), + SMOL_RAPTOR_HAT_OFFSET ), "Dragon" = list( SKIN_ICON_STATE = "dragon-syndi", @@ -801,10 +816,11 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET ), - "SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, - SKIN_ICON = CYBORG_ICON_SYN_SMOLRAPTOR, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), - SMOL_RAPTOR_HAT_OFFSET + "SmolRaptor" = list( + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, + SKIN_ICON = CYBORG_ICON_SYN_SMOLRAPTOR, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), + SMOL_RAPTOR_HAT_OFFSET ), "Dragon" = list( SKIN_ICON_STATE = "dragon-syndi", @@ -855,10 +871,11 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET ), - "SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, - SKIN_ICON = CYBORG_ICON_SYN_SMOLRAPTOR, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), - SMOL_RAPTOR_HAT_OFFSET + "SmolRaptor" = list( + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, + SKIN_ICON = CYBORG_ICON_SYN_SMOLRAPTOR, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), + SMOL_RAPTOR_HAT_OFFSET ), "Dragon" = list( SKIN_ICON_STATE = "dragon-syndi", @@ -904,10 +921,11 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET ), - "SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, - SKIN_ICON = CYBORG_ICON_SYN_SMOLRAPTOR, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), - SMOL_RAPTOR_HAT_OFFSET + "SmolRaptor" = list( + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, + SKIN_ICON = CYBORG_ICON_SYN_SMOLRAPTOR, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), + SMOL_RAPTOR_HAT_OFFSET ), "Dragon" = list( SKIN_ICON_STATE = "dragon-syndi", @@ -945,10 +963,11 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), DULLAHAN_HAT_OFFSET ), - "SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, - SKIN_ICON = CYBORG_ICON_NIN_SMOLRAPTOR, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), - SMOL_RAPTOR_HAT_OFFSET + "SmolRaptor" = list( + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, + SKIN_ICON = CYBORG_ICON_NIN_SMOLRAPTOR, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), + SMOL_RAPTOR_HAT_OFFSET ), "Dragon" = list( SKIN_ICON_STATE = "dragon-ninja", @@ -967,10 +986,11 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL), F3LINE_HAT_OFFSET ), - "SmolRaptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, - SKIN_ICON = CYBORG_ICON_NIN_SMOLRAPTOR, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), - SMOL_RAPTOR_HAT_OFFSET + "SmolRaptor" = list( + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SMOLRAPTOR, + SKIN_ICON = CYBORG_ICON_NIN_SMOLRAPTOR, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), + SMOL_RAPTOR_HAT_OFFSET ), "Dragon" = list( SKIN_ICON_STATE = "dragon-ninja", diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_cc.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_cc.dmi index 0eaa25e14c5..ebdb2a701ea 100644 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_cc.dmi and b/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_cc.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_jani.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_jani.dmi deleted file mode 100644 index f1466cd2c71..00000000000 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_jani.dmi and /dev/null differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_min.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_min.dmi index a909c4ad5f9..a173da74629 100644 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_min.dmi and b/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_min.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_ninja.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_ninja.dmi index d6c7dc11d11..8c5f3181144 100644 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_ninja.dmi and b/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_ninja.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_sec.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_sec.dmi new file mode 100644 index 00000000000..76b188263d4 Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_sec.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_serv.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_serv.dmi index e85f343528b..15b5bddab0c 100644 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_serv.dmi and b/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_serv.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_syndie.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_syndie.dmi index dcfc31a7861..1962c8a4dc7 100644 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_syndie.dmi and b/modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_syndie.dmi differ