diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index b1a672da775..a5d254abfdd 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -75,6 +75,8 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list( /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"), /obj/vehicle/ridden/motorbike = list(CAT_MARINE, "Bike", 30, "blue"), /obj/item/sidecar = list(CAT_MARINE, "Bike sidecar", 8, "blue"), + /obj/item/ammo_magazine/rifle/ar21/extended = list(CAT_MARINE, "AR-21 extended magazine", 14, "blue"), + /obj/item/storage/briefcase/standard_magnum = list(CAT_MARINE, "R-76 crate", 22, "blue"), )) GLOBAL_LIST_INIT(robot_gear_listed_products, list( @@ -207,6 +209,8 @@ GLOBAL_LIST_INIT(leader_gear_listed_products, list( /obj/item/storage/holster/belt/revolver/mateba/full = list(CAT_LEDSUP, "Mateba Autorevolver belt", 10, "red"), /obj/item/ammo_magazine/revolver/mateba = list(CAT_LEDSUP, "Mateba magazine", 2, "orange2"), /obj/item/ammo_magazine/packet/mateba = list(CAT_LEDSUP, "Mateba packet", 3, "orange2"), + /obj/item/ammo_magazine/rifle/ar21/extended = list(CAT_LEDSUP, "AR-21 extended magazine", 3, "orange2"), + /obj/item/storage/briefcase/standard_magnum = list(CAT_LEDSUP, "R-76 crate", 10, "orange2"), /obj/item/storage/holster/backholster/rpg/full = list(CAT_LEDSUP, "RL-160 Recoilless rifle kit", 15, "red"), /obj/item/ammo_magazine/rocket/recoilless = list(CAT_LEDSUP, "RL-160 RR HE shell", 2, "orange2"), /obj/item/ammo_magazine/rocket/recoilless/light = list(CAT_LEDSUP, "RL-160 RR LE shell", 2, "orange2"), @@ -270,6 +274,8 @@ GLOBAL_LIST_INIT(commander_gear_listed_products, list( /obj/item/ammo_magazine/flamer_tank/large = list(CAT_FCSUP, "FL-84 normal fuel tank", 5, "orange2"), /obj/item/ammo_magazine/flamer_tank/large/X = list(CAT_FCSUP, "FL-84 X-fuel tank", 15, "orange2"), /obj/item/weapon/gun/energy/lasgun/lasrifle/xray = list(CAT_FCSUP, "TE-X Laser Rifle", 23, "red"), + /obj/item/ammo_magazine/rifle/ar21/extended = list(CAT_FCSUP, "AR-21 extended magazine", 3, "red"), + /obj/item/storage/briefcase/standard_magnum = list(CAT_FCSUP, "R-76 crate", 10, "red"), /obj/item/weapon/gun/rifle/railgun = list(CAT_FCSUP, "SR-220 Railgun", 23, "red"), /obj/item/ammo_magazine/railgun = list(CAT_FCSUP, "SR-220 Railgun APDS round", 2, "orange2"), /obj/item/ammo_magazine/railgun/hvap = list(CAT_FCSUP, "SR-220 Railgun HVAP round", 3, "orange2"), diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index f9e46e92edf..b1b17274400 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -224,7 +224,7 @@ SUBSYSTEM_DEF(persistence) /obj/item/ammo_magazine/rifle/m41a = -1, /obj/item/weapon/gun/rifle/type71/seasonal = -1, /obj/item/ammo_magazine/rifle/type71 = -1, - /obj/item/ammo_magazine/packet/pwarsaw = -1, + /obj/item/ammo_magazine/packet/groza = -1, /obj/item/weapon/gun/rifle/alf_machinecarbine = -1, /obj/item/ammo_magazine/rifle/alf_machinecarbine = -1, ) @@ -235,7 +235,7 @@ SUBSYSTEM_DEF(persistence) item_list = list( /obj/item/weapon/gun/rifle/mpi_km= -1, /obj/item/ammo_magazine/rifle/mpi_km/plum = -1, - /obj/item/ammo_magazine/packet/pwarsaw = -1, + /obj/item/ammo_magazine/packet/groza = -1, /obj/item/weapon/gun/rifle/m16 = -1, /obj/item/ammo_magazine/rifle/m16 = -1, /obj/item/ammo_magazine/packet/pnato = -1, diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index 78b42fa6227..84880bac420 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -43,6 +43,16 @@ new /obj/item/ammo_magazine/revolver/standard_magnum(src) new /obj/item/ammo_magazine/revolver/standard_magnum(src) new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) /obj/item/storage/briefcase/standard_magnum/silver/Initialize(mapload) . = ..() @@ -55,6 +65,16 @@ new /obj/item/ammo_magazine/revolver/standard_magnum(src) new /obj/item/ammo_magazine/revolver/standard_magnum(src) new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) /obj/item/storage/briefcase/standard_magnum/nickle/Initialize(mapload) . = ..() @@ -67,3 +87,13 @@ new /obj/item/ammo_magazine/revolver/standard_magnum(src) new /obj/item/ammo_magazine/revolver/standard_magnum(src) new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) + new /obj/item/ammo_magazine/revolver/standard_magnum(src) diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm index fb163a6a7ea..5caf0a46174 100644 --- a/code/game/objects/machinery/vending/marine_vending.dm +++ b/code/game/objects/machinery/vending/marine_vending.dm @@ -23,6 +23,10 @@ /obj/item/ammo_magazine/rifle/type71 = -1, /obj/item/ammo_magazine/rifle/type71/ap = -1, /obj/item/ammo_magazine/rifle/type71/hp = -1, + /obj/item/weapon/gun/rifle/ar21 = -1, + /obj/item/ammo_magazine/rifle/ar21 = -1, + /obj/item/ammo_magazine/rifle/ar21/ap = -1, + /obj/item/ammo_magazine/rifle/ar21/hp = -1, ), "SMGs" = list( /obj/item/weapon/gun/smg/vector = -1, @@ -179,6 +183,9 @@ /obj/item/ammo_magazine/packet/p10x24mm = -1, /obj/item/ammo_magazine/packet/p10x24mm/ap = -1, /obj/item/ammo_magazine/packet/p10x24mm/hp = -1, + /obj/item/ammo_magazine/packet/groza = -1, + /obj/item/ammo_magazine/packet/groza/ap = -1, + /obj/item/ammo_magazine/packet/groza/hp = -1, /obj/item/ammo_magazine/packet/p10x25mm = -1, /obj/item/ammo_magazine/packet/p10x26mm = -1, /obj/item/ammo_magazine/packet/p10x27mm = -1, @@ -238,6 +245,10 @@ /obj/item/ammo_magazine/rifle/type71 = -1, /obj/item/ammo_magazine/rifle/type71/ap = -1, /obj/item/ammo_magazine/rifle/type71/hp = -1, + /obj/item/weapon/gun/rifle/ar21 = -1, + /obj/item/ammo_magazine/rifle/ar21 = -1, + /obj/item/ammo_magazine/rifle/ar21/ap = -1, + /obj/item/ammo_magazine/rifle/ar21/hp = -1, ), "SMGs" = list( /obj/item/weapon/gun/smg/vector = -1, @@ -378,6 +389,9 @@ /obj/item/ammo_magazine/packet/t500/slavs = -1, /obj/item/ammo_magazine/packet/p10x20mm = -1, /obj/item/ammo_magazine/packet/p10x24mm = -1, + /obj/item/ammo_magazine/packet/groza = -1, + /obj/item/ammo_magazine/packet/groza/ap = -1, + /obj/item/ammo_magazine/packet/groza/hp = -1, /obj/item/ammo_magazine/packet/p10x25mm = -1, /obj/item/ammo_magazine/packet/p10x26mm = -1, /obj/item/ammo_magazine/packet/p10x27mm = -1, @@ -437,6 +451,10 @@ /obj/item/ammo_magazine/rifle/type71 = -1, /obj/item/ammo_magazine/rifle/type71/ap = -1, /obj/item/ammo_magazine/rifle/type71/hp = -1, + /obj/item/weapon/gun/rifle/ar21 = -1, + /obj/item/ammo_magazine/rifle/ar21 = -1, + /obj/item/ammo_magazine/rifle/ar21/ap = -1, + /obj/item/ammo_magazine/rifle/ar21/hp = -1, ), "Energy Weapons" = list( /obj/item/cell/lasgun/lasrifle = -1, @@ -622,6 +640,9 @@ /obj/item/ammo_magazine/packet/p10x24mm/ap = -1, /obj/item/ammo_magazine/packet/p10x24mm/hp = -1, /obj/item/ammo_magazine/packet/p10x24mm/incendiary = -1, + /obj/item/ammo_magazine/packet/groza = -1, + /obj/item/ammo_magazine/packet/groza/ap = -1, + /obj/item/ammo_magazine/packet/groza/hp = -1, /obj/item/ammo_magazine/packet/p10x25mm = -1, /obj/item/ammo_magazine/packet/p10x25mm/ap = -1, /obj/item/ammo_magazine/packet/p10x25mm/hp = -1, @@ -1517,12 +1538,9 @@ /obj/item/armor_module/module/tyr_extra_armor = -1, /obj/item/armor_module/module/tyr_head = -1, /obj/item/attachable/shoulder_mount = -1, -/* RU TGMC EDIT /obj/item/armor_module/module/mimir_environment_protection = -1, /obj/item/armor_module/module/mimir_environment_protection/mimir_helmet = -1, -RU TGMC EDIT*/ /obj/item/armor_module/module/better_shoulder_lamp = -1, - /obj/item/armor_module/module/hlin_explosive_armor = -1, /obj/item/attachable/heatlens = -1, /obj/item/storage/backpack/lightpack = -1, /obj/item/clothing/suit/storage/marine/riot = -1, @@ -1593,7 +1611,7 @@ RU TGMC EDIT*/ /obj/item/weapon/gun/shotgun/pump/cmb = -1, /obj/item/weapon/gun/rifle/mpi_km = -1, /obj/item/ammo_magazine/rifle/mpi_km/plum = -1, - /obj/item/ammo_magazine/packet/pwarsaw = -1, + /obj/item/ammo_magazine/packet/groza = -1, /obj/item/weapon/gun/rifle/m16 = -1, /obj/item/ammo_magazine/rifle/m16 = -1, /obj/item/ammo_magazine/packet/pnato = -1, diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index 2b240298aef..d7cece893dd 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -166,9 +166,8 @@ icon = 'icons/mob/modular/modular_armor_modules.dmi' icon_state = "mod_ff_head" item_state = "mod_ff_head_a" - soft_armor = list(MELEE = 10, BULLET = 60, LASER = 60, ENERGY = 10, BOMB = 10, BIO = 10, FIRE = 10, ACID = 10) + soft_armor = list(MELEE = 0, BULLET = 40, LASER = 40, ENERGY = 0, BOMB = 40, BIO = 0, FIRE = 0, ACID = 0) slot = ATTACHMENT_SLOT_HEAD_MODULE - slowdown = 0.6 /** * Environment protection module @@ -253,8 +252,8 @@ icon = 'icons/mob/modular/modular_armor_modules.dmi' icon_state = "mod_ff" item_state = "mod_ff_a" - soft_armor = list(MELEE = 10, BULLET = 60, LASER = 60, ENERGY = 10, BOMB = 10, BIO = 10, FIRE = 10, ACID = 10) - slowdown = 1.0 + soft_armor = list(MELEE = 0, BULLET = 40, LASER = 40, ENERGY = 0, BOMB = 40, BIO = 0, FIRE = 0, ACID = 0) + slowdown = 0.2 slot = ATTACHMENT_SLOT_MODULE /obj/item/armor_module/module/chemsystem diff --git a/code/modules/clothing/modular_armor/combat_robot.dm b/code/modules/clothing/modular_armor/combat_robot.dm index 3e3802e73ad..e15a93edc32 100644 --- a/code/modules/clothing/modular_armor/combat_robot.dm +++ b/code/modules/clothing/modular_armor/combat_robot.dm @@ -21,7 +21,6 @@ /obj/item/armor_module/module/fire_proof, /obj/item/armor_module/module/tyr_extra_armor, /obj/item/armor_module/module/tyr_extra_armor/mark1, - /obj/item/armor_module/module/hlin_explosive_armor, /obj/item/armor_module/module/ballistic_armor, /obj/item/armor_module/module/eshield, diff --git a/code/modules/clothing/modular_armor/jaeger.dm b/code/modules/clothing/modular_armor/jaeger.dm index e8ac65526f3..d5cef2b57bf 100644 --- a/code/modules/clothing/modular_armor/jaeger.dm +++ b/code/modules/clothing/modular_armor/jaeger.dm @@ -19,7 +19,6 @@ /obj/item/armor_module/module/tyr_extra_armor/mark1, /obj/item/armor_module/module/mimir_environment_protection, /obj/item/armor_module/module/mimir_environment_protection/mark1, - /obj/item/armor_module/module/hlin_explosive_armor, /obj/item/armor_module/module/ballistic_armor, /obj/item/armor_module/module/chemsystem, /obj/item/armor_module/module/eshield, diff --git a/code/modules/clothing/modular_armor/modular.dm b/code/modules/clothing/modular_armor/modular.dm index 991b7dd0ae4..ac656e7bea4 100644 --- a/code/modules/clothing/modular_armor/modular.dm +++ b/code/modules/clothing/modular_armor/modular.dm @@ -113,7 +113,6 @@ /obj/item/armor_module/module/tyr_extra_armor/mark1, /obj/item/armor_module/module/mimir_environment_protection, /obj/item/armor_module/module/mimir_environment_protection/mark1, - /obj/item/armor_module/module/hlin_explosive_armor, /obj/item/armor_module/module/ballistic_armor, /obj/item/armor_module/module/chemsystem, /obj/item/armor_module/module/eshield, @@ -214,7 +213,6 @@ /obj/item/armor_module/module/tyr_extra_armor/mark1, /obj/item/armor_module/module/mimir_environment_protection, /obj/item/armor_module/module/mimir_environment_protection/mark1, - /obj/item/armor_module/module/hlin_explosive_armor, /obj/item/armor_module/module/ballistic_armor, /obj/item/armor_module/module/chemsystem, /obj/item/armor_module/module/eshield, @@ -264,7 +262,6 @@ /obj/item/armor_module/module/tyr_extra_armor/mark1, /obj/item/armor_module/module/mimir_environment_protection, /obj/item/armor_module/module/mimir_environment_protection/mark1, - /obj/item/armor_module/module/hlin_explosive_armor, /obj/item/armor_module/module/ballistic_armor, /obj/item/armor_module/module/chemsystem, /obj/item/armor_module/module/eshield, diff --git a/code/modules/clothing/modular_armor/som.dm b/code/modules/clothing/modular_armor/som.dm index d1aa7a80c98..1833532ddae 100644 --- a/code/modules/clothing/modular_armor/som.dm +++ b/code/modules/clothing/modular_armor/som.dm @@ -21,7 +21,6 @@ /obj/item/armor_module/module/fire_proof/som, /obj/item/armor_module/module/tyr_extra_armor/som, /obj/item/armor_module/module/mimir_environment_protection/som, - /obj/item/armor_module/module/hlin_explosive_armor, /obj/item/armor_module/module/eshield/som, /obj/item/armor_module/storage/general, /obj/item/armor_module/storage/ammo_mag, @@ -124,7 +123,6 @@ /obj/item/armor_module/module/valkyrie_autodoc/som, /obj/item/armor_module/module/fire_proof/som, /obj/item/armor_module/module/mimir_environment_protection/som, - /obj/item/armor_module/module/hlin_explosive_armor, /obj/item/armor_module/module/eshield/som, /obj/item/armor_module/storage/general, /obj/item/armor_module/storage/ammo_mag, diff --git a/code/modules/clothing/modular_armor/style_line.dm b/code/modules/clothing/modular_armor/style_line.dm index 601214cf93a..87319f0c086 100644 --- a/code/modules/clothing/modular_armor/style_line.dm +++ b/code/modules/clothing/modular_armor/style_line.dm @@ -22,7 +22,6 @@ /obj/item/armor_module/module/tyr_extra_armor/mark1, /obj/item/armor_module/module/mimir_environment_protection, /obj/item/armor_module/module/mimir_environment_protection/mark1, - /obj/item/armor_module/module/hlin_explosive_armor, /obj/item/armor_module/module/ballistic_armor, /obj/item/armor_module/module/chemsystem, /obj/item/armor_module/module/eshield, diff --git a/code/modules/clothing/modular_armor/xenonauten.dm b/code/modules/clothing/modular_armor/xenonauten.dm index 262a68927ce..7c22869979f 100644 --- a/code/modules/clothing/modular_armor/xenonauten.dm +++ b/code/modules/clothing/modular_armor/xenonauten.dm @@ -19,7 +19,6 @@ /obj/item/armor_module/module/tyr_extra_armor/mark1, /obj/item/armor_module/module/mimir_environment_protection, /obj/item/armor_module/module/mimir_environment_protection/mark1, - /obj/item/armor_module/module/hlin_explosive_armor, /obj/item/armor_module/module/ballistic_armor, /obj/item/armor_module/module/chemsystem, /obj/item/armor_module/module/eshield, diff --git a/code/modules/mob/living/carbon/xenomorph/charge_crush.dm b/code/modules/mob/living/carbon/xenomorph/charge_crush.dm index 788b36961bf..d1dc7ae9f10 100644 --- a/code/modules/mob/living/carbon/xenomorph/charge_crush.dm +++ b/code/modules/mob/living/carbon/xenomorph/charge_crush.dm @@ -269,7 +269,7 @@ if(precrush > 0) log_combat(charger, crushed_living, "xeno charged") //There is a chance to do enough damage here to gib certain mobs. Better update immediately. - crushed_living.apply_damage(precrush * 2, BRUTE, BODY_ZONE_CHEST, MELEE, updating_health = TRUE, penetration = 15) + crushed_living.apply_damage(precrush * 1.7, BRUTE, BODY_ZONE_CHEST, MELEE, updating_health = TRUE, penetration = 15) if(QDELETED(crushed_living)) charger.visible_message(span_danger("[charger] anihilates [preserved_name]!"), span_xenodanger("We anihilate [preserved_name]!")) diff --git a/code/modules/projectiles/guns/sentries.dm b/code/modules/projectiles/guns/sentries.dm index 20e74124dbf..cbcf2aa40ec 100644 --- a/code/modules/projectiles/guns/sentries.dm +++ b/code/modules/projectiles/guns/sentries.dm @@ -82,7 +82,7 @@ playsound(user, 'sound/misc/electronics_1.ogg', 50) icon_state = "upgradekit_open" - if(!do_after(user, 8 SECONDS, NONE, src, BUSY_ICON_ENERGY, prog_bar = null)) + if(!do_after(user, 4 SECONDS, NONE, src, BUSY_ICON_ENERGY, prog_bar = null)) icon_state = initial(icon_state) return @@ -125,7 +125,7 @@ icon_state = "sentry" turret_range = 8 - deploy_time = 6 SECONDS + deploy_time = 5 SECONDS max_shells = 500 fire_delay = 0.25 SECONDS @@ -351,7 +351,7 @@ fire_sound = 'sound/items/turrets/turret_sniper.ogg' turret_range = 14 - deploy_time = 10 SECONDS + deploy_time = 5 SECONDS max_shells = 75 fire_delay = 2 SECONDS diff --git a/code/modules/projectiles/magazines/misc.dm b/code/modules/projectiles/magazines/misc.dm index 55fcc97b954..680443c5fdf 100644 --- a/code/modules/projectiles/magazines/misc.dm +++ b/code/modules/projectiles/magazines/misc.dm @@ -32,7 +32,7 @@ current_rounds = 150 max_rounds = 150 -/obj/item/ammo_magazine/packet/pwarsaw +/obj/item/ammo_magazine/packet/groza name = "box of 7.62x39mm" desc = "A box containing 120 rounds of 7.62x39mm." caliber = CALIBER_762X39 @@ -41,6 +41,24 @@ current_rounds = 120 max_rounds = 120 +/obj/item/ammo_magazine/packet/groza/ap + name = "box of AP 7.62x39mm" + desc = "A box containing 120 AP rounds of 7.62x39mm." + caliber = CALIBER_762X39 + icon_state = "box_76239mm" + default_ammo = /datum/ammo/bullet/rifle/mpi_km/ap + current_rounds = 120 + max_rounds = 120 + +/obj/item/ammo_magazine/packet/groza/hp + name = "box of HP 7.62x39mm" + desc = "A box containing 120 HP rounds of 7.62x39mm." + caliber = CALIBER_762X39 + icon_state = "box_76239mm" + default_ammo = /datum/ammo/bullet/rifle/mpi_km/hp + current_rounds = 120 + max_rounds = 120 + /obj/item/ammo_magazine/packet/p10x265mm name = "box of 10x26.5mm" desc = "A box containing 100 rounds of 10x26.5mm caseless." diff --git a/code/modules/reqs/armor.dm b/code/modules/reqs/armor.dm index 088a6449080..7f9e35ce686 100644 --- a/code/modules/reqs/armor.dm +++ b/code/modules/reqs/armor.dm @@ -88,11 +88,6 @@ ) cost = 120 -/datum/supply_packs/armor/modular/attachments/hlin_bombimmune - name = "Hlin armor module" - contains = list(/obj/item/armor_module/module/hlin_explosive_armor) - cost = 120 - /datum/supply_packs/armor/modular/attachments/artemis_mark_two name = "Freyr Mark 2 helmet module" contains = list( diff --git a/code/modules/reqs/imports.dm b/code/modules/reqs/imports.dm index 5bc3105795f..25821a53b5d 100644 --- a/code/modules/reqs/imports.dm +++ b/code/modules/reqs/imports.dm @@ -142,11 +142,6 @@ contains = list(/obj/item/ammo_magazine/rifle/mpi_km/plum) cost = 3 -/datum/supply_packs/imports/mpi_km/ammo_packet - name = "7.62x39mm Ammo Box" - contains = list(/obj/item/ammo_magazine/packet/pwarsaw) - cost = 15 - /datum/supply_packs/imports/mkh name = "MKH-98 Storm Rifle" contains = list(/obj/item/weapon/gun/rifle/mkh) diff --git a/code/modules/vehicles/armored/__armored.dm b/code/modules/vehicles/armored/__armored.dm index 979639ba9cd..eea9bddae48 100644 --- a/code/modules/vehicles/armored/__armored.dm +++ b/code/modules/vehicles/armored/__armored.dm @@ -538,7 +538,8 @@ /obj/vehicle/sealed/armored/welder_act(mob/living/user, obj/item/I) - return welder_repair_act(user, I, 50, 5 SECONDS, 0, SKILL_ENGINEER_METAL, 5, 2 SECONDS) + var/fumbling_time = 5 SECONDS - 1 SECONDS * user.skills.getRating(SKILL_ENGINEER) + return welder_repair_act(user, I, 5 SECONDS, fumbling_time, 0, SKILL_ENGINEER_METAL, 5, 2 SECONDS) /obj/vehicle/sealed/armored/crowbar_act(mob/living/user, obj/item/I) . = ..() diff --git a/code/modules/vehicles/motorbike.dm b/code/modules/vehicles/motorbike.dm index 0dc47785e2b..003b9fc88af 100644 --- a/code/modules/vehicles/motorbike.dm +++ b/code/modules/vehicles/motorbike.dm @@ -59,7 +59,8 @@ return ..() /obj/vehicle/ridden/motorbike/welder_act(mob/living/user, obj/item/I) - return welder_repair_act(user, I, 10, 2 SECONDS, fuel_req = 1) + var/fumbling_time = 5 SECONDS - 1 SECONDS * user.skills.getRating(SKILL_ENGINEER) + return welder_repair_act(user, I, 1 SECONDS, fumbling_time, fuel_req = 1) /obj/vehicle/ridden/motorbike/relaymove(mob/living/user, direction) if(fuel_count <= 0)