diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index ed6185f43ec..dce9a1cafa9 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -83,16 +83,9 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list( GLOBAL_LIST_INIT(robot_gear_listed_products, list( /obj/item/tool/surgery/solderingtool = list(CAT_ESS, "Essential Soldering Tool", 0, "white"), - /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle = list(CAT_ROBOT, "Terra Experimental laser rifle", 15, "red"), - /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_sniper = list(CAT_ROBOT, "Terra Experimental laser sniper rifle", 20, "red"), - /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine = list(CAT_ROBOT, "Terra Experimental laser carbine", 15, "red"), - /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_mlaser = list(CAT_ROBOT, "Terra Experimental laser machine gun", 20, "red"), - /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol = list(CAT_ROBOT, "Terra Experimental laser pistol", 10, "red"), - /obj/item/weapon/gun/energy/lasgun/lasrifle/tesla = list(CAT_ROBOT, "Terra Experimental tesla shock rifle", 25, "red"), /obj/item/cell/lasgun/lasrifle/recharger = list(CAT_ROBOT, "Terra Experimental recharger battery", 4, "orange2"), /obj/item/cell/lasgun/volkite/powerpack/marine_back = list(CAT_ROBOT, "Terra Experimental powerback", 20, "orange2"), /obj/item/tool/handheld_charger = list(CAT_ROBOT, "Hand-held cell charger", 5, "yellow"), - /obj/item/weapon/powerfist = list(CAT_ROBOT, "Powerfist", 10, "red"), )) GLOBAL_LIST_INIT(engineer_gear_listed_products, list( diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm index f5b313947e8..f4f657eda03 100644 --- a/code/game/objects/machinery/vending/marine_vending.dm +++ b/code/game/objects/machinery/vending/marine_vending.dm @@ -32,13 +32,13 @@ /obj/item/ammo_magazine/rifle/ar21/ap = -1, /obj/item/ammo_magazine/rifle/ar21/hp = -1, ), - "Пистолеты-пулмёты" = list( + "Пистолеты-пулемёты" = list( /obj/item/weapon/gun/smg/vector = -1, /obj/item/ammo_magazine/smg/vector = -1, /obj/item/ammo_magazine/smg/vector/ap = -1, /obj/item/ammo_magazine/smg/vector/hp = -1, ), - "Снайперкие винтовки" = list( + "Снайперские винтовки" = list( /obj/item/weapon/gun/rifle/dmr37 = -1, /obj/item/ammo_magazine/rifle/dmr37 = -1, /obj/item/weapon/gun/rifle/sniper/antimaterial/sr127= -1, @@ -283,7 +283,7 @@ /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/tesla = -1, ), - "Снайперкие винтовки" = list( + "Снайперские винтовки" = list( /obj/item/weapon/gun/rifle/dmr37 = -1, /obj/item/ammo_magazine/rifle/dmr37 = -1, /obj/item/weapon/gun/rifle/sniper/antimaterial/sr127= -1, @@ -495,7 +495,7 @@ /obj/item/ammo_magazine/smg/vector/hp = -1, /obj/item/ammo_magazine/smg/vector/incendiary = -1, ), - "Снайперкие винтовки" = list( + "Снайперские винтовки" = list( /obj/item/weapon/gun/rifle/dmr37 = -1, /obj/item/ammo_magazine/rifle/dmr37 = -1, /obj/item/weapon/gun/rifle/sniper/antimaterial/sr127= -1,