diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index fdf35cd5dff..2f1cd11ef2c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -40,6 +40,11 @@ jumpsuit["rainbow jumpsuit"] = /obj/item/clothing/under/rainbow gear_tweaks += new/datum/gear_tweak/path(jumpsuit) +/datum/gear/uniform/colorjumpsuit + display_name = "jumpsuit (recolorable)" + path = /obj/item/clothing/under/color/colorable + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/uniform/skirt display_name = "skirt selection" description = "A selection of skirts." @@ -164,6 +169,8 @@ pants["camo pants"] = /obj/item/clothing/under/pants/camo pants["tacticool pants"] = /obj/item/clothing/under/pants/tacticool pants["designer jeans"] = /obj/item/clothing/under/pants/designer + pants["ripped jeans"] = /obj/item/clothing/under/pants/ripped + pants["black ripped jeans"] = /obj/item/clothing/under/pants/blackripped pants["athletic shorts, black"] = /obj/item/clothing/under/shorts pants["athletic shorts, red"] = /obj/item/clothing/under/shorts/red pants["athletic shorts, green"] = /obj/item/clothing/under/shorts/green diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index f270a379c1a..81a8e1806d2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -114,4 +114,4 @@ /datum/gear/utility/himeo_kit display_name = "himean voidsuit kit" path = /obj/item/himeo_kit - allowed_roles = list("Cargo Technician", "Shaft Miner", "Quartermaster", "Head of Personnel") + allowed_roles = list("Cargo Technician", "Shaft Miner", "Quartermaster", "Head of Personnel", "Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice") diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm index dc0271fb2a6..78570b1fb7c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm @@ -76,11 +76,15 @@ antenna["antenna, curved"] = /obj/item/clothing/head/antenna antenna["antenna, straight"] = /obj/item/clothing/head/antenna/straight antenna["antenna, spiked"] = /obj/item/clothing/head/antenna/spiked + antenna["antenna, small spiked"] = /obj/item/clothing/head/antenna/spiked/small antenna["antenna, side"] = /obj/item/clothing/head/antenna/side antenna["antenna, dish"] = /obj/item/clothing/head/antenna/dish antenna["antenna, double"] = /obj/item/clothing/head/antenna/double antenna["antenna, left"] = /obj/item/clothing/head/antenna/double/left antenna["antenna, right"] = /obj/item/clothing/head/antenna/double/right + antenna["antenna, left horn"] = /obj/item/clothing/head/antenna/double/left/horn + antenna["antenna, right horn"] = /obj/item/clothing/head/antenna/double/right/horn + antenna["antenna, circle"] = /obj/item/clothing/head/antenna/circle gear_tweaks += new/datum/gear_tweak/path(antenna) /datum/gear/ears/trinary_halo diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index c81d8170564..564423b12b2 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -548,6 +548,12 @@ icon_state = "horncrown" item_state = "horncrown" +/obj/item/clothing/head/antenna/spiked/small + name = "small chassis horns" + desc = "Two small mounts holding up chassis protrusions on either side of the head, sans head crown." + icon_state = "horn" + item_state = "horncrown" + /obj/item/clothing/head/antenna/side name = "side chassis mounts" desc = "Two large mounts holding up chassis protrusions on either side of the head." @@ -566,6 +572,11 @@ icon_state = "dual_robot_antennae" item_state = "dual_robot_antennae" +/obj/item/clothing/head/antenna/double/left/horn + name = "left antenna horn" + icon_state = "left_horn" + item_state = "left_horn" + /obj/item/clothing/head/antenna/double/left name = "left antenna ear" icon_state = "left_robot_antennae" @@ -576,6 +587,16 @@ icon_state = "right_robot_antennae" item_state = "right_robot_antennae" +/obj/item/clothing/head/antenna/double/right/horn + name = "right antenna horn" + icon_state = "right_horn" + item_state = "right_horn" + +/obj/item/clothing/head/antenna/circle + name = "circle antenna" + icon_state = "circleantenna" + item_state = "dish" + /obj/item/clothing/head/antenna/trinary_halo name = "trinary perfection antenna" desc = "A decorative antenna that is commonly worn by IPCs who serve the Trinary Perfection. It resembles a golden gear." diff --git a/code/modules/clothing/spacesuits/void/misc.dm b/code/modules/clothing/spacesuits/void/misc.dm index 056cbe6bd6c..a1a102bd133 100644 --- a/code/modules/clothing/spacesuits/void/misc.dm +++ b/code/modules/clothing/spacesuits/void/misc.dm @@ -356,7 +356,7 @@ species_restricted = list(BODYTYPE_HUMAN) /obj/item/clothing/head/helmet/space/void/mining/himeo - name = "himeo voidsuit helmet" + name = "himeo mining voidsuit helmet" desc = "A rugged polymer and alloy space helmet with a ballistic glass and polycarbonate visor commonly used by astronauts from Himeo." desc_fluff = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life\ is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors." @@ -367,8 +367,10 @@ slot_r_hand_str = "mining_helm" ) + light_overlay = "helmet_light_dual" + /obj/item/clothing/suit/space/void/mining/himeo - name = "himeo voidsuit" + name = "himeo mining voidsuit" item_state_slots = list( slot_l_hand_str = "mining_hardsuit", slot_r_hand_str = "mining_hardsuit" @@ -378,4 +380,58 @@ Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet\ enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster." item_state = "rig-himeo" - icon_state = "rig-himeo" \ No newline at end of file + icon_state = "rig-himeo" + +/obj/item/clothing/head/helmet/space/void/engineering/himeo + name = "himeo engineering voidsuit helmet" + desc = "A rugged polymer and alloy space helmet with a reinforced ballistic glass and polycarbonate goggle-type visor commonly used by astronauts from Himeo." + desc_fluff = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life\ + is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors." + icon_state = "rig0-himeo-engineering" + item_state = "rig0-himeo-engineering" + item_state_slots = list( + slot_l_hand_str = "engineering_helm", + slot_r_hand_str = "engineering_helm" + ) + + light_overlay = "helmet_light_dual" + +/obj/item/clothing/suit/space/void/engineering/himeo + name = "himeo engineering voidsuit" + item_state_slots = list( + slot_l_hand_str = "engineering_hardsuit", + slot_r_hand_str = "engineering_hardsuit" + ) + desc = "A simple but durable softsuit with a set of protective alloy plates commonly used by Himean astronauts. The suit life support console and torso plate contains a Himean flag patch. This particular model seems to have lead lining in it." + desc_fluff = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\ + Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet\ + enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster." + item_state = "rig-himeo-engineering" + icon_state = "rig-himeo-engineering" + +/obj/item/clothing/head/helmet/space/void/atmos/himeo + name = "himeo atmospherics voidsuit helmet" + desc = "A rugged polymer and alloy space helmet with a reinforced ballistic glass and polycarbonate goggle-type visor commonly used by astronauts from Himeo. This particular model appears to have a thicker layer of insulation on it." + desc_fluff = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life\ + is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors." + icon_state = "rig0-himeo-engineering" + item_state = "rig0-himeo-engineering" + item_state_slots = list( + slot_l_hand_str = "atmos_helm", + slot_r_hand_str = "atmos_helm" + ) + + light_overlay = "helmet_light_dual" + +/obj/item/clothing/suit/space/void/atmos/himeo + name = "himeo atmospherics voidsuit" + item_state_slots = list( + slot_l_hand_str = "atmos_hardsuit", + slot_r_hand_str = "atmos_hardsuit" + ) + desc = "A simple but durable softsuit with a set of protective alloy plates commonly used by Himean astronauts. The suit life support console and torso plate contains a Himean flag patch. This particular model seems to have better insulation in it." + desc_fluff = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\ + Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet\ + enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster." + item_state = "rig-himeo-engineering" + icon_state = "rig-himeo-engineering" diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index ff3dfd4be10..2b7f7e8880a 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -162,3 +162,10 @@ icon_state = "darkred" item_state = "r_suit" worn_state = "darkred" + +/obj/item/clothing/under/color/colorable + name = "colorable jumpsuit" + desc = "A non-descript jumpsuit in 167,777,216 designer colors." + icon_state = "white" + item_state = "w_suit" + worn_state = "colorable" \ No newline at end of file diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 6236d4f031b..b8c99e74185 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -222,3 +222,17 @@ desc = "A pair of rugged camo pants. Pairs well with canned rations and an SKS." icon_state = "tacticoolpants" item_state = "tacticoolpants" + +/obj/item/clothing/under/pants/ripped + name = "ripped jeans" + desc = "A pair of ripped denim jeans. Probably sold for more than they're worth." + icon_state = "jeansripped" + item_state = "jeansripped" + body_parts_covered = LOWER_TORSO + +/obj/item/clothing/under/pants/blackripped + name = "black ripped jeans" + desc = "A pair of ripped black jeans. The brown belt is an interesting touch." + icon_state = "jeansblackripped" + item_state = "jeansblackripped" + body_parts_covered = LOWER_TORSO \ No newline at end of file diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index a961d611b38..affc6cedd32 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -1372,42 +1372,37 @@ var/list/total_extraction_beacons = list() w_class = ITEMSIZE_SMALL /obj/item/himeo_kit/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/clothing/suit/space/void/mining)) - if(W.contents.len) + var/list/suit_options = list( + /obj/item/clothing/suit/space/void/mining = /obj/item/clothing/suit/space/void/mining/himeo, + /obj/item/clothing/head/helmet/space/void/mining = /obj/item/clothing/head/helmet/space/void/mining/himeo, + + /obj/item/clothing/suit/space/void/engineering = /obj/item/clothing/suit/space/void/engineering/himeo, + /obj/item/clothing/head/helmet/space/void/engineering = /obj/item/clothing/head/helmet/space/void/engineering/himeo, + + /obj/item/clothing/suit/space/void/atmos = /obj/item/clothing/suit/space/void/atmos/himeo, + /obj/item/clothing/head/helmet/space/void/atmos = /obj/item/clothing/head/helmet/space/void/atmos/himeo + ) + var/reconverting = FALSE + var/voidsuit_product = suit_options[W.type] + if(!voidsuit_product) + for(var/thing in suit_options) + if(suit_options[thing] == W.type) + voidsuit_product = thing + reconverting = TRUE + break + if(voidsuit_product) + if(istype(W, /obj/item/clothing/suit/space/void) && W.contents.len) to_chat(user, SPAN_NOTICE("Remove any accessories, helmets, magboots, or oxygen tanks before attempting to convert this voidsuit.")) return - else - user.drop_item(W) - qdel(W) - to_chat(user, SPAN_NOTICE("Your permit for a Himean voidsuit has been processed. Enjoy!")) - playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1) - var/obj/item/clothing/suit/space/void/mining/himeo/P = new /obj/item/clothing/suit/space/void/mining/himeo(user.loc) - user.put_in_hands(P) - - else if(istype(W, /obj/item/clothing/head/helmet/space/void/mining)) user.drop_item(W) qdel(W) - to_chat(user, SPAN_NOTICE("Your permit for a Himean voidsuit helmet has been processed. Enjoy!")) playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1) - var/obj/item/clothing/head/helmet/space/void/mining/himeo/P = new /obj/item/clothing/head/helmet/space/void/mining/himeo(user.loc) + var/obj/item/P = new voidsuit_product(user.loc) user.put_in_hands(P) - - if(istype(W, /obj/item/clothing/suit/space/void/mining/himeo)) - if(W.contents.len) - to_chat(user, SPAN_NOTICE("Remove any accessories, helmets, magboots, or oxygen tanks before attempting to convert this voidsuit.")) - return + if(!reconverting) + to_chat(user, SPAN_NOTICE("Your permit for a [P] has been processed. Enjoy!")) else - user.drop_item(W) - qdel(W) - to_chat(user, SPAN_NOTICE("Your Himean voidsuit has been reconverted into a NanoTrasen mining voidsuit.")) - playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1) - var/obj/item/clothing/suit/space/void/mining/P = new /obj/item/clothing/suit/space/void/mining(user.loc) - user.put_in_hands(P) - - if(istype(W, /obj/item/clothing/head/helmet/space/void/mining/himeo)) - user.drop_item(W) - qdel(W) - to_chat(user, SPAN_NOTICE("Your Himean voidsuit helmet has been reconverted into a NanoTrasen mining helmet.")) - playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1) - var/obj/item/clothing/suit/space/void/mining/P = new /obj/item/clothing/head/helmet/space/void/mining(user.loc) - user.put_in_hands(P) + to_chat(user, SPAN_NOTICE("Your Himean voidsuit part has been reconverted into [P].")) + return + else + return ..() \ No newline at end of file diff --git a/html/changelogs/stryker-loadout5.yml b/html/changelogs/stryker-loadout5.yml new file mode 100644 index 00000000000..ec1d5a22efa --- /dev/null +++ b/html/changelogs/stryker-loadout5.yml @@ -0,0 +1,8 @@ +author: The Stryker, NiennaB +delete-after: True +changes: + - rscadd: "Added circle and horn antennas to the loadout (Xenowear - IPC, antenna selection)." + - rscadd: "Added ripped jeans under the pants selection in the loadout, as well as a colorable jumpsuit in the uniforms tab." + - rscadd: "Added a Himeo engineering and atmos voidsuit that can be made with the Himeo voidsuit kit and an existing engineering/atmos voidsuit." + - tweak: "The Himeo suit sprite no longer has side views when dragged." + - tweak: "IPC antennae sprites have been changed to be smaller." \ No newline at end of file diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index c22a37b3d04..d25d596d8ef 100644 Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index c8a4c7f6c0e..8ef4235bf56 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index a2abf7c1b84..ec12d8fd795 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 7804ac5809b..0bc855fcb7d 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index d1465c4e5c5..91522742fb3 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index dce6e208a0e..b4b44311e8c 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/pants.dmi b/icons/obj/pants.dmi index a56aef8228a..e13f2166087 100644 Binary files a/icons/obj/pants.dmi and b/icons/obj/pants.dmi differ