diff --git a/code/__DEFINES/~~bubber_defines/robot_defines.dm b/code/__DEFINES/~~bubber_defines/robot_defines.dm index 27c83e7fc47..84691c1d528 100644 --- a/code/__DEFINES/~~bubber_defines/robot_defines.dm +++ b/code/__DEFINES/~~bubber_defines/robot_defines.dm @@ -203,6 +203,9 @@ #define CYBORG_ICON_SCI_XENOBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_sci.dmi' #define CYBORG_ICON_SERVICE_XENOBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_service.dmi' #define CYBORG_ICON_SYNDI_XENOBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_syndi.dmi' +#define CYBORG_ICON_CC_XENOBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_CC.dmi' +#define CYBORG_ICON_SEC_XENOBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_sec.dmi' +#define CYBORG_ICON_CLOWN_XENOBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_clown.dmi' /************************************************************ CYBORG HAT OFFSETS GO BELOW *************************************************************/ @@ -256,3 +259,6 @@ #define MYOMER_HAT_OFFSET \ SKIN_HAT_OFFSET = list("north" = list(16, 1), "south" = list(16, 1), "east" = list(26, 1), "west" = list(6, 1)), \ SKIN_HAT_REST_OFFSET = list("north" = list(16, -11), "south" = list(16, -11), "east" = list(26, -11), "west" = list(6, -11)) +#define XENOBORG_HAT_OFFSET \ + SKIN_HAT_OFFSET = list("north" = list(16, 10), "south" = list(16, 5), "east" = list(32, 7), "west" = list(0, 7)), \ + SKIN_HAT_REST_OFFSET = list("north" = list(16, 6), "south" = list(16, 6), "east" = list(31, 6), "west" = list(1, 6)) 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 9ec498fa717..516461841ee 100644 --- a/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm +++ b/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm @@ -59,6 +59,12 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE), SMOL_RAPTOR_HAT_OFFSET ), + "Xenoborg" = list( + SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, + SKIN_ICON = CYBORG_ICON_CC_XENOBORG, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), + XENOBORG_HAT_OFFSET + ), ) /obj/item/robot_model/centcom/rebuild_modules() @@ -241,11 +247,10 @@ SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, SKIN_ICON = CYBORG_ICON_SCI_XENOBORG, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), - RAPTOR_HAT_OFFSET + XENOBORG_HAT_OFFSET ), ) - /* BUBBER SPRITE ADDITIONS BELOW */ // Clown borgs @@ -274,6 +279,12 @@ SKIN_ICON = CYBORG_ICON_CLOWN_DRAGONBORG, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS, TRAIT_R_EXPANDER_BLOCKED, TRAIT_R_BIG) ), + "Xenoborg" = list( + SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, + SKIN_ICON = CYBORG_ICON_CLOWN_XENOBORG, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), + XENOBORG_HAT_OFFSET + ), ) // Standard borgs @@ -367,7 +378,7 @@ SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, SKIN_ICON = CYBORG_ICON_MED_XENOBORG, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), - RAPTOR_HAT_OFFSET + XENOBORG_HAT_OFFSET ), ) @@ -445,7 +456,7 @@ SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, SKIN_ICON = CYBORG_ICON_ENGI_XENOBORG, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), - RAPTOR_HAT_OFFSET + XENOBORG_HAT_OFFSET ), ) @@ -506,8 +517,8 @@ "Xenoborg" = list( SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, SKIN_ICON = CYBORG_ICON_JANI_XENOBORG, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), - RAPTOR_HAT_OFFSET + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG), + XENOBORG_HAT_OFFSET ), ) @@ -592,8 +603,8 @@ "Xenoborg" = list( SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, SKIN_ICON = CYBORG_ICON_MINING_XENOBORG, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), - RAPTOR_HAT_OFFSET + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG), + XENOBORG_HAT_OFFSET ), ) @@ -661,6 +672,12 @@ SKIN_ICON = CYBORG_ICON_SEC_DRAGONBORG, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS, TRAIT_R_EXPANDER_BLOCKED, TRAIT_R_BIG) ), + "Xenoborg" = list( + SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, + SKIN_ICON = CYBORG_ICON_SEC_XENOBORG, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), + XENOBORG_HAT_OFFSET + ), ) // Peacekeeper borgs @@ -742,8 +759,8 @@ "Xenoborg" = list( SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, SKIN_ICON = CYBORG_ICON_PK_XENOBORG, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), - RAPTOR_HAT_OFFSET + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG), + XENOBORG_HAT_OFFSET ), ) @@ -831,10 +848,11 @@ "Xenoborg" = list( SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, SKIN_ICON = CYBORG_ICON_SERVICE_XENOBORG, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), - RAPTOR_HAT_OFFSET + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG), + XENOBORG_HAT_OFFSET ), ) + // Cargo borgs /obj/item/robot_model/cargo/Initialize(mapload) . = ..() @@ -887,8 +905,8 @@ "Xenoborg" = list( SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, SKIN_ICON = CYBORG_ICON_CARGO_XENOBORG, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), - RAPTOR_HAT_OFFSET + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG), + XENOBORG_HAT_OFFSET ), ) @@ -970,8 +988,8 @@ "Xenoborg" = list( SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, SKIN_ICON = CYBORG_ICON_SYNDI_XENOBORG, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), - RAPTOR_HAT_OFFSET + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG), + XENOBORG_HAT_OFFSET ), ) @@ -1035,8 +1053,8 @@ "Xenoborg" = list( SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, SKIN_ICON = CYBORG_ICON_SYNDI_XENOBORG, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), - RAPTOR_HAT_OFFSET + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG), + XENOBORG_HAT_OFFSET ), ) @@ -1102,8 +1120,8 @@ "Xenoborg" = list( SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, SKIN_ICON = CYBORG_ICON_SYNDI_XENOBORG, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), - RAPTOR_HAT_OFFSET + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG), + XENOBORG_HAT_OFFSET ), ) @@ -1164,8 +1182,8 @@ "Xenoborg" = list( SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, SKIN_ICON = CYBORG_ICON_SYNDI_XENOBORG, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), - RAPTOR_HAT_OFFSET + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG), + XENOBORG_HAT_OFFSET ), ) @@ -1224,8 +1242,8 @@ "Xenoborg" = list( SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, SKIN_ICON = CYBORG_ICON_NINJA_XENOBORG, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), - RAPTOR_HAT_OFFSET + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG), + XENOBORG_HAT_OFFSET ), ) @@ -1259,7 +1277,7 @@ "Xenoborg" = list( SKIN_ICON_STATE = CYBORG_ICON_TYPE_XENOBORG, SKIN_ICON = CYBORG_ICON_NINJA_XENOBORG, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE), - RAPTOR_HAT_OFFSET + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG), + XENOBORG_HAT_OFFSET ), ) diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_CC.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_CC.dmi new file mode 100644 index 00000000000..018d1cc6b01 Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_CC.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_cargo.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_cargo.dmi index dd982c99b35..6635c62210d 100644 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_cargo.dmi and b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_cargo.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_clown.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_clown.dmi new file mode 100644 index 00000000000..f98828d2af8 Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_clown.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_engi.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_engi.dmi index 69cf8d55db1..25f2c936977 100644 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_engi.dmi and b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_engi.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_jani.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_jani.dmi index f9c5400ce89..e5f188aec6b 100644 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_jani.dmi and b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_jani.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_med.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_med.dmi index 2dda924a6dc..94d2e8014c4 100644 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_med.dmi and b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_med.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_mining.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_mining.dmi index 4c5b12753de..97763db17f0 100644 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_mining.dmi and b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_mining.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_ninja.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_ninja.dmi index f5c6e05a539..0c52d049c94 100644 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_ninja.dmi and b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_ninja.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_pk.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_pk.dmi index cd956ae03fd..f24bcd4ffb3 100644 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_pk.dmi and b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_pk.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_sci.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_sci.dmi index aa2990dc3de..da14639a9e2 100644 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_sci.dmi and b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_sci.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_sec.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_sec.dmi new file mode 100644 index 00000000000..2bd177d0c85 Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_sec.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_service.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_service.dmi index 5d2ce878de7..9df5870dc97 100644 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_service.dmi and b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_service.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_syndi.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_syndi.dmi index 17fa6fd0d61..1ce42194fb7 100644 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_syndi.dmi and b/modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_syndi.dmi differ