diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index c76ec5e110a..e6b92eaced0 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -592,7 +592,7 @@ //Departments that the cycler can paint suits to look like. var/list/departments = list("Engineering","Mining","Medical","Security","Atmos") //Species that the suits can be configured to fit. - var/list/species = list("Human","Skrell","Unathi","Tajara", "Vaurca") + var/list/species = list("Human","Skrell","Unathi","Tajara", "Vaurca", "Machine") var/target_department var/target_species @@ -652,7 +652,7 @@ model_text = "Wizardry" req_access = null departments = list("Wizardry") - species = list("Human","Tajara","Skrell","Unathi") + species = list("Human","Tajara","Skrell","Unathi", "Machine") can_repair = 1 /obj/machinery/suit_cycler/hos @@ -668,7 +668,7 @@ model_text = "Captain" req_access = list(access_captain) departments = list("Captain") - species = list("Human","Tajara","Skrell","Unathi") + species = list("Human","Tajara","Skrell","Unathi", "Machine") can_repair = 1 /obj/machinery/suit_cycler/attack_ai(mob/user as mob) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 5f6ffe2165e..ccdc26c4a9c 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -84,11 +84,10 @@ //Set species_restricted list switch(target_species) - if("Human", "Skrell", "Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") //humanoid bodytypes + if("Human", "Skrell", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") //humanoid bodytypes species_restricted = list( "Human", "Skrell", - "Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame" ) //skrell/humans like to share with IPCs diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index fdbc2cb105d..0b03760f09e 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -14,7 +14,8 @@ sprite_sheets = list( "Tajara" = 'icons/mob/species/tajaran/helmet.dmi', "Skrell" = 'icons/mob/species/skrell/helmet.dmi', - "Unathi" = 'icons/mob/species/unathi/helmet.dmi' + "Unathi" = 'icons/mob/species/unathi/helmet.dmi', + "Machine" = 'icons/mob/species/machine/helmet.dmi' ) species_restricted = list("exclude","Diona","Xenomorph","Vaurca","Golem", "Vox") @@ -50,7 +51,7 @@ breach_threshold = 38 resilience = 0.2 can_breach = 1 - sprite_sheets = list("Tajara" = 'icons/mob/species/tajaran/suit.dmi',"Unathi" = 'icons/mob/species/unathi/suit.dmi') + sprite_sheets = list("Tajara" = 'icons/mob/species/tajaran/suit.dmi',"Unathi" = 'icons/mob/species/unathi/suit.dmi', "Machine = 'icons/mob/species/machine/suit.dmi") species_restricted = list("exclude","Diona","Xenomorph","Golem","Vaurca","Vox") supporting_limbs = list() diff --git a/code/modules/clothing/spacesuits/void/merc.dm b/code/modules/clothing/spacesuits/void/merc.dm index d50698f4236..edaa2500cd8 100644 --- a/code/modules/clothing/spacesuits/void/merc.dm +++ b/code/modules/clothing/spacesuits/void/merc.dm @@ -10,7 +10,7 @@ ) armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60) siemens_coefficient = 0.3 - species_restricted = list("Human", "Vaurca", "Machine", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") + species_restricted = list("Human", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") camera_networks = list(NETWORK_MERCENARY) light_overlay = "helmet_light_green" //todo: species-specific light overlays brightness_on = 6 @@ -30,4 +30,4 @@ armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60) allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs) siemens_coefficient = 0.3 - species_restricted = list("Human", "Skrell", "Vaurca", "Machine", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") + species_restricted = list("Human", "Skrell", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index a399c669df1..20f4a4d0175 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -10,18 +10,20 @@ siemens_coefficient = 0.4 //Species-specific stuff. - species_restricted = list("Human", "Machine", "Bishop Accessory Frame") + species_restricted = list("Human", "Bishop Accessory Frame") sprite_sheets_refit = list( "Unathi" = 'icons/mob/species/unathi/helmet.dmi', "Tajara" = 'icons/mob/species/tajaran/helmet.dmi', "Skrell" = 'icons/mob/species/skrell/helmet.dmi', - "Vaurca" = 'icons/mob/species/vaurca/helmet.dmi' + "Vaurca" = 'icons/mob/species/vaurca/helmet.dmi', + "Machine" = 'icons/mob/species/machine/helmet.dmi' ) sprite_sheets_obj = list( "Unathi" = 'icons/obj/clothing/species/unathi/hats.dmi', "Tajara" = 'icons/obj/clothing/species/tajaran/hats.dmi', "Skrell" = 'icons/obj/clothing/species/skrell/hats.dmi', - "Vaurca" = 'icons/obj/clothing/species/vaurca/hats.dmi' + "Vaurca" = 'icons/obj/clothing/species/vaurca/hats.dmi', + "Machine" = 'icons/obj/clothing/species/machine/hats.dmi' ) light_overlay = "helmet_light" @@ -38,18 +40,20 @@ max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.4 - species_restricted = list("Human", "Skrell", "Machine", "Bishop Accessory Frame") + species_restricted = list("Human", "Skrell", "Bishop Accessory Frame") sprite_sheets_refit = list( "Unathi" = 'icons/mob/species/unathi/suit.dmi', "Tajara" = 'icons/mob/species/tajaran/suit.dmi', "Skrell" = 'icons/mob/species/skrell/suit.dmi', - "Vaurca" = 'icons/mob/species/vaurca/suit.dmi' + "Vaurca" = 'icons/mob/species/vaurca/suit.dmi', + "Machine" = 'icons/mob/species/machine/suit.dmi' ) sprite_sheets_obj = list( "Unathi" = 'icons/obj/clothing/species/unathi/suits.dmi', "Tajara" = 'icons/obj/clothing/species/tajaran/suits.dmi', "Skrell" = 'icons/obj/clothing/species/skrell/suits.dmi', - "Vaurca" = 'icons/obj/clothing/species/vaurca/suits.dmi' + "Vaurca" = 'icons/obj/clothing/species/vaurca/suits.dmi', + "Machine" = 'icons/obj/clothing/species/machine/suits.dmi' ) //Breach thresholds, should ideally be inherited by most (if not all) voidsuits. diff --git a/code/modules/clothing/spacesuits/void/wizard.dm b/code/modules/clothing/spacesuits/void/wizard.dm index 4922cd8d9f3..ad250213c69 100644 --- a/code/modules/clothing/spacesuits/void/wizard.dm +++ b/code/modules/clothing/spacesuits/void/wizard.dm @@ -11,7 +11,7 @@ armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60) siemens_coefficient = 0.3 wizard_garb = 1 - species_restricted = list("Human", "Machine", "Heavy Machine", "Skeleton", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") + species_restricted = list("Human", "Heavy Machine", "Skeleton", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") /obj/item/clothing/head/helmet/space/void/wizard/equipped(var/mob/living/user) if(!user.is_wizard()) @@ -47,7 +47,7 @@ siemens_coefficient = 0.3 wizard_garb = 1 allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/teleportation_scroll,/obj/item/weapon/scrying,/obj/item/weapon/spellbook,/obj/item/device/soulstone,/obj/item/weapon/material/knife/ritual) - species_restricted = list("Human", "Skrell", "Machine", "Heavy Machine", "Skeleton", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") + species_restricted = list("Human", "Skrell", "Heavy Machine", "Skeleton", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") /obj/item/clothing/suit/space/void/wizard/equipped(var/mob/living/user) if(!user.is_wizard()) diff --git a/html/changelogs/alberyk-voidsuit.yml b/html/changelogs/alberyk-voidsuit.yml new file mode 100644 index 00000000000..1431a0333cc --- /dev/null +++ b/html/changelogs/alberyk-voidsuit.yml @@ -0,0 +1,7 @@ +author: Alberyk, Kyres1 + +delete-after: True + +changes: + - tweak: "Baseline frames can not wear regular voidsuits anymore, they now need to refit them using the suit cycler machine." + - imageadd: "Added unique ipc voidsuit and hardsuit sprites." diff --git a/icons/mob/species/machine/helmet.dmi b/icons/mob/species/machine/helmet.dmi new file mode 100644 index 00000000000..3151e1bf3c2 Binary files /dev/null and b/icons/mob/species/machine/helmet.dmi differ diff --git a/icons/mob/species/machine/suit.dmi b/icons/mob/species/machine/suit.dmi new file mode 100644 index 00000000000..8ad91181c03 Binary files /dev/null and b/icons/mob/species/machine/suit.dmi differ diff --git a/icons/obj/clothing/species/machine/hats.dmi b/icons/obj/clothing/species/machine/hats.dmi new file mode 100644 index 00000000000..ba7749db173 Binary files /dev/null and b/icons/obj/clothing/species/machine/hats.dmi differ diff --git a/icons/obj/clothing/species/machine/suits.dmi b/icons/obj/clothing/species/machine/suits.dmi new file mode 100644 index 00000000000..64e84d7504d Binary files /dev/null and b/icons/obj/clothing/species/machine/suits.dmi differ