Skip to content

Commit

Permalink
big buff for robo freaks (#311)
Browse files Browse the repository at this point in the history
* allmind 2

* fixes tail greyscaling

* fixes limb naming
  • Loading branch information
Paxilmaniac authored Jan 1, 2025
1 parent 7c9160f commit 55ff085
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@
/datum/sprite_accessory/tails/cybernetic/cable
name = "Cable"
icon_state = "cable"

/datum/sprite_accessory/tails/cybernetic/shard_beta
name = "Shard Beta Raptoral"
icon_state = "shard_beta"
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ GLOBAL_LIST_INIT(frame_types, list(
"xmg_two",
"zhp",
"zhenkov",
"zhenkovdark"
"zhenkovdark",
"shard_alpha",
))

// What will be showed in the drop-down
Expand All @@ -41,7 +42,8 @@ GLOBAL_LIST_INIT(frame_type_names, list(
"xmg_two" = "Xion Manufacturing Group 2.0",
"zhp" = "Zeng-Hu Pharmaceuticals",
"zhenkov" = "Zhenkov & Co. Foundries",
"zhenkovdark" = "Zhenkov & Co. Foundries - At Night"
"zhenkovdark" = "Zhenkov & Co. Foundries - At Night",
"shard_alpha" = "Shard Alpha Raptoral",
))

/datum/species/regenerate_organs(mob/living/carbon/target, datum/species/old_species, replace_current = TRUE, list/excluded_zones, visual_only = FALSE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@
// var for monitor heads and their emissive states
var/monitor_state

/obj/item/bodypart/head/robot/android/Initialize(mapload)
. = ..()
name = "[GLOB.frame_type_names[limb_id]] [parse_zone(body_zone)]"

/obj/item/bodypart/head/robot/android/get_limb_icon(dropped)
. = ..()
// emissive handling
Expand All @@ -65,6 +69,10 @@
/obj/item/bodypart/chest/robot/android
biological_state = (BIO_ROBOTIC|BIO_BLOODED)

/obj/item/bodypart/chest/robot/android/Initialize(mapload)
. = ..()
name = "[GLOB.frame_type_names[limb_id]] [parse_zone(body_zone)]"

/obj/item/bodypart/chest/robot/android/welder_act_secondary(mob/living/user, obj/item/tool)
. = ..()
return change_type(user, tool)
Expand All @@ -80,6 +88,10 @@
/obj/item/bodypart/arm/right/robot/android
biological_state = (BIO_ROBOTIC|BIO_BLOODED)

/obj/item/bodypart/arm/right/robot/android/Initialize(mapload)
. = ..()
name = "[GLOB.frame_type_names[limb_id]] [parse_zone(body_zone)]"

/obj/item/bodypart/arm/right/robot/android/welder_act_secondary(mob/living/user, obj/item/tool)
. = ..()
return change_type(user, tool)
Expand All @@ -92,6 +104,10 @@
/obj/item/bodypart/arm/left/robot/android
biological_state = (BIO_ROBOTIC|BIO_BLOODED)

/obj/item/bodypart/arm/left/robot/android/Initialize(mapload)
. = ..()
name = "[GLOB.frame_type_names[limb_id]] [parse_zone(body_zone)]"

/obj/item/bodypart/arm/left/robot/android/welder_act_secondary(mob/living/user, obj/item/tool)
. = ..()
return change_type(user, tool)
Expand All @@ -104,6 +120,10 @@
/obj/item/bodypart/leg/right/robot/android
biological_state = (BIO_ROBOTIC|BIO_BLOODED)

/obj/item/bodypart/leg/right/robot/android/Initialize(mapload)
. = ..()
name = "[GLOB.frame_type_names[limb_id]] [parse_zone(body_zone)]"

/obj/item/bodypart/leg/right/robot/android/welder_act_secondary(mob/living/user, obj/item/tool)
. = ..()
return change_type(user, tool)
Expand All @@ -116,6 +136,10 @@
/obj/item/bodypart/leg/left/robot/android
biological_state = (BIO_ROBOTIC|BIO_BLOODED)

/obj/item/bodypart/leg/left/robot/android/Initialize(mapload)
. = ..()
name = "[GLOB.frame_type_names[limb_id]] [parse_zone(body_zone)]"

/obj/item/bodypart/leg/left/robot/android/welder_act_secondary(mob/living/user, obj/item/tool)
. = ..()
return change_type(user, tool)
Expand Down Expand Up @@ -928,6 +952,31 @@
icon_state = "zhenkovdark_r_leg"
limb_id = "zhenkovdark"

///
// shard alpha raptor legs
///
/obj/item/bodypart/leg/right/robot/android/shard_alpha
should_draw_greyscale = FALSE
icon_static = ANDROID_BODYPARTS_DMI
icon = ANDROID_BODYPARTS_DMI
icon_greyscale = ANDROID_BODYPARTS_DMI
icon_state = "shard_alpha_r_leg"
limb_id = "shard_alpha"
footstep_type = FOOTSTEP_MOB_CLAW
footprint_sprite = FOOTPRINT_SPRITE_CLAWS
bodyshape = BODYSHAPE_HUMANOID | BODYSHAPE_DIGITIGRADE

/obj/item/bodypart/leg/left/robot/android/shard_alpha
should_draw_greyscale = FALSE
icon_static = ANDROID_BODYPARTS_DMI
icon = ANDROID_BODYPARTS_DMI
icon_greyscale = ANDROID_BODYPARTS_DMI
icon_state = "shard_alpha_r_leg"
limb_id = "shard_alpha"
footstep_type = FOOTSTEP_MOB_CLAW
footprint_sprite = FOOTPRINT_SPRITE_CLAWS
bodyshape = BODYSHAPE_HUMANOID | BODYSHAPE_DIGITIGRADE

#undef HEAD_MONITOR_FACE
#undef ANDROID_BODYPARTS_DMI

Expand Down
Binary file not shown.

0 comments on commit 55ff085

Please sign in to comment.