diff --git a/modular_skyrat/master_files/code/modules/research/designs/misc_designs.dm b/modular_skyrat/master_files/code/modules/research/designs/misc_designs.dm index 87c95c6ae04..213bd617ac6 100644 --- a/modular_skyrat/master_files/code/modules/research/designs/misc_designs.dm +++ b/modular_skyrat/master_files/code/modules/research/designs/misc_designs.dm @@ -53,7 +53,7 @@ build_type = PROTOLATHE materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = SHEET_MATERIAL_AMOUNT) build_path = /obj/item/wallframe/time_clock - category = list(RND_CATEGORY_MACHINE) + category = list(RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS) departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SERVICE /datum/design/vox_gas_filter diff --git a/modular_skyrat/modules/ammo_workbench/code/design_disks.dm b/modular_skyrat/modules/ammo_workbench/code/design_disks.dm index aa497a8b7a2..f7955d053e0 100644 --- a/modular_skyrat/modules/ammo_workbench/code/design_disks.dm +++ b/modular_skyrat/modules/ammo_workbench/code/design_disks.dm @@ -22,9 +22,5 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/disk/ammo_workbench/advanced - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SECURITY, - RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO - ) + category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SECURITY) departmental_flags = DEPARTMENT_BITFLAG_SECURITY diff --git a/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm b/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm index 883eba01c59..4c0c96f0491 100644 --- a/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm +++ b/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm @@ -75,9 +75,7 @@ GLOBAL_LIST_EMPTY(cargo_marks) build_type = PROTOLATHE | AWAY_LATHE build_path = /obj/item/cargo_teleporter materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 5, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 5) - category = list( - RND_CATEGORY_EQUIPMENT - ) + category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_CARGO) departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/techweb_node/cargo_teleporter diff --git a/modular_skyrat/modules/company_imports/code/objects/hud_glasses.dm b/modular_skyrat/modules/company_imports/code/objects/hud_glasses.dm index 23a88c6bec7..0793a3cca8e 100644 --- a/modular_skyrat/modules/company_imports/code/objects/hud_glasses.dm +++ b/modular_skyrat/modules/company_imports/code/objects/hud_glasses.dm @@ -19,7 +19,5 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5) build_path = /obj/item/clothing/glasses/hud/gun_permit - category = list( - RND_CATEGORY_EQUIPMENT - ) + category = list(RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC) departmental_flags = DEPARTMENT_BITFLAG_CARGO diff --git a/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm b/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm index 6abfc743308..32cec0b2f9a 100644 --- a/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm +++ b/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm @@ -99,7 +99,7 @@ . += span_notice("Ctrl-Click to remove.") /obj/effect/decal/conveyor_sorter/attack_hand(mob/living/user, list/modifiers) - var/user_choice = tgui_input_list(user, "Choose which direction to sort to!", "Direction choice", directions) + var/user_choice = tgui_input_list(user, "Choose which direction to sort to!", "Direction choice", directions) // this would be cooler as a radial if(!user_choice) return ..() @@ -145,9 +145,7 @@ build_type = PROTOLATHE | AWAY_LATHE build_path = /obj/item/conveyor_sorter materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 5) - category = list( - RND_CATEGORY_EQUIPMENT - ) + category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_CARGO) departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/techweb_node/conveyor_sorter @@ -170,7 +168,7 @@ /obj/effect/decal/conveyor_sorter/improved name = "improved conveyor sorter" - desc = "A mark that will sort items out based on what they are. This one can sort in multiple directions." + desc = "A mark that will sort items out based on what they are. This one can sort in ordinal directions as well!" icon = 'modular_skyrat/modules/conveyor_sorter/icons/conveyor_sorter.dmi' icon_state = "sorter_improved" light_range = 3 @@ -198,4 +196,4 @@ design_ids = list( "conveyor_sorter_improved", ) - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500) + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500) // Why. diff --git a/modular_skyrat/modules/modular_implants/code/misc_devices.dm b/modular_skyrat/modules/modular_implants/code/misc_devices.dm index 318d96ece5d..9c303d0a80a 100644 --- a/modular_skyrat/modules/modular_implants/code/misc_devices.dm +++ b/modular_skyrat/modules/modular_implants/code/misc_devices.dm @@ -2,7 +2,9 @@ /obj/item/nifsoft_remover name = "Lopland 'Wrangler' NIF-Cutter" desc = "A small device that lets the user remove NIFSofts from a NIF user" - special_desc = "Given the relatively recent and sudden proliferation of NIFs, their use in crime both petty and organized has skyrocketed in recent years. The existence of nanomachine-based real-time burst communication that cannot be effectively monitored or hacked into has given most PMCs cause enough for concern to invent their own devices. This one is a 'Wrangler' model NIF-Cutter, used for crudely wiping programs directly off a user's Framework.." + special_desc = "Given the relatively recent and sudden proliferation of NIFs, their use in crime both petty and organized has skyrocketed in recent years. \ + The existence of nanomachine-based real-time burst communication that cannot be effectively monitored or hacked into has given most PMCs cause enough for concern \ + to invent their own devices. This one is a 'Wrangler' model NIF-Cutter, used for crudely wiping programs directly off a user's Framework." icon = 'modular_skyrat/modules/modular_implants/icons/obj/devices.dmi' icon_state = "nifsoft_remover" @@ -14,7 +16,7 @@ var/obj/item/organ/internal/cyberimp/brain/nif/target_nif = target_mob.get_organ_by_type(/obj/item/organ/internal/cyberimp/brain/nif) if(!target_nif || !length(target_nif.loaded_nifsofts)) - balloon_alert(user, "[target_mob] has no NIFSofts") + balloon_alert(user, "[target_mob] has no NIFSofts!") return var/list/installed_nifsofts = target_nif.loaded_nifsofts @@ -25,14 +27,14 @@ user.visible_message(span_warning("[user] starts to use [src] on [target_mob]"), span_notice("You start to use [src] on [target_mob]")) if(!do_after(user, 5 SECONDS, target_mob)) - balloon_alert(user, "removal cancelled") + balloon_alert(user, "removal cancelled!") return FALSE if(!target_nif.remove_nifsoft(nifsoft_to_remove)) - balloon_alert(user, "removal failed") + balloon_alert(user, "removal failed!") return FALSE - to_chat(user, span_notice("You successfully remove [nifsoft_to_remove]")) + to_chat(user, span_notice("You successfully remove [nifsoft_to_remove].")) user.log_message("removed [nifsoft_to_remove] from [target_mob]" ,LOG_GAME) if(create_disk) @@ -63,7 +65,10 @@ /obj/item/nif_repair_kit name = "Cerulean NIF Regenerator" desc = "A repair kit that allows for NIFs to be repaired without the use of surgery" - special_desc = "The effects of capitalism and industry run deep, and they run within the Nanite Implant Framework industry as well. Frameworks, complicated devices as they are, are normally locked at the firmware level to requiring specific 'approved' brands of repair paste or repair-docks. This hacked-kit has been developed by the Altspace Coven as a freeware alternative, spread far and wide throughout extra-Solarian space for quality of life for users located on the peripheries of society." + special_desc = "The effects of capitalism and industry run deep, and they run within the Nanite Implant Framework industry as well. \ + Frameworks, complicated devices as they are, are normally locked at the firmware level to requiring specific 'approved' brands of repair paste or repair-docks. \ + This hacked-kit has been developed by the Altspace Coven as a freeware alternative, spread far and wide throughout extra-Solarian space for quality of life \ + for users located on the peripheries of society." icon = 'modular_skyrat/modules/modular_implants/icons/obj/devices.dmi' icon_state = "repair_paste" w_class = WEIGHT_CLASS_SMALL diff --git a/modular_skyrat/modules/modular_implants/code/nif_research.dm b/modular_skyrat/modules/modular_implants/code/nif_research.dm index 37f14e04cd8..70eccd2bf1e 100644 --- a/modular_skyrat/modules/modular_implants/code/nif_research.dm +++ b/modular_skyrat/modules/modular_implants/code/nif_research.dm @@ -1,21 +1,21 @@ /datum/design/nifsoft_remover name = "Lopland 'Wrangler' NIF-Cutter" - desc = "A small device that lets the user remove NIFSofts from a NIF user" + desc = "A small device that lets the user remove NIFSofts from a NIF user." id = "nifsoft_remover" build_type = PROTOLATHE | AWAY_LATHE build_path = /obj/item/nifsoft_remover materials = list(/datum/material/iron = 200, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 5, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 5) - category = list(RND_CATEGORY_EQUIPMENT) + category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SECURITY) departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/nifsoft_money_sense name = "Automatic Appraisal NIFSoft" - desc = "A NIFSoft datadisk containing Automatic Appraisal" + desc = "A NIFSoft datadisk containing the Automatic Appraisal NIFsoft." id = "nifsoft_money_sense" build_type = PROTOLATHE | AWAY_LATHE build_path = /obj/item/disk/nifsoft_uploader/money_sense materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT) - category = list(RND_CATEGORY_EQUIPMENT) + category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_CARGO) departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/soulcatcher_device @@ -25,6 +25,6 @@ build_type = PROTOLATHE | AWAY_LATHE build_path = /obj/item/handheld_soulcatcher materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/silver = SHEET_MATERIAL_AMOUNT, /datum/material/bluespace = SHEET_MATERIAL_AMOUNT) - category = list(RND_CATEGORY_EQUIPMENT) + category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_EQUIPMENT_MEDICAL) // look, the anesthetic machine's there too departmental_flags = DEPARTMENT_BITFLAG_MEDICAL diff --git a/modular_skyrat/modules/moretraitoritems/code/ocelot_revolver.dm b/modular_skyrat/modules/moretraitoritems/code/ocelot_revolver.dm index 6972ef1a06e..70a1149dccb 100644 --- a/modular_skyrat/modules/moretraitoritems/code/ocelot_revolver.dm +++ b/modular_skyrat/modules/moretraitoritems/code/ocelot_revolver.dm @@ -1,6 +1,8 @@ /obj/item/gun/ballistic/revolver/ocelot name = "Colt Peacemaker revolver" desc = "A modified Peacemaker revolver that chambers .357 ammo. Less powerful than the regular .357, but ricochets a lot more." // We need tension...conflict. The world today has become too soft. We're living in an age where true feelings are suppressed. So we're going to shake things up a bit. We'll create a world dripping with tension... ...a world filled with greed and suspicion, bravery and cowardice. + // this could probably be made funnier by reducing its damage multiplier but also making it so that every fired bullet has the wacky ricochets + // but that's a different plate of cookies for a different glass of milk icon_state = "c38_panther" mag_type = /obj/item/ammo_box/magazine/internal/cylinder @@ -22,12 +24,12 @@ ricochet_decay_chance = 1 /datum/design/a357/peacemaker - name = ".357 Peacemaker speed loader" + name = "Speed Loader (.357 Peacemaker)" id = "a357PM" build_type = AUTOLATHE materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2) build_path = /obj/item/ammo_box/a357/peacemaker - category = list(RND_CATEGORY_HACKED, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED) + category = list(RND_CATEGORY_HACKED, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO) /obj/item/ammo_box/a357/peacemaker name = "speed loader (.357 Peacemaker)" diff --git a/modular_skyrat/modules/space_vines/scythes.dm b/modular_skyrat/modules/space_vines/scythes.dm index c52b465665c..6dc81c5b2da 100644 --- a/modular_skyrat/modules/space_vines/scythes.dm +++ b/modular_skyrat/modules/space_vines/scythes.dm @@ -56,25 +56,21 @@ force = 20 hit_range = 3 -/datum/design/scythe_t1 +/datum/design/scythe name = "Scythe (Tier 1)" desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow." id = "scythet1" build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5) build_path = /obj/item/scythe/tier1 - category = list(RND_CATEGORY_EQUIPMENT) + category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_BOTANY) departmental_flags = DEPARTMENT_BITFLAG_SERVICE -/datum/design/scythe_t2 +/datum/design/scythe/tier2 name = "Scythe (Tier 2)" - desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow." id = "scythet2" - build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5) build_path = /obj/item/scythe/tier2 - category = list(RND_CATEGORY_EQUIPMENT) - departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/techweb_node/scythe_t1 id = "t1scythe"