diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index c4ed79d2e64..a09c13951a3 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -68,5 +68,79 @@ /obj/item/device/modkit/tajaran name = "tajaran hardsuit modification kit" - desc = "A kit containing all the needed tools and parts to modify a voidsuit for another user. This one looks like it's meant for Tajarans." + desc = "A kit containing all the needed tools and parts to modify a voidsuit for another user. This one looks like it's meant for Tajara." target_species = BODYTYPE_TAJARA + +/obj/item/voidsuit_modkit + name = "voidsuit kit" + icon = 'icons/obj/device.dmi' + icon_state = "modkit" + desc = "A simple cardboard box containing the requisition forms, permits, and decal kits a Himean voidsuit." + desc_info = "In order to convert a voidsuit simply click on voidsuit or helmet with this item\ + The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit\ + or else it will be deleted." + w_class = ITEMSIZE_SMALL + 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/parts = MODKIT_FULL + +/obj/item/voidsuit_modkit/afterattack(obj/item/W as obj, mob/user as mob, proximity) + if(!proximity) + return + + if(!parts) + to_chat(user, "This kit has no parts for this modification left.") + user.drop_from_inventory(src,W) + qdel(src) + return + + 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 + + playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1) + var/obj/item/P = new voidsuit_product(W.loc) + + if(!reconverting) + to_chat(user, SPAN_NOTICE("Your permit for a [P] has been processed. Enjoy!")) + else + to_chat(user, SPAN_NOTICE("Your voidsuit part has been reconverted into [P].")) + + if (istype(W, /obj/item/clothing/head/helmet)) + parts &= ~MODKIT_HELMET + if (istype(W, /obj/item/clothing/suit)) + parts &= ~MODKIT_SUIT + + qdel(W) + + if(!parts) + user.drop_from_inventory(src) + qdel(src) + +/obj/item/voidsuit_modkit/himeo + name = "himeo voidsuit kit" + contained_sprite = TRUE + icon = 'icons/obj/mining_contained.dmi' + icon_state = "himeo_kit" + item_state = "himeo_kit" + desc = "A simple cardboard box containing the requisition forms, permits, and decal kits for a Himean voidsuit." + desc_fluff = "As part of a cost-cutting and productivity-enhancing initiative, NanoTrasen has authorized a number of Himean Type-76 'Fish Fur'\ + for use by miners originating from the planet. Most of these suits are assembled in Cannington and painstakingly optimized on-site by their\ + individual operator leading to a large trail of red tape as NanoTrasen is forced to inspect these suits to ensure their safety." \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index a3baf793c21..4036c8e850c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -82,7 +82,7 @@ /datum/gear/utility/himeo_kit display_name = "himean voidsuit kit" - path = /obj/item/himeo_kit + path = /obj/item/voidsuit_modkit/himeo allowed_roles = list("Cargo Technician", "Shaft Miner", "Quartermaster", "Head of Personnel", "Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice") /datum/gear/utility/wheelchair/color diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index ce1a1db092e..1c85039fea0 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1935,6 +1935,46 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE species_restricted = list(BODYTYPE_TAJARA) +/obj/item/clothing/suit/storage/toggle/fr_jacket/fluff/akila_jacket //Reflective First Responder Jacket - Akila Aksha'Shalwariran - shestrying + name = "reflective first responder jacket" + desc = "A jacket in an eye-blinding yellow, with flourescent green, light-reflective striping along the cuffs and bottom edge. A bright red cross rests on the front, over the heart." + icon = 'icons/obj/custom_items/akila_jacket.dmi' + icon_state = "akila_jacket" + item_state = "akila_jacket" + contained_sprite = TRUE + + +/obj/structure/sign/flag/red_coalition + name = "Red Coalition flag" + desc = "A high-quality copy of an original Red Coalition banner. This variant on the standard was flown by the Zelazny arcology during the Martian World War, Zelazny's origins as a \ + mining colony represented in the center by the alchemical symbol for iron." + icon_state = "redcoalition" + +/obj/structure/sign/flag/red_coalition/left + icon_state = "redcoalition_l" + +/obj/structure/sign/flag/red_coalition/right + icon_state = "redcoalition_r" + +/obj/item/flag/fluff/nikita_flag //Red Coalition Banner - Nikita Yutani - sycmos + name = "Red Coalition flag" + icon = 'icons/obj/custom_items/nikita_flag.dmi' + icon_state = "nikita_flag" + desc = "A high-quality copy of an original Red Coalition banner. This variant on the standard was flown by the Zelazny arcology during the Martian World War, Zelazny's origins as a \ + mining colony represented in the center by the alchemical symbol for iron." + flag_path = "redcoalition" + +/obj/item/flag/nikita_flag/l + flag_size = 1 + + +/obj/item/voidsuit_modkit/fluff/rajka_suit + name = "HEV-3 voidsuit kit" + desc = "A simple cardboard box containing the requisition forms, permits, and decal kits for a HEV-3 voidsuit." + suit_options = list( + /obj/item/clothing/suit/space/void/mining = /obj/item/clothing/suit/space/void/mining/fluff/rajka_suit, + /obj/item/clothing/head/helmet/space/void/mining = /obj/item/clothing/head/helmet/space/void/mining/fluff/rajka_helm) + /obj/item/clothing/head/helmet/space/void/mining/fluff/rajka_helm //HEV-3 Helmet - Rajka Kaljurl'zar - abigbear name = "HEV-3 helmet" desc = "A Hephaestus Environmental Voidsuit variant tailored to Tajara, complete with temperature-circulation auxiliaries, spacious helmet interior to minimize friction, and complete anti-microbial filtration systems." diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 951b821a0f1..9301e6bcdd2 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -1205,7 +1205,7 @@ var/list/total_extraction_beacons = list() playsound(loc, 'sound/items/screwdriver.ogg', 20, TRUE) else playsound(loc, /decl/sound_category/pickaxe_sound, 20, TRUE) - + var/successfully_sculpted = FALSE while(do_after(user, 2 SECONDS) && sculpture_process_check(choice, user)) if(times_carved <= 9) @@ -1437,54 +1437,3 @@ var/list/total_extraction_beacons = list() if(prob(75)) M.GetDrilled(1) -/****************Himeo Voidsuit Kit*****************/ -/obj/item/himeo_kit - name = "himeo voidsuit kit" - contained_sprite = TRUE - icon = 'icons/obj/mining_contained.dmi' - icon_state = "himeo_kit" - item_state = "himeo_kit" - desc = "A simple cardboard box containing the requisition forms, permits, and decal kits for a Himean voidsuit." - desc_fluff = "As part of a cost-cutting and productivity-enhancing initiative, NanoTrasen has authorized a number of Himean Type-76 'Fish Fur'\ - for use by miners originating from the planet. Most of these suits are assembled in Cannington and painstakingly optimized on-site by their\ - individual operator leading to a large trail of red tape as NanoTrasen is forced to inspect these suits to ensure their safety." - desc_info = "In order to convert a mining voidsuit into a Himean voidsuit, simply click on this box with a voidsuit or helmet in hand.\ - The same process can be used to convert a Himean voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit\ - or else it will be deleted." - w_class = ITEMSIZE_SMALL - -/obj/item/himeo_kit/attackby(obj/item/W as obj, mob/user as mob) - 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 - user.drop_item(W) - qdel(W) - playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1) - var/obj/item/P = new voidsuit_product(user.loc) - user.put_in_hands(P) - if(!reconverting) - to_chat(user, SPAN_NOTICE("Your permit for a [P] has been processed. Enjoy!")) - else - 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/icons/mob/custom_synthetic.dmi b/icons/mob/custom_synthetic.dmi index 4a72771ef70..ecdb5c71150 100644 Binary files a/icons/mob/custom_synthetic.dmi and b/icons/mob/custom_synthetic.dmi differ diff --git a/icons/obj/custom_items/akila_jacket.dmi b/icons/obj/custom_items/akila_jacket.dmi new file mode 100644 index 00000000000..7e9988a8850 Binary files /dev/null and b/icons/obj/custom_items/akila_jacket.dmi differ diff --git a/icons/obj/custom_items/nikita_flag.dmi b/icons/obj/custom_items/nikita_flag.dmi new file mode 100644 index 00000000000..c223ee342ec Binary files /dev/null and b/icons/obj/custom_items/nikita_flag.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index b37f377e88a..09398da1e40 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ