diff --git a/code/datums/components/crafting/recipes/recipes_tribal.dm b/code/datums/components/crafting/recipes/recipes_tribal.dm index 38ada0ef850..dc4a65b185a 100644 --- a/code/datums/components/crafting/recipes/recipes_tribal.dm +++ b/code/datums/components/crafting/recipes/recipes_tribal.dm @@ -496,6 +496,26 @@ datum/crafting_recipe/tribalwar/bone /obj/item/stack/sheet/bone = 1) tools = list(TOOL_WORKBENCH) +// Amulet of Protection (Tier 1.5 armor, 10 DT/Wound prot) +/datum/crafting_recipe/magic/armoramulet + name = "Amulet of Protection" + result = /obj/item/clothing/suit/armor/outfit/vest/utility/gear_harness/magicarmor + time = 10 + reqs = list(/obj/item/stack/sheet/leather = 2, + /obj/item/stack/sheet/mineral/titanium = 1, + /obj/item/stack/sheet/mineral/gold = 1) + tools = list(TOOL_RITUAL) + +// Amulet of Hazard Protection (Tier 1? armor, 75 enviro prot + 50 plasma prot) +/datum/crafting_recipe/magic/radamulet + name = "Amulet of Cleansing" + result = /obj/item/clothing/suit/armor/outfit/vest/utility/gear_harness/magicarmor/hazard + time = 10 + reqs = list(/obj/item/stack/sheet/leather = 2, + /obj/item/stack/sheet/mineral/titanium = 1, + /obj/item/stack/sheet/mineral/plasma = 1) + tools = list(TOOL_RITUAL) + // T0 Magic Missile Wand (spawn item) /datum/crafting_recipe/magic/bonewand name = "Improvised Wand of Magic Missile" diff --git a/code/modules/clothing/suits/arfsuits.dm b/code/modules/clothing/suits/arfsuits.dm index bd1948cc7c5..1be7e3a8c10 100644 --- a/code/modules/clothing/suits/arfsuits.dm +++ b/code/modules/clothing/suits/arfsuits.dm @@ -4738,3 +4738,23 @@ icon = 'icons/fallout/clothing/hats.dmi' icon_state = "hazmat" item_state = "hazmat_helmet" + +// Magic armors - bizarre stats, don't fit into normal categories? Probably will need tweaking down the line. + +/obj/item/clothing/suit/armor/outfit/vest/utility/gear_harness/magicarmor + name = "talisman of protection" + desc = "A talisman made of magically charged titanium and set with a gleaming fragment of gold. This will protect the wearer from all attacks equally, but the enchantment prevents the wearing of proper armor." + w_class = WEIGHT_CLASS_TINY + max_integrity = 500 + icon_state = "protamulet" + pocket_storage_component_path = null + slowdown = ARMOR_SLOWDOWN_LIGHT * ARMOR_SLOWDOWN_GLOBAL_MULT + armor = list("linemelee" = 0, "linebullet" = 0, "linelaser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 10, "damage_threshold" = 10) + armor_tier_desc = ARMOR_CLOTHING_LIGHT + +/obj/item/clothing/suit/armor/outfit/vest/utility/gear_harness/magicarmor/hazard + name = "talisman of cleansing" + desc = "A talisman made of magically charged titanium and set with a humming shard of plasma. This will protect the wearer from hazards like radiation and acid, but offers no protection from more mundane threats." + icon_state = "hazardamulet" + armor = list("linemelee" = 0, "linebullet" = 0, "linelaser" = 0, "energy" = 50, "bomb" = 0, "bio" = 75, "rad" = 75, "fire" = 75, "acid" = 75, "wound" = 0, "damage_threshold" = 0) + armor_tier_desc = ARMOR_CLOTHING_DESC diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index b30471455e6..824af92703e 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -9,6 +9,8 @@ desc = "This weapon consists of an absurd number of disparate mining technologies that are, somehow, \ kludged together to create an incredibly effective weapon and mining tool. Good at obliterating rock, steel, and flesh alike." force = 25 // clunky and heavy, not good for one hand + force_unwielded = 25 + force_wielded = 40 w_class = WEIGHT_CLASS_BULKY slot_flags = INV_SLOTBIT_BACK throwforce = 40 @@ -28,8 +30,10 @@ var/backstab_bonus = 30 /obj/item/kinetic_crusher/cyborg //probably give this a unique sprite later - desc = "An integrated version of the standard kinetic crusher with a grinded down axe head to dissuade mis-use against crewmen. Deals damage equal to the standard crusher against creatures, however." - force = 10 //wouldn't want to give a borg a 20 brute melee weapon unemagged now would we + desc = "An integrated version of the standard kinetic crusher." + force = 40 // it's the wasteland and post-apoc in a dystopia. Robro gonna smash. + force_unwielded = null + force_wielded = null detonation_damage = 90 wielded = 1 @@ -175,6 +179,7 @@ icon_state = "crusher-glaive" item_state = "crusher0-glaive" detonation_damage = 20 + max_reach = 2 weapon_special_component = /datum/component/weapon_special/ranged_spear block_parry_data = /datum/block_parry_data/crusherglaive //ideas: altclick that lets you pummel people with the handguard/handle? diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 3d60d8c5054..2d77061608d 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -10,53 +10,53 @@ var/icon_deny = "mining-deny" var/obj/item/card/id/inserted_id var/list/prize_list = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces. - new /datum/data/mining_equipment("50 caps", /obj/item/stack/f13Cash/caps/fivezero, 1000), - new /datum/data/mining_equipment("100 caps", /obj/item/stack/f13Cash/caps/onezerozero, 2000), - new /datum/data/mining_equipment("150 caps", /obj/item/stack/f13Cash/caps/onefivezero, 3000), - new /datum/data/mining_equipment("200 caps", /obj/item/stack/f13Cash/caps/twozerozero, 4000), - new /datum/data/mining_equipment("250 caps", /obj/item/stack/f13Cash/caps/twofivezero, 5000), + new /datum/data/mining_equipment("50 eddies", /obj/item/stack/f13Cash/caps/fivezero, 250), + new /datum/data/mining_equipment("100 eddies", /obj/item/stack/f13Cash/caps/onezerozero, 500), + new /datum/data/mining_equipment("150 eddies", /obj/item/stack/f13Cash/caps/onefivezero, 750), + new /datum/data/mining_equipment("200 eddies", /obj/item/stack/f13Cash/caps/twozerozero, 1000), + new /datum/data/mining_equipment("250 eddies", /obj/item/stack/f13Cash/caps/twofivezero, 1250), new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 10), new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100), new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 300), - new /datum/data/mining_equipment("Cosmic X-Treme", /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nukaxtreme, 1000), - new /datum/data/mining_equipment("Cosmiccide", /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nukacide, 250), + new /datum/data/mining_equipment("Cosmic X-Treme", /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nukaxtreme, 750), + new /datum/data/mining_equipment("Cosmiccide", /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nukacide, 50), new /datum/data/mining_equipment("Cosmic Bombdrop", /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nukabomb, 100), - new /datum/data/mining_equipment("Vim Captains Blend", /obj/item/reagent_containers/food/drinks/drinkingglass/filled/vimcap, 500), + new /datum/data/mining_equipment("Vim Captains Blend", /obj/item/reagent_containers/food/drinks/drinkingglass/filled/vimcap, 250), new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150), -// new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 200), + new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 250), // new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 300), - new /datum/data/mining_equipment("Plushie Choice", /obj/item/choice_beacon/box/plushie, 300), + new /datum/data/mining_equipment("Plushie Choice", /obj/item/choice_beacon/box/plushie, 250), // new /datum/data/mining_equipment("Stabilizing Serum", /obj/item/hivelordstabilizer, 400), // new /datum/data/mining_equipment("Fulton Beacon", /obj/item/fulton_core, 400), // new /datum/data/mining_equipment("Shelter Capsule", /obj/item/survivalcapsule, 400), // new /datum/data/mining_equipment("Survival Knife", /obj/item/melee/onehanded/knife/survival, 450), // new /datum/data/mining_equipment("GAR Meson Scanners", /obj/item/clothing/glasses/meson/gar, 500), // new /datum/data/mining_equipment("Explorer's Webbing", /obj/item/storage/belt/utility/mining, 500), - new /datum/data/mining_equipment("Dynamite Stick", /obj/item/grenade/f13/dynamite, 250), - new /datum/data/mining_equipment("Dynamite Crate", /obj/item/storage/box/dynamite_box, 1500), - new /datum/data/mining_equipment("Larger Ore Bag", /obj/item/storage/bag/ore/large, 500), - new /datum/data/mining_equipment("Medicated Sutures", /obj/item/stack/medical/suture/medicated, 2000), - new /datum/data/mining_equipment("Advanced Mesh", /obj/item/stack/medical/mesh/advanced, 2000), - new /datum/data/mining_equipment("Sterile Bandages", /obj/item/stack/medical/gauze/adv, 2000), - new /datum/data/mining_equipment("Limb Grower", /obj/item/circuitboard/machine/limbgrower, 3000), + new /datum/data/mining_equipment("Dynamite Stick", /obj/item/grenade/f13/dynamite, 75), + new /datum/data/mining_equipment("Dynamite Crate", /obj/item/storage/box/dynamite_box, 500), + new /datum/data/mining_equipment("Larger Ore Bag", /obj/item/storage/bag/ore/large, 250), + new /datum/data/mining_equipment("Medicated Sutures", /obj/item/stack/medical/suture/medicated, 500), + new /datum/data/mining_equipment("Advanced Mesh", /obj/item/stack/medical/mesh/advanced, 500), + new /datum/data/mining_equipment("Sterile Bandages", /obj/item/stack/medical/gauze/adv, 500), + new /datum/data/mining_equipment("Limb Grower", /obj/item/circuitboard/machine/limbgrower, 1000), // new /datum/data/mining_equipment("Kinetic Crusher", /obj/item/kinetic_crusher, 750), // new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750), -// new /datum/data/mining_equipment("Survival Medipen", /obj/item/reagent_containers/hypospray/medipen/survival, 750), -// new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/storage/firstaid/brute, 800), -// new /datum/data/mining_equipment("Burn First-Aid Kit", /obj/item/storage/firstaid/fire, 800), - new /datum/data/mining_equipment("First-Aid Kit", /obj/item/storage/firstaid/ancient, 3000), - new /datum/data/mining_equipment("Combat Medkit", /obj/item/storage/firstaid/tactical, 10000), - new /datum/data/mining_equipment("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800), + new /datum/data/mining_equipment("Survival Medipen", /obj/item/reagent_containers/hypospray/medipen/survival, 250), + new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/storage/firstaid/brute, 200), + new /datum/data/mining_equipment("Burn First-Aid Kit", /obj/item/storage/firstaid/fire, 200), + new /datum/data/mining_equipment("First-Aid Kit", /obj/item/storage/firstaid/ancient, 250), + new /datum/data/mining_equipment("Combat Medkit", /obj/item/storage/firstaid/tactical, 5000), + new /datum/data/mining_equipment("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 750), // new /datum/data/mining_equipment("Resonator", /obj/item/resonator, 800), // new /datum/data/mining_equipment("Mini Extinguisher", /obj/item/extinguisher/mini, 1000), // new /datum/data/mining_equipment("Fulton Pack", /obj/item/extraction_pack, 1000), - new /datum/data/mining_equipment("Lazarus Injector", /obj/item/lazarus_injector, 1000), - new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 1000), + new /datum/data/mining_equipment("Lazarus Injector", /obj/item/lazarus_injector, 500), + new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 500), // new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1000), // new /datum/data/mining_equipment("Jetpack Upgrade", /obj/item/tank/jetpack/suit, 2000), // new /datum/data/mining_equipment("Space Cash", /obj/item/stack/spacecash/c1000, 2000), // new /datum/data/mining_equipment("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000), - new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000), + new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/pickaxe/diamond, 1000), // new /datum/data/mining_equipment("Spare Suit Voucher", /obj/item/suit_voucher, 2000), // new /datum/data/mining_equipment("Super Resonator", /obj/item/resonator/upgraded, 2500), new /datum/data/mining_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 2500), diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index f308e559ff8..1f4d37f9cb0 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -526,5 +526,5 @@ /obj/item/reagent_containers/glass/bottle/synthjuice name = "synthetic repair paste" desc = "A small bottle full of synthetic repair gel. Not for organic consumption." - volume = 30 - list_reagents = list(/datum/reagent/fuel/robo_repair_gel = 30) + volume = 120 + list_reagents = list(/datum/reagent/fuel/robo_repair_gel = 120) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm index ea32de498a5..fdebb6e5caa 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm @@ -278,6 +278,6 @@ name = "Synth Repair Gel" id = "synthetic_repair_paste" build_type = AUTOLATHE - materials = list(/datum/material/gold = 500, /datum/material/silver = 500, /datum/material/glass = 500) + materials = list(/datum/material/gold = 2000, /datum/material/silver = 1000, /datum/material/glass = 1000) build_path = /obj/item/reagent_containers/glass/bottle/synthjuice category = list("initial", "Medical") diff --git a/icons/fallout/clothing/suits_utility.dmi b/icons/fallout/clothing/suits_utility.dmi index 33791109f49..a502c6fa28d 100644 Binary files a/icons/fallout/clothing/suits_utility.dmi and b/icons/fallout/clothing/suits_utility.dmi differ diff --git a/icons/fallout/onmob/clothes/suit_utility.dmi b/icons/fallout/onmob/clothes/suit_utility.dmi index 611fceaa7bf..b840164e658 100644 Binary files a/icons/fallout/onmob/clothes/suit_utility.dmi and b/icons/fallout/onmob/clothes/suit_utility.dmi differ