diff --git a/code/datums/supplypacks/robotics.dm b/code/datums/supplypacks/robotics.dm index 9e3234cca6..3e861e354b 100644 --- a/code/datums/supplypacks/robotics.dm +++ b/code/datums/supplypacks/robotics.dm @@ -60,6 +60,14 @@ containername = "Robolimb blueprints (Morpheus)" access = access_robotics +/datum/supply_packs/robotics/robolimbs/cybersolutions + name = "Cyber Solutions robolimb blueprints" + contains = list(/obj/item/weapon/disk/limb/cybersolutions) + cost = 20 + containertype = /obj/structure/closet/crate/secure/science + containername = "Robolimb blueprints (Cyber Solutions)" + access = access_robotics + /datum/supply_packs/robotics/robolimbs/xion name = "Xion robolimb blueprints" contains = list(/obj/item/weapon/disk/limb/xion) @@ -176,4 +184,4 @@ cost = 30 containertype = /obj/structure/closet/crate/secure/science containername = "Jumper kit crate" - access = access_robotics + access = access_robotics \ No newline at end of file diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index 1a40a3d072..55fe50db39 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -74,6 +74,12 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ unavailable_to_build = 1 parts = list(BP_HEAD) +/datum/robolimb/bishop_alt2 + company = "Bishop - Rook" + desc = "This limb has a solid plastic casing with blue lights along it." + icon = 'icons/mob/human_races/cyberlimbs/bishop/bishop_alt2.dmi' + unavailable_to_build = 1 + /datum/robolimb/bishop_monitor company = "Bishop Monitor" desc = "Bishop Cybernetics' unique spin on a popular prosthetic head model. The themes conflict in an intriguing way." @@ -82,6 +88,19 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ parts = list(BP_HEAD) monitor_styles = standard_monitor_styles +/datum/robolimb/cybersolutions + company = "Cyber Solutions" + desc = "This limb is grey and rough, with little in the way of aesthetic." + icon = 'icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_main.dmi' + unavailable_to_build = 1 + +/datum/robolimb/cybersolutions_alt1 + company = "Cyber Solutions - Array" + desc = "This limb is simple and functional; array of sensors on a featureless case." + icon = 'icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_alt1.dmi' + unavailable_to_build = 1 + parts = list(BP_HEAD) + /datum/robolimb/grayson company = "Grayson" desc = "This limb has a sturdy and heavy build to it." @@ -131,6 +150,13 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ rgb=hephaestus_alt_rgb;\ rainbow=hephaestus_alt_rainbow" +/datum/robolimb/hephaestus_alt2 + company = "Hephaestus - Athena" + desc = "This rather thick limb has a militaristic green plating." + icon = 'icons/mob/human_races/cyberlimbs/hephaestus/hephaestus_alt2.dmi' + unavailable_to_build = 1 + + /datum/robolimb/hephaestus_monitor company = "Hephaestus Monitor" desc = "Hephaestus' unique spin on a popular prosthetic head model. It looks rugged and sturdy." @@ -182,6 +208,13 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ unavailable_to_build = 1 parts = list(BP_HEAD) +/datum/robolimb/wardtakahashi_alt2 + company = "Ward-Takahashi - Spirit" + desc = "This limb has white and purple features, with a heavier casing." + icon = 'icons/mob/human_races/cyberlimbs/wardtakahashi/wardtakahashi_alt2.dmi' + unavailable_to_build = 1 + + /datum/robolimb/wardtakahashi_monitor company = "Ward-Takahashi Monitor" desc = "Ward-Takahashi's unique spin on a popular prosthetic head model. It looks sleek and modern." @@ -197,14 +230,23 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ unavailable_to_build = 1 /datum/robolimb/xion_alt1 - company = "Xion Mfg. - Breach" + company = "Xion - Breach" desc = "This limb has a minimalist black and red casing. Looks a bit menacing." icon = 'icons/mob/human_races/cyberlimbs/xion/xion_alt1.dmi' unavailable_to_build = 1 parts = list(BP_HEAD) +/datum/robolimb/xion_alt2 + company = "Xion - Hull" + desc = "This limb has a thick orange casing with steel plating." + icon = 'icons/mob/human_races/cyberlimbs/xion/xion_alt2.dmi' + unavailable_to_build = 1 + monitor_styles = "blank=xion_off;\ + green=xion_green;\ + rgb=xion_rgb" + /datum/robolimb/xion_monitor - company = "Xion Mfg. Monitor" + company = "Xion Monitor" desc = "Xion Mfg.'s unique spin on a popular prosthetic head model. It looks and minimalist and utilitarian." icon = 'icons/mob/human_races/cyberlimbs/xion/xion_monitor.dmi' unavailable_to_build = 1 @@ -232,6 +274,9 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ /obj/item/weapon/disk/limb/bishop company = "Bishop" +/obj/item/weapon/disk/limb/cybersolutions + company = "Cyber Solutions" + /obj/item/weapon/disk/limb/grayson company = "Grayson" diff --git a/icons/mob/human_races/cyberlimbs/bishop/bishop_alt2.dmi b/icons/mob/human_races/cyberlimbs/bishop/bishop_alt2.dmi new file mode 100644 index 0000000000..fec74ac475 Binary files /dev/null and b/icons/mob/human_races/cyberlimbs/bishop/bishop_alt2.dmi differ diff --git a/icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_alt1.dmi b/icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_alt1.dmi new file mode 100644 index 0000000000..d2f9c44e91 Binary files /dev/null and b/icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_alt1.dmi differ diff --git a/icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_main.dmi b/icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_main.dmi new file mode 100644 index 0000000000..c14670993d Binary files /dev/null and b/icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_main.dmi differ diff --git a/icons/mob/human_races/cyberlimbs/hephaestus/hephaestus_alt2.dmi b/icons/mob/human_races/cyberlimbs/hephaestus/hephaestus_alt2.dmi new file mode 100644 index 0000000000..eb095f62ff Binary files /dev/null and b/icons/mob/human_races/cyberlimbs/hephaestus/hephaestus_alt2.dmi differ diff --git a/icons/mob/human_races/cyberlimbs/wardtakahashi/wardtakahashi_alt2.dmi b/icons/mob/human_races/cyberlimbs/wardtakahashi/wardtakahashi_alt2.dmi new file mode 100644 index 0000000000..706eee9c19 Binary files /dev/null and b/icons/mob/human_races/cyberlimbs/wardtakahashi/wardtakahashi_alt2.dmi differ diff --git a/icons/mob/human_races/cyberlimbs/xion/xion_alt2.dmi b/icons/mob/human_races/cyberlimbs/xion/xion_alt2.dmi new file mode 100644 index 0000000000..f6d11e4ff3 Binary files /dev/null and b/icons/mob/human_races/cyberlimbs/xion/xion_alt2.dmi differ diff --git a/icons/mob/monitor_icons.dmi b/icons/mob/monitor_icons.dmi index 99950fc154..0dd92e3fc2 100644 Binary files a/icons/mob/monitor_icons.dmi and b/icons/mob/monitor_icons.dmi differ