diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 62e0aeec7c9..c9f0bc0b282 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -424,6 +424,7 @@ #define PROSTHETIC_TESLA "Tesla Powered Prosthetics" #define PROSTHETIC_TESLA_BODY "Industrial Tesla Powered Prosthetics" #define PROSTHETIC_VAURCA "Vaurca Robotic Limb" +#define PROSTHETIC_VAURCA_WARRIOR "Vaurca Warrior Robotic Limb" #define PROSTHETIC_UNBRANDED "Unbranded" #define PROSTHETIC_UNBRANDED_EMISSIVE "Unbranded Emissive" #define PROSTHETIC_HOPLAN "Hoplan Head" diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index f516190b442..94ac8496a1c 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -5000,10 +5000,22 @@ Follow by example and make good judgement based on length which list to include icon_state = "mecha_eye_r" body_parts = list(BP_HEAD) do_colouration = FALSE + species_allowed = list(/datum/species/bug) + +/datum/sprite_accessory/marking/vaurca_augs/mecha_eye/warrior + name = "Mecha Eye (Faceplate, Right, Warrior)" + icon_state = "mecha_eye_warrior_r" + species_allowed = list(/datum/species/bug/type_b) /datum/sprite_accessory/marking/vaurca_augs/mecha_eye/mecha_eye_l name = "Mecha Eye (Faceplate, Left)" icon_state = "mecha_eye_l" + species_allowed = list(/datum/species/bug) + +/datum/sprite_accessory/marking/vaurca_augs/mecha_eye/mecha_eye_l/warrior + name = "Mecha Eye (Faceplate, Left, Warrior)" + icon_state = "mecha_eye_warrior_l" + species_allowed = list(/datum/species/bug/type_b) /datum/sprite_accessory/marking/vaurca_augs/mecha_eyeoverlay name = "Mecha Eye (Overlay, Right)" @@ -5017,6 +5029,7 @@ Follow by example and make good judgement based on length which list to include /datum/sprite_accessory/marking/vaurca_augs/mecha_eyeoverlay/upper name = "Upper Mecha Eye (Overlay, Right)" icon_state = "mecha_uppereyeoverlay_r" + /datum/sprite_accessory/marking/vaurca_augs/mecha_eye/mecha_eyeoverlay_l/upper name = "Upper Mecha Eye (Overlay, Left)" icon_state = "mecha_uppereyeoverlay_l" @@ -5024,6 +5037,7 @@ Follow by example and make good judgement based on length which list to include /datum/sprite_accessory/marking/vaurca_augs/mecha_eyeoverlay/lower name = "Lower Mecha Eye (Overlay, Right)" icon_state = "mecha_lowereyeoverlay_r" + /datum/sprite_accessory/marking/vaurca_augs/mecha_eye/mecha_eyeoverlay_l/lower name = "Lower Mecha Eye (Overlay, Left)" icon_state = "mecha_lowereyeoverlay_l" @@ -5033,10 +5047,24 @@ Follow by example and make good judgement based on length which list to include icon_state = "mecha_eye_r_l" body_parts = list(BP_HEAD) do_colouration = FALSE + species_allowed = list(/datum/species/bug) + +/datum/sprite_accessory/marking/vaurca_augs/mecha_eye_l/warrior + name = "Mecha Eye (Faceplate, Right, Large, Warrior)" + icon_state = "mecha_eye_warrior_r_l" + body_parts = list(BP_HEAD) + do_colouration = FALSE + species_allowed = list(/datum/species/bug/type_b) /datum/sprite_accessory/marking/vaurca_augs/mecha_eye_l/mecha_eye_r_l name = "Mecha Eye (Faceplate, Left, Large)" icon_state = "mecha_eye_l_l" + species_allowed = list(/datum/species/bug) + +/datum/sprite_accessory/marking/vaurca_augs/mecha_eye_l/mecha_eye_r_l/warrior + name = "Mecha Eye (Faceplate, Left, Large, Warrior)" + icon_state = "mecha_eye_warrior_l_l" + species_allowed = list(/datum/species/bug/type_b) /datum/sprite_accessory/marking/vaurca_augs/mecha_eyeoverlay_l name = "Mecha Eye (Overlay, Right, Large)" @@ -5047,9 +5075,11 @@ Follow by example and make good judgement based on length which list to include name = "Mecha Eye (Overlay, Left, Large)" icon_state = "mecha_eyeoverlay_l_l" -/datum/sprite_accessory/marking/vaurca_augs/mecha_eye_b/mandible +/datum/sprite_accessory/marking/vaurca_augs/mandible name = "Mecha Mandibles" icon_state = "mecha_mandibles" + body_parts = list(BP_HEAD) + do_colouration = FALSE /datum/sprite_accessory/marking/vaurca_augs/hand_panel_r name = "Hand Panel (Right)" diff --git a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm index 72aa6102354..ca4f075336a 100644 --- a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm @@ -45,6 +45,8 @@ /datum/unarmed_attack/bite/warrior ) + valid_prosthetics = list(PROSTHETIC_VAURCA, PROSTHETIC_VAURCA_WARRIOR) + /datum/species/bug/type_c diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index 7468d0d24a4..b7c61952af6 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -191,11 +191,17 @@ GLOBAL_DATUM(basic_robolimb, /datum/robolimb) /datum/robolimb/vaurca company = PROSTHETIC_VAURCA - desc = "This limb design is from old Sedantis, still manufactured by the Hives when providing maintenace to most of the basic Vaurcesian bioforms." + desc = "This limb design is from old Sedantis, still manufactured by the Hives when providing maintenance to most of the basic Vaurcesian bioforms." icon = 'icons/mob/human_races/vaurca/r_vaurcalimbs.dmi' species_can_use = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) allows_internal = FALSE +/datum/robolimb/vaurca/warrior + company = PROSTHETIC_VAURCA_WARRIOR + icon = 'icons/mob/human_races/vaurca/r_vaurcawarriorlimbs.dmi' + species_can_use = list(SPECIES_VAURCA_WARRIOR) + allowed_external_organs = list(BP_L_HAND, BP_R_HAND) + /datum/robolimb/hoplan company = PROSTHETIC_HOPLAN desc = "A refined helmet with an industrial lean. Extra plating seems to be applied to the top surface while the rest of the head features \ diff --git a/html/changelogs/SimpleMaroon-vaurcawarriorfixes.yml b/html/changelogs/SimpleMaroon-vaurcawarriorfixes.yml new file mode 100644 index 00000000000..53755b4267c --- /dev/null +++ b/html/changelogs/SimpleMaroon-vaurcawarriorfixes.yml @@ -0,0 +1,61 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: SimpleMaroon + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Added Vaurca Warrior variants of the Vaurca Robotic Limb hands." + - imageadd: "Added Vaurca Warrior variants of the Mecha Eye faceplates that work better with the new Warrior sprites." + - bugfix: "Made the Mecha Mandibles body marking function properly again." + - bugfix: "Fixed the Vaurca eyes overlay, which was missing the lower eyes." diff --git a/icons/mob/human_face/eyes.dmi b/icons/mob/human_face/eyes.dmi index 7407ef92561..10ff141d23b 100644 Binary files a/icons/mob/human_face/eyes.dmi and b/icons/mob/human_face/eyes.dmi differ diff --git a/icons/mob/human_races/markings_vaurca.dmi b/icons/mob/human_races/markings_vaurca.dmi index 99b026850fd..7411030a900 100644 Binary files a/icons/mob/human_races/markings_vaurca.dmi and b/icons/mob/human_races/markings_vaurca.dmi differ diff --git a/icons/mob/human_races/vaurca/r_vaurcawarriorlimbs.dmi b/icons/mob/human_races/vaurca/r_vaurcawarriorlimbs.dmi new file mode 100644 index 00000000000..cfa4c1469fe Binary files /dev/null and b/icons/mob/human_races/vaurca/r_vaurcawarriorlimbs.dmi differ