Merge branch 'Bubberstation:master' into master

ReturnToZender · Jan 23, 2024 · 3eed35c · 3eed35c
2 parents 795bf73 + 12f5a82
commit 3eed35c
Show file tree

Hide file tree

Showing 17 changed files with 108 additions and 19 deletions.
diff --git a/code/__DEFINES/~~bubber_defines/robot_defines.dm b/code/__DEFINES/~~bubber_defines/robot_defines.dm
@@ -12,13 +12,13 @@
 #define CYBORG_ICON_CARGO_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_cargo.dmi'
 
 #define CYBORG_ICON_SEC_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_sec.dmi'
-#define CYBORG_ICON_SEC_TALL_BUBBER 'modular_zubbers/modules/borgs/sprites/tallrobot_sec.dmi'
 #define CYBORG_ICON_SEC_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_sec.dmi'
 
 #define CYBORG_ICON_ENG_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_eng.dmi'
 #define CYBORG_ICON_ENG_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_eng.dmi'
 
 #define CYBORG_ICON_PEACEKEEPER_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_pk.dmi'
+#define CYBORG_ICON_PEACEKEEPER_TALL_BUBBER 'modular_zubbers/modules/borgs/sprites/tallrobot_pk.dmi'
 #define CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_pk.dmi'
 
 #define CYBORG_ICON_SERVICE_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_serv.dmi'

diff --git a/modular_zubbers/modules/borgs/code/robot_model.dm b/modular_zubbers/modules/borgs/code/robot_model.dm
@@ -1,4 +1,4 @@
-/obj/item/robot_model/centcom //Sprites by QuartzAdachi
+/obj/item/robot_model/centcom
 	name = "Central Command"
 	basic_modules = list(
 		/obj/item/assembly/flash/cyborg,
@@ -29,70 +29,151 @@
 	)
 	special_light_key = null
 	borg_skins = list(
-		"Raptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_CENTCOM_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)), //aKhroma :)
-		"Vale" = list(SKIN_ICON_STATE = "vale", SKIN_ICON = CYBORG_ICON_CENTCOM_WIDE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+		"Raptor" = list(
+			SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
+			SKIN_ICON = CYBORG_ICON_CENTCOM_LARGE_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
+		), //aKhroma :)
+		"Vale" = list(
+			SKIN_ICON_STATE = "vale",
+			SKIN_ICON = CYBORG_ICON_CENTCOM_WIDE_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)
+		),
 	)
 
 /obj/item/robot_model/centcom/rebuild_modules()
 	..()
 	var/mob/living/silicon/robot/cyborg = loc
 	cyborg.faction |= ROLE_DEATHSQUAD //You're part of CENTCOM now
 
-/obj/item/robot_model/syndicate/remove_module(obj/item/removed_module, delete_after)
+/obj/item/robot_model/centcom/remove_module(obj/item/removed_module, delete_after)
 	..()
 	var/mob/living/silicon/robot/cyborg = loc
 	cyborg.faction -= ROLE_DEATHSQUAD //You're no longer part of CENTCOM
 
-
 /* BUBBER SPRITE ADDITIONS BELOW */
 /obj/item/robot_model/medical/Initialize(mapload)
 	. = ..()
 	borg_skins |= list(
-		"Raptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_MED_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+		"Raptor" = list(
+			SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
+			SKIN_ICON = CYBORG_ICON_MED_LARGE_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
+		),
 	)
 
 /obj/item/robot_model/engineering/Initialize(mapload)
 	. = ..()
 	borg_skins |= list(
-		"Raptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_ENG_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+		"Raptor" = list(
+			SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
+			SKIN_ICON = CYBORG_ICON_ENG_LARGE_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
+		),
 	)
 
 /obj/item/robot_model/janitor/Initialize(mapload)
 	. = ..()
 	borg_skins |= list(
-		"Raptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_JANI_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+		//64x48 sprites below (Raptor)
+		"Raptor" = list(
+			SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
+			SKIN_ICON = CYBORG_ICON_JANI_LARGE_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
+		),
 	)
 
 /obj/item/robot_model/miner/Initialize(mapload)
 	. = ..()
 	borg_skins |= list(
-		"Raptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_MINING_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+		//64x32 Sprites below (Wide)
+		"Corrupt" = list(
+			SKIN_ICON_STATE = "corrupt",
+			SKIN_ICON = CYBORG_ICON_MINING_WIDE_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)
+		),
+		"Corrupt Alt" = list(
+			SKIN_ICON_STATE = "corruptalt",
+			SKIN_ICON = CYBORG_ICON_MINING_WIDE_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)
+		),
+		//64x48 sprites below (Raptor)
+		"Raptor" = list(
+			SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
+			SKIN_ICON = CYBORG_ICON_MINING_LARGE_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
+		),
 	)
 
-/obj/item/robot_model/security/Initialize()
+/obj/item/robot_model/security/Initialize(mapload)
 	. = ..()
 	borg_skins |= list(
-		"Meka - Bluesec" = list(SKIN_ICON_STATE = "mekasecalt", SKIN_ICON = CYBORG_ICON_SEC_TALL_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
-		"Raptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_SEC_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+		//32x64 Sprites below (Tall)
+		"Meka - Bluesec" = list(
+			SKIN_ICON_STATE = "mekasecalt",
+			SKIN_ICON = CYBORG_ICON_PEACEKEEPER_TALL_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL),
+			SKIN_HAT_OFFSET = 15
+		),
+		//64x48 sprites below (Raptor)
+		"Raptor" = list(
+			SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
+			SKIN_ICON = CYBORG_ICON_SEC_LARGE_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
+		),
 	)
 
 /obj/item/robot_model/peacekeeper/Initialize()
 	. = ..()
 	borg_skins |= list(
-		"Raptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+		"Raptor" = list(
+			SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
+			SKIN_ICON = CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
+		),
+	)
+
+/obj/item/robot_model/peacekeeper/Initialize(mapload)
+	.=..()
+	borg_skins |= list(
+		//32x64 Sprites below (Tall)
+		"Meka - Bluesec" = list(
+			SKIN_ICON_STATE = "mekasecalt",
+			SKIN_ICON = CYBORG_ICON_PEACEKEEPER_TALL_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL),
+			SKIN_HAT_OFFSET = 15
+		),
+		//64x32 Sprites below (Wide)
+		"Raptor" = list(
+			SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
+			SKIN_ICON = CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
+		),
 	)
 
 /obj/item/robot_model/service/Initialize(mapload)
 	. = ..()
 	borg_skins |= list(
-		"Fancy Raptor" = list(SKIN_ICON_STATE = "fancyraptor", SKIN_ICON = CYBORG_ICON_SERVICE_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+		"Fancy Raptor" = list(
+			SKIN_ICON_STATE = "fancyraptor",
+			SKIN_ICON = CYBORG_ICON_SERVICE_LARGE_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
+		),
 	)
 
 /obj/item/robot_model/syndicatejack/Initialize()
 	. = ..()
 	borg_skins |= list(
-		"Vale" = list(SKIN_ICON_STATE = "vale", SKIN_ICON = CYBORG_ICON_SYNDIE_WIDE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
-		"Pupdozer" = list(SKIN_ICON_STATE = "pupdozer", SKIN_ICON = CYBORG_ICON_SYNDIE_WIDE_BUBBER, SKIN_FEATURES = list(TRAIT_R_WIDE)),
+		"Vale" = list(
+			SKIN_ICON_STATE = "vale",
+			SKIN_ICON = CYBORG_ICON_SYNDIE_WIDE_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)
+		),
+		"Pupdozer" = list(
+			SKIN_ICON_STATE = "pupdozer",
+			SKIN_ICON = CYBORG_ICON_SYNDIE_WIDE_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_WIDE)
+		),
 		"Mediraptor" = list(
 			SKIN_ICON_STATE = "mediraptor",
 			SKIN_ICON = CYBORG_ICON_SYNDIE_LARGE_BUBBER,
@@ -169,7 +250,15 @@
 /obj/item/robot_model/ninja/Initialize()
 	. = ..()
 	borg_skins |= list(
-		"Raptor" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_NINJA_WIDE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
-		"Vale" = list(SKIN_ICON_STATE = "valeninja", SKIN_ICON = CYBORG_ICON_NINJA_WIDE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+		"Raptor" = list(
+			SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR,
+			SKIN_ICON = CYBORG_ICON_NINJA_WIDE_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)
+		),
+		"Vale" = list(
+			SKIN_ICON_STATE = "valeninja",
+			SKIN_ICON = CYBORG_ICON_NINJA_WIDE_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)
+		),
 	)
 */
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_eng.dmi b/modular_zubbers/modules/borgs/sprites/largerobot_eng.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_jani.dmi b/modular_zubbers/modules/borgs/sprites/largerobot_jani.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_med.dmi b/modular_zubbers/modules/borgs/sprites/largerobot_med.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_mine.dmi b/modular_zubbers/modules/borgs/sprites/largerobot_mine.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_pk.dmi b/modular_zubbers/modules/borgs/sprites/largerobot_pk.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_sec.dmi b/modular_zubbers/modules/borgs/sprites/largerobot_sec.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_serv.dmi b/modular_zubbers/modules/borgs/sprites/largerobot_serv.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/tallrobot_pk.dmi b/modular_zubbers/modules/borgs/sprites/tallrobot_pk.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/widerobot_eng.dmi b/modular_zubbers/modules/borgs/sprites/widerobot_eng.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/widerobot_jani.dmi b/modular_zubbers/modules/borgs/sprites/widerobot_jani.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/widerobot_med.dmi b/modular_zubbers/modules/borgs/sprites/widerobot_med.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/widerobot_mine.dmi b/modular_zubbers/modules/borgs/sprites/widerobot_mine.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/widerobot_pk.dmi b/modular_zubbers/modules/borgs/sprites/widerobot_pk.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/widerobot_sec.dmi b/modular_zubbers/modules/borgs/sprites/widerobot_sec.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/widerobot_serv.dmi b/modular_zubbers/modules/borgs/sprites/widerobot_serv.dmi