diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index 96d6448fd2..c919899da9 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -213,7 +213,7 @@ desc = "A pair of green arm pads reinforced with armor plating. Attaches to a plate carrier." icon_state = "armguards_green" armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) - + /obj/item/clothing/accessory/armor/armguards/merc name = "heavy arm guards" desc = "A pair of red-trimmed black arm pads reinforced with heavy armor plating. Attaches to a plate carrier." @@ -435,4 +435,4 @@ /obj/item/clothing/accessory/armor/helmcover/saare name = "\improper SAARE helmet cover" desc = "A fabric cover for armored helmets. This one has SAARE's colors." - icon_state = "helmcover_saare" \ No newline at end of file + icon_state = "helmcover_saare" diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index b7c170b80f..14bac95bf3 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -54,7 +54,9 @@ EQUIPMENT("Defense Equipment - Plasteel Machete", /obj/item/weapon/material/knife/machete, 50), EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked, 100), EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/ward, 150), - EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 750), + EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 400), //CHOMPEDIT + EQUIPMENT("Defense Equipment - Frontier Phaser", /obj/item/weapon/gun/energy/locked/frontier, 150), //CHOMPADD + EQUIPMENT("Defense Equipment - Holdout Phaser", /obj/item/weapon/gun/energy/locked/frontier/holdout, 100), //CHOMPADD EQUIPMENT("Hybrid Equipment - Proto-Kinetic Dagger", /obj/item/weapon/kinetic_crusher/machete/dagger, 75), EQUIPMENT("Hybrid Equipment - Proto-Kinetic Machete", /obj/item/weapon/kinetic_crusher/machete, 250), EQUIPMENT("Fishing Net", /obj/item/weapon/material/fishing_net, 50), @@ -67,12 +69,20 @@ EQUIPMENT("Mini-Translocator", /obj/item/device/perfect_tele/one_beacon, 120), EQUIPMENT("Survey Tools - Mapping Unit", /obj/item/device/mapping_unit, 150), EQUIPMENT("Survey Tools - Mapping Beacon", /obj/item/device/holomap_beacon, 25), + EQUIPMENT("Survey Tools - Advanced Cataloguer", /obj/item/device/cataloguer/advanced, 300), //CHOMPADD EQUIPMENT("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 75), EQUIPMENT("Survival Equipment - Glowstick", /obj/item/device/flashlight/glowstick, 5), EQUIPMENT("Survival Equipment - Flare", /obj/item/device/flashlight/flare, 5), EQUIPMENT("Survival Equipment - Radioisotope Glowstick", /obj/item/device/flashlight/glowstick/radioisotope, 40), EQUIPMENT("Survival Equipment - Modular Explorer Suit", /obj/item/clothing/suit/armor/pcarrier/explorer, 200), EQUIPMENT("Survival Equipment - Armored Jumpsuit", /obj/item/clothing/under/explorer/armored, 200), + EQUIPMENT("Survival Equipment - Exploration Plate", /obj/item/clothing/accessory/armor/armorplate/explorer, 50), //CHOMPADD + EQUIPMENT("Survival Equipment - Exploration Arm Guards", /obj/item/clothing/accessory/armor/armguards/explorer, 50), //CHOMPADD + EQUIPMENT("Survival Equipment - Exploration Leg Guards", /obj/item/clothing/accessory/armor/legguards/explorer, 50), //CHOMPADD + EQUIPMENT("Survival Equipment - Exploration Riot shield", /obj/item/weapon/shield/riot/explorer, 75), //CHOMPADD + EQUIPMENT("Survival Equipment - Storage Pouch", /obj/item/clothing/accessory/storage/pouches/green, 10), //CHOMPADD + EQUIPMENT("Survival Equipment - Large Storage Pouch", /obj/item/clothing/accessory/storage/pouches/large/green, 25), //CHOMPADD + EQUIPMENT("Survival Equipment - Pathfinder Belt", /obj/item/weapon/storage/belt/explorer/pathfinder, 200), //CHOMPADD ) prize_list["Consumables"] = list( EQUIPMENT("1 Marker Beacon", /obj/item/stack/marker_beacon, 1), @@ -111,7 +121,6 @@ EQUIPMENT("Thalers - 100", /obj/item/weapon/spacecash/c100, 100), EQUIPMENT("Umbrella", /obj/item/weapon/melee/umbrella/random, 20), EQUIPMENT("UAV - Recon Skimmer", /obj/item/device/uav, 40), - ) //VOREStation Edit End