diff --git a/code/modules/mob/living/silicon/robot/sprites/civilian.dm b/code/modules/mob/living/silicon/robot/sprites/civilian.dm index d7cae106e51..a132f208f72 100644 --- a/code/modules/mob/living/silicon/robot/sprites/civilian.dm +++ b/code/modules/mob/living/silicon/robot/sprites/civilian.dm @@ -505,14 +505,12 @@ icon_x = 32 pixel_x = 0 - -/datum/robot_sprite/dogborg/service/smolraptorservicesprite +/datum/robot_sprite/dogborg/service/smolraptor sprite_icon = 'icons/mob/robot/smallraptors/smolraptor_serv.dmi' -/datum/robot_sprite/dogborg/service/smolraptorservicesprite/smolraptorserv name = "Small Raptor" sprite_icon_state = "smolraptor" - has_dead_sprite_overlay = FALSE has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE - rest_sprite_options = list("Default", "Sit") + has_dead_sprite_overlay = FALSE + rest_sprite_options = list("Default", "Sit", "Bellyup") diff --git a/code/modules/mob/living/silicon/robot/sprites/combat.dm b/code/modules/mob/living/silicon/robot/sprites/combat.dm index 14f532223b7..33489ac65fa 100644 --- a/code/modules/mob/living/silicon/robot/sprites/combat.dm +++ b/code/modules/mob/living/silicon/robot/sprites/combat.dm @@ -64,13 +64,23 @@ sprite_icon_state = "uptall" // Wide/dogborg sprites -/* + /datum/robot_sprite/dogborg/combat module_type = "Combat" - sprite_icon = 'icons/mob/robot/combat_wide.dmi' +/* sprite_icon = 'icons/mob/robot/combat_wide.dmi' // None yet */ + +/datum/robot_sprite/dogborg/combat/smolraptor + sprite_icon = 'icons/mob/robot/smallraptors/smolraptor_syndie.dmi' + name = "Small Raptor" + sprite_icon_state = "smolraptor" + has_eye_light_sprites = TRUE + has_vore_belly_sprites = TRUE + has_dead_sprite_overlay = FALSE + rest_sprite_options = list("Default", "Sit", "Bellyup") + // Tall sprites /datum/robot_sprite/dogborg/tall/combat diff --git a/code/modules/mob/living/silicon/robot/sprites/command.dm b/code/modules/mob/living/silicon/robot/sprites/command.dm index 510a58ccf9e..4b78aed10bc 100644 --- a/code/modules/mob/living/silicon/robot/sprites/command.dm +++ b/code/modules/mob/living/silicon/robot/sprites/command.dm @@ -109,14 +109,14 @@ rest_sprite_options = list("Default", "Sit") icon_x = 32 -/datum/robot_sprite/dogborg/command/smolraptorcommand +/datum/robot_sprite/dogborg/command/smolraptor name = "Small Raptor" sprite_icon = 'icons/mob/robot/smallraptors/smolraptor_cc.dmi' sprite_icon_state = "smolraptor" - has_dead_sprite_overlay = FALSE has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE - rest_sprite_options = list("Default", "Sit") + has_dead_sprite_overlay = FALSE + rest_sprite_options = list("Default", "Sit", "Bellyup") /datum/robot_sprite/dogborg/tall/command/dullataurcommand name = "Dullataur" diff --git a/code/modules/mob/living/silicon/robot/sprites/engineering.dm b/code/modules/mob/living/silicon/robot/sprites/engineering.dm index a4b2fd8243e..40c7cdea3bb 100644 --- a/code/modules/mob/living/silicon/robot/sprites/engineering.dm +++ b/code/modules/mob/living/silicon/robot/sprites/engineering.dm @@ -285,11 +285,11 @@ has_vore_belly_resting_sprites = TRUE has_dead_sprite_overlay = FALSE -/datum/robot_sprite/dogborg/engineering/smolraptorengineeringsprite +/datum/robot_sprite/dogborg/engineering/smolraptor sprite_icon = 'icons/mob/robot/smallraptors/smolraptor_eng.dmi' name = "Small Raptor" sprite_icon_state = "smolraptor" - has_dead_sprite_overlay = FALSE has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE - rest_sprite_options = list("Default", "Sit") + has_dead_sprite_overlay = FALSE + rest_sprite_options = list("Default", "Sit", "Bellyup") diff --git a/code/modules/mob/living/silicon/robot/sprites/janitor.dm b/code/modules/mob/living/silicon/robot/sprites/janitor.dm index a60fafbb4b9..4fc36dbde05 100644 --- a/code/modules/mob/living/silicon/robot/sprites/janitor.dm +++ b/code/modules/mob/living/silicon/robot/sprites/janitor.dm @@ -255,15 +255,15 @@ has_eye_light_sprites = TRUE has_dead_sprite_overlay = FALSE -/datum/robot_sprite/dogborg/smolraptorjanitorsprite - sprite_icon = 'icons/mob/robot/smallraptors/smolraptor_jani.dmi' +/datum/robot_sprite/dogborg/janitor/smolraptor + sprite_icon = 'icons/mob/robot/smallraptors/smolraptor_serv.dmi' module_type = "Janitor" name = "Small Raptor" - sprite_icon_state = "smolraptor" - has_dead_sprite_overlay = FALSE + sprite_icon_state = "smolraptor_alt" has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE - rest_sprite_options = list("Default", "Sit") + has_dead_sprite_overlay = FALSE + rest_sprite_options = list("Default", "Sit", "Bellyup") /datum/robot_sprite/dogborg/janitor/possum name = "0-P0SSm" diff --git a/code/modules/mob/living/silicon/robot/sprites/medical.dm b/code/modules/mob/living/silicon/robot/sprites/medical.dm index bfc4db1bd37..10f7a12efd7 100644 --- a/code/modules/mob/living/silicon/robot/sprites/medical.dm +++ b/code/modules/mob/living/silicon/robot/sprites/medical.dm @@ -470,7 +470,10 @@ sprite_icon = 'icons/mob/robot/smallraptors/smolraptor_med.dmi' name = "Small Raptor" sprite_icon_state = "smolraptor" - has_dead_sprite_overlay = FALSE has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE - rest_sprite_options = list("Default", "Sit") + has_dead_sprite_overlay = FALSE + rest_sprite_options = list("Default", "Sit", "Bellyup") + +/datum/robot_sprite/dogborg/crisis/smolraptor/alt + sprite_icon_state = "smolraptor_alt" diff --git a/code/modules/mob/living/silicon/robot/sprites/mining.dm b/code/modules/mob/living/silicon/robot/sprites/mining.dm index cb54a1c2c10..9d0e4ab76c3 100644 --- a/code/modules/mob/living/silicon/robot/sprites/mining.dm +++ b/code/modules/mob/living/silicon/robot/sprites/mining.dm @@ -325,20 +325,15 @@ icon_x = 32 pixel_x = 0 -/datum/robot_sprite/dogborg/mining/smolraptorminer +/datum/robot_sprite/dogborg/mining/smolraptor sprite_icon = 'icons/mob/robot/smallraptors/smolraptor_min.dmi' name = "Small Raptor Miner" sprite_icon_state = "smolraptor" has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE has_dead_sprite_overlay = FALSE - rest_sprite_options = list("Default", "Sit") + rest_sprite_options = list("Default", "Sit", "Bellyup") -/datum/robot_sprite/dogborg/mining/smolraptorcargo +/datum/robot_sprite/dogborg/mining/smolraptor/alt sprite_icon = 'icons/mob/robot/smallraptors/smolraptor_car.dmi' name = "Small Raptor Cargo" - sprite_icon_state = "smolraptor" - has_eye_light_sprites = TRUE - has_vore_belly_sprites = TRUE - has_dead_sprite_overlay = FALSE - rest_sprite_options = list("Default", "Sit") diff --git a/code/modules/mob/living/silicon/robot/sprites/science.dm b/code/modules/mob/living/silicon/robot/sprites/science.dm index 08df63514e6..4503fa454a1 100644 --- a/code/modules/mob/living/silicon/robot/sprites/science.dm +++ b/code/modules/mob/living/silicon/robot/sprites/science.dm @@ -263,12 +263,11 @@ has_eye_light_sprites = TRUE has_dead_sprite_overlay = FALSE - /datum/robot_sprite/dogborg/science/smolraptor sprite_icon = 'icons/mob/robot/smallraptors/smolraptor_sci.dmi' name = "Small Raptor" sprite_icon_state = "smolraptor" - has_dead_sprite_overlay = FALSE has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE - rest_sprite_options = list("Default", "Sit") + has_dead_sprite_overlay = FALSE + rest_sprite_options = list("Default", "Sit", "Bellyup") diff --git a/code/modules/mob/living/silicon/robot/sprites/security.dm b/code/modules/mob/living/silicon/robot/sprites/security.dm index 56f687c0938..f92a7a71155 100644 --- a/code/modules/mob/living/silicon/robot/sprites/security.dm +++ b/code/modules/mob/living/silicon/robot/sprites/security.dm @@ -277,10 +277,14 @@ has_dead_sprite_overlay = FALSE /datum/robot_sprite/dogborg/security/smolraptor - sprite_icon = 'icons/mob/robot/smallraptors/smolraptor_pk.dmi' + sprite_icon = 'icons/mob/robot/smallraptors/smolraptor_sec.dmi' name = "Small Raptor" sprite_icon_state = "smolraptor" - has_dead_sprite_overlay = FALSE has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE - rest_sprite_options = list("Default", "Sit") + has_dead_sprite_overlay = FALSE + rest_sprite_options = list("Default", "Sit", "Bellyup") + +/datum/robot_sprite/dogborg/security/smolraptor/alt + + sprite_icon_state = "smolraptor_alt" diff --git a/code/modules/mob/living/silicon/robot/sprites/standard.dm b/code/modules/mob/living/silicon/robot/sprites/standard.dm index 208ed285a56..969b89c6021 100644 --- a/code/modules/mob/living/silicon/robot/sprites/standard.dm +++ b/code/modules/mob/living/silicon/robot/sprites/standard.dm @@ -116,13 +116,23 @@ sprite_icon_state = "uptall2" // Wide/dogborg sprites -/* + /datum/robot_sprite/dogborg/standard module_type = "Standard" - sprite_icon = 'icons/mob/robot/standard_wide.dmi' +/* sprite_icon = 'icons/mob/robot/standard_wide.dmi' // None yet */ + +/datum/robot_sprite/dogborg/standard/smolraptor + sprite_icon = 'icons/mob/robot/smallraptors/smolraptor_gen.dmi' + name = "Small Raptor" + sprite_icon_state = "smolraptor" + has_eye_light_sprites = TRUE + has_vore_belly_sprites = TRUE + has_dead_sprite_overlay = FALSE + rest_sprite_options = list("Default", "Sit", "Bellyup") + // Tall sprites /* /datum/robot_sprite/dogborg/tall/standard diff --git a/code/modules/mob/living/silicon/robot/sprites/syndicate.dm b/code/modules/mob/living/silicon/robot/sprites/syndicate.dm index 8567af603ea..7efca831d1b 100644 --- a/code/modules/mob/living/silicon/robot/sprites/syndicate.dm +++ b/code/modules/mob/living/silicon/robot/sprites/syndicate.dm @@ -25,6 +25,15 @@ name = "Drake" sprite_icon_state = "drake" +/datum/robot_sprite/dogborg/syndie/smolraptor + sprite_icon = 'icons/mob/robot/smallraptors/smolraptor_syndie.dmi' + name = "Small Raptor" + sprite_icon_state = "smolraptor" + has_eye_light_sprites = TRUE + has_vore_belly_sprites = TRUE + has_dead_sprite_overlay = FALSE + rest_sprite_options = list("Default", "Sit", "Bellyup") + // Tall sprites /datum/robot_sprite/dogborg/tall/syndie diff --git a/code/modules/mob/living/silicon/robot/subtypes/exploration/exploration-sprites.dm b/code/modules/mob/living/silicon/robot/subtypes/exploration/exploration-sprites.dm index 577c40b27f2..8ac5bc3cf18 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/exploration/exploration-sprites.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/exploration/exploration-sprites.dm @@ -36,6 +36,14 @@ icon_x = 32 pixel_x = 0 +/datum/robot_sprite/dogborg/explorer/smolraptor + sprite_icon = 'icons/mob/robot/smallraptors/smolraptor_ninja.dmi' + name = "Small Raptor" + sprite_icon_state = "smolraptor" + has_eye_light_sprites = TRUE + has_vore_belly_sprites = TRUE + has_dead_sprite_overlay = FALSE + rest_sprite_options = list("Default", "Sit", "Bellyup") /* placeholder /datum/robot_sprite/dogborg/tall/explorer diff --git a/icons/mob/robot/smallraptors/smolraptor_car.dmi b/icons/mob/robot/smallraptors/smolraptor_car.dmi index 8f6c612e34c..5c36eb12893 100644 Binary files a/icons/mob/robot/smallraptors/smolraptor_car.dmi and b/icons/mob/robot/smallraptors/smolraptor_car.dmi differ diff --git a/icons/mob/robot/smallraptors/smolraptor_cc.dmi b/icons/mob/robot/smallraptors/smolraptor_cc.dmi index ed4caa00810..ce42037fc52 100644 Binary files a/icons/mob/robot/smallraptors/smolraptor_cc.dmi and b/icons/mob/robot/smallraptors/smolraptor_cc.dmi differ diff --git a/icons/mob/robot/smallraptors/smolraptor_gen.dmi b/icons/mob/robot/smallraptors/smolraptor_gen.dmi index b96d0789540..5c85132d549 100644 Binary files a/icons/mob/robot/smallraptors/smolraptor_gen.dmi and b/icons/mob/robot/smallraptors/smolraptor_gen.dmi differ diff --git a/icons/mob/robot/smallraptors/smolraptor_jani.dmi b/icons/mob/robot/smallraptors/smolraptor_jani.dmi deleted file mode 100644 index 35d9ea9b2e8..00000000000 Binary files a/icons/mob/robot/smallraptors/smolraptor_jani.dmi and /dev/null differ diff --git a/icons/mob/robot/smallraptors/smolraptor_med.dmi b/icons/mob/robot/smallraptors/smolraptor_med.dmi index d644d1182fe..f5bba2a997b 100644 Binary files a/icons/mob/robot/smallraptors/smolraptor_med.dmi and b/icons/mob/robot/smallraptors/smolraptor_med.dmi differ diff --git a/icons/mob/robot/smallraptors/smolraptor_min.dmi b/icons/mob/robot/smallraptors/smolraptor_min.dmi index c743b04c6a0..398abc738b4 100644 Binary files a/icons/mob/robot/smallraptors/smolraptor_min.dmi and b/icons/mob/robot/smallraptors/smolraptor_min.dmi differ diff --git a/icons/mob/robot/smallraptors/smolraptor_ninja.dmi b/icons/mob/robot/smallraptors/smolraptor_ninja.dmi new file mode 100644 index 00000000000..13940e4d6be Binary files /dev/null and b/icons/mob/robot/smallraptors/smolraptor_ninja.dmi differ diff --git a/icons/mob/robot/smallraptors/smolraptor_pk.dmi b/icons/mob/robot/smallraptors/smolraptor_pk.dmi deleted file mode 100644 index 4303054abc1..00000000000 Binary files a/icons/mob/robot/smallraptors/smolraptor_pk.dmi and /dev/null differ diff --git a/icons/mob/robot/smallraptors/smolraptor_sec.dmi b/icons/mob/robot/smallraptors/smolraptor_sec.dmi new file mode 100644 index 00000000000..94a62e8c2c6 Binary files /dev/null and b/icons/mob/robot/smallraptors/smolraptor_sec.dmi differ diff --git a/icons/mob/robot/smallraptors/smolraptor_serv.dmi b/icons/mob/robot/smallraptors/smolraptor_serv.dmi index d5792633174..df1021aaf35 100644 Binary files a/icons/mob/robot/smallraptors/smolraptor_serv.dmi and b/icons/mob/robot/smallraptors/smolraptor_serv.dmi differ diff --git a/icons/mob/robot/smallraptors/smolraptor_syndie.dmi b/icons/mob/robot/smallraptors/smolraptor_syndie.dmi new file mode 100644 index 00000000000..9c15907e92c Binary files /dev/null and b/icons/mob/robot/smallraptors/smolraptor_syndie.dmi differ