diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index 4d9eda9e2d04..8ab277badc91 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -20,7 +20,7 @@ icon_state = "gauss" damage = 30 //20 less than slugs. speed = 0.25 //sub-caliber + lighter = speed. (Smaller number = faster) - armour_penetration = 70 //Tis a solid-tungsten penetrator, what do you expect? + armour_penetration = 60 //Tis a solid-tungsten penetrator, what do you expect? wound_bonus = -3 //Had issues with massive wounding behind armor, thus... ricochets_max = 2 //Unlike slugs which tend to squish on impact, these are hard enough to bounce rarely. ricochet_chance = 90 diff --git a/monkestation/code/modules/blueshift/armaments/deforest_medical.dm b/monkestation/code/modules/blueshift/armaments/deforest_medical.dm index 6221f1ca7cc7..dd851bbd1492 100644 --- a/monkestation/code/modules/blueshift/armaments/deforest_medical.dm +++ b/monkestation/code/modules/blueshift/armaments/deforest_medical.dm @@ -150,11 +150,6 @@ item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/synalvipitol contraband = TRUE -/datum/armament_entry/company_import/deforest/medpens_stim/twitch - item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/twitch - cost = PAYCHECK_COMMAND * 3 - contraband = TRUE - /datum/armament_entry/company_import/deforest/medpens_stim/demoneye item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/demoneye cost = PAYCHECK_COMMAND * 3 @@ -181,27 +176,10 @@ item_type = /obj/item/surgery_tray cost = PAYCHECK_COMMAND -/datum/armament_entry/company_import/deforest/equipment/advanced_health_analyer - item_type = /obj/item/healthanalyzer/advanced - cost = PAYCHECK_COMMAND * 3 - /datum/armament_entry/company_import/deforest/equipment/penlite_defib_mount item_type = /obj/item/wallframe/defib_mount/charging cost = PAYCHECK_CREW * 3 -/datum/armament_entry/company_import/deforest/equipment/advanced_scalpel - item_type = /obj/item/scalpel/advanced - cost = PAYCHECK_COMMAND * 3 - -/datum/armament_entry/company_import/deforest/equipment/advanced_retractor - item_type = /obj/item/retractor/advanced - cost = PAYCHECK_COMMAND * 3 - -/datum/armament_entry/company_import/deforest/equipment/advanced_cautery - item_type = /obj/item/cautery/advanced - cost = PAYCHECK_COMMAND * 3 - - /datum/armament_entry/company_import/deforest/equipment/medstation item_type = /obj/item/wallframe/frontier_medstation cost = PAYCHECK_COMMAND * 5 @@ -217,10 +195,6 @@ item_type = /obj/item/nif_repair_kit cost = PAYCHECK_COMMAND * 2 -/datum/armament_entry/company_import/deforest/cyber_implants/razorwire - name = "Razorwire Spool Implant" - item_type = /obj/item/organ/internal/cyberimp/arm/item_set/razorwire - cost = CARGO_CRATE_VALUE * 4 // Modsuit Modules from the medical category, here instead of in Nakamura because nobody buys from this company /datum/armament_entry/company_import/deforest/medical_modules diff --git a/monkestation/code/modules/blueshift/armaments/microstar.dm b/monkestation/code/modules/blueshift/armaments/microstar.dm index 47421531276f..d631fb39c2ba 100644 --- a/monkestation/code/modules/blueshift/armaments/microstar.dm +++ b/monkestation/code/modules/blueshift/armaments/microstar.dm @@ -41,21 +41,3 @@ /datum/armament_entry/company_import/microstar/basic_energy_long_weapons/mod_laser_large item_type = /obj/item/gun/energy/modular_laser_rifle cost = PAYCHECK_COMMAND * 8 - -// More expensive, unique energy weapons -/datum/armament_entry/company_import/microstar/experimental_energy - subcategory = "Experimental Energy Weapons" - cost = PAYCHECK_COMMAND * 6 - restricted = TRUE - -/datum/armament_entry/company_import/microstar/experimental_energy/hellfire - item_type = /obj/item/gun/energy/laser/hellgun - -/datum/armament_entry/company_import/microstar/experimental_energy/ion_carbine - item_type = /obj/item/gun/energy/ionrifle/carbine - -/datum/armament_entry/company_import/microstar/experimental_energy/xray_gun - item_type = /obj/item/gun/energy/xray - -/datum/armament_entry/company_import/microstar/experimental_energy/tesla_cannon - item_type = /obj/item/gun/energy/tesla_cannon diff --git a/monkestation/code/modules/blueshift/armaments/nakamura.dm b/monkestation/code/modules/blueshift/armaments/nakamura.dm index d73bff7e4d7e..d6e8050588ab 100644 --- a/monkestation/code/modules/blueshift/armaments/nakamura.dm +++ b/monkestation/code/modules/blueshift/armaments/nakamura.dm @@ -75,10 +75,6 @@ item_type = /obj/item/mod/module/rad_protection cost = PAYCHECK_CREW -/datum/armament_entry/company_import/nakamura_modsuits/protection_modules/emp_shield - item_type = /obj/item/mod/module/emp_shield - cost = PAYCHECK_CREW - /datum/armament_entry/company_import/nakamura_modsuits/protection_modules/armor_plates item_type = /obj/item/mod/module/armor_booster/retractplates cost = PAYCHECK_COMMAND * 3 @@ -147,10 +143,6 @@ item_type = /obj/item/mod/module/pathfinder cost = PAYCHECK_CREW -/datum/armament_entry/company_import/nakamura_modsuits/mobility_modules/disposals - item_type = /obj/item/mod/module/disposal_connector - cost = PAYCHECK_CREW - /datum/armament_entry/company_import/nakamura_modsuits/mobility_modules/sphere item_type = /obj/item/mod/module/sphere_transform cost = PAYCHECK_COMMAND * 2 @@ -190,15 +182,3 @@ /datum/armament_entry/company_import/nakamura_modsuits/novelty_modules/hat_stabilizer item_type = /obj/item/mod/module/hat_stabilizer cost = PAYCHECK_CREW - -/datum/armament_entry/company_import/nakamura_modsuits/novelty_modules/kinesis - item_type = /obj/item/mod/module/anomaly_locked/kinesis/prebuilt/locked - cost = PAYCHECK_COMMAND * 15 - -/datum/armament_entry/company_import/nakamura_modsuits/novelty_modules/antigrav - item_type = /obj/item/mod/module/anomaly_locked/antigrav/prebuilt/locked - cost = PAYCHECK_COMMAND * 15 - -/datum/armament_entry/company_import/nakamura_modsuits/novelty_modules/teleporter - item_type = /obj/item/mod/module/anomaly_locked/teleporter/prebuilt/locked - cost = PAYCHECK_COMMAND * 20 diff --git a/monkestation/code/modules/blueshift/items/ammo.dm b/monkestation/code/modules/blueshift/items/ammo.dm index 895ef1b5d3cd..5943bcd0f221 100644 --- a/monkestation/code/modules/blueshift/items/ammo.dm +++ b/monkestation/code/modules/blueshift/items/ammo.dm @@ -613,7 +613,7 @@ /obj/projectile/bullet/strilka310/ap name = ".310 armor-piercing bullet" damage = 50 - armour_penetration = 60 + armour_penetration = 50 // .585 Trappiste // High caliber round used in large pistols and revolvers @@ -696,8 +696,8 @@ weak_against_armour = TRUE - wound_bonus = 30 - bare_wound_bonus = 40 + wound_bonus = 15 + bare_wound_bonus = 5 /obj/item/ammo_box/c585trappiste/hollowpoint name = "ammo box (.585 Trappiste hollowhead)" @@ -728,9 +728,7 @@ /obj/projectile/bullet/c27_54cesarzowa name = ".27-54 Cesarzowa piercing bullet" damage = 15 - armour_penetration = 30 - wound_bonus = -30 - bare_wound_bonus = -10 + armour_penetration = 15 /obj/item/ammo_box/c27_54cesarzowa name = "ammo box (.27-54 Cesarzowa piercing)" @@ -854,8 +852,8 @@ speed = 0.4 damage = 50 armour_penetration = 50 - wound_bonus = 20 - bare_wound_bonus = 30 + wound_bonus = 10 + bare_wound_bonus = 10 demolition_mod = 1.8 /// How much damage we add to things that are weak to this bullet var/anti_materiel_damage_addition = 30 diff --git a/monkestation/code/modules/blueshift/items/company_guns.dm b/monkestation/code/modules/blueshift/items/company_guns.dm index 733fde05e763..17ee9aa997c2 100644 --- a/monkestation/code/modules/blueshift/items/company_guns.dm +++ b/monkestation/code/modules/blueshift/items/company_guns.dm @@ -422,15 +422,12 @@ suppressor_x_offset = 9 burst_size = 2 - fire_delay = 0.15 SECONDS + fire_delay = 0.5 SECONDS actions_types = list() - - // Because we're firing a lot of these really fast, we want a lot less wound chance - projectile_wound_bonus = -20 - spread = 12.5 + spread = 14.5 // Hope you didn't need to see anytime soon recoil = 2 - wield_recoil = 0.5 + wield_recoil = 1 /obj/item/gun/ballistic/automatic/xhihao_smg/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_XHIHAO) @@ -757,7 +754,6 @@ recoil = 1.5 wield_recoil = 0.5 spread = 2.5 - projectile_wound_bonus = -20 /obj/item/gun/ballistic/automatic/lanca/Initialize(mapload) . = ..() diff --git a/strings/nova/long_modular_laser.json b/strings/nova/long_modular_laser.json index a81c62b55b16..802a1733aab0 100644 --- a/strings/nova/long_modular_laser.json +++ b/strings/nova/long_modular_laser.json @@ -1,8 +1,6 @@ { "pickup": [ "Welcome back, @pick(operator).", - "Zǎo shàng hǎo.", - "Wǎn shàng hǎo.", "Charge systems operational, entering combat mode.", "@pick(operator), carp migrations have been reported in the sector.", "@pick(operator), having a pleasant day?", @@ -14,8 +12,6 @@ "putdown": [ "Understood, @pick(operator), entering sleep mode.", "Good night, @pick(operator).", - "Wǎn`ān, hǎo mèng.", - "Dàjiā ān.", "Good night.", "Entering sleep mode now.", "Entering recharge cycle." @@ -51,8 +47,7 @@ "Switching to rapid-pattern assault.", "Moving to dual-shot pattern.", "Moving to close-quarters burst doctrine, lethal.", - "@pick(operator), please tightly control my recoil pattern.", - "@pick(operator), please hold me firmly to ensure accuracy." + "@pick(operator), please hold on firmly to ensure accuracy." ], "sniper": [ diff --git a/strings/nova/short_modular_laser.json b/strings/nova/short_modular_laser.json index 592db9ada799..daf9c2e28239 100644 --- a/strings/nova/short_modular_laser.json +++ b/strings/nova/short_modular_laser.json @@ -1,24 +1,19 @@ { "pickup": [ - "Zǎo shàng hǎo.", - "Wǎn shàng hǎo.", + "GOOD MORNING VIETNAM!", "What's the operation today, ah?", "Let's get things started, heh-heh.", "I'm feeling good about our chances today.", - "Hey, clean my damn lens later.", - "Little tighter around the handguard, @pick(operator)" + "Hey, clean my damn lens later." ], "putdown": [ - "...you'll hold me again soon, right? Right?", + "Michael... Don't leave me here", "Don't you DARE leave me here!", - "Tch! Whatever... You'll come crawling back to point me around later.", - "Dàjiā ān.", "Good night.", "Entering sleep mode now.", "Entering recharge cycle.", - "Yeah, yeah... entering recharge cycle...", - "Qù nǐ mā... never mind, entering sleep mode." + "Yeah, yeah... entering recharge cycle..." ], "worn": [ @@ -26,17 +21,10 @@ "Lightweight, sold with a few backup magslings, what's not to love?", "I can't see anything in front of you, this sucks.", "I can't see shit from this angle...", - "We're going somewhere with this, right?", - "Don't fall over on top of me, okay?", - "Pretty cushy ride back here...", - "I could get used to this.", - "I can't see sh- ah, wait, maybe it's not so bad back here." + "We're going somewhere with this, right?" ], "lowcharge": [ - "Wǒ tài nán le...", - "Mā de...", - "Tā mā de...", "I'm really drowsy here, pull back, won't you?", "I'm running on fumes here, boss...", "Outta charge, gotta rest...", @@ -56,7 +44,6 @@ "combatmode": [ "I've been waaaiiitiiiing!", - "I was wondering how long you were planning on depriving me, @pick(operator).", "Come on, come at me!", "It's your lucky day!", "Now the fun begins!", @@ -64,8 +51,6 @@ ], "emp": [ - "Tāmāde! Tāmāde!", - "Qì sǐ wǒle!", "ELECTROM-", "ELECTROMAGNETIC PULSE DETECTED, DISCHARGING-", "ELECTROMAGNETIC PULSE, IT'S DISCHARGING MY BATTERY!", @@ -73,8 +58,7 @@ "GO KILL THEM!", "KILL THEM! KILL THEM! PUT THE SIGHTS ON THEM AND KILL THEM!", "KILL THEM, KILL THEM!", - "I DON'T NEED CHARGE FOR BLADE MODE, PUT IT IN THEM AND TWIST!", - "Qù nǐ mā de ba!" + "I DON'T NEED CHARGE FOR BLADE MODE, PUT IT IN THEM AND TWIST!" ], "incinerate": [ @@ -87,11 +71,9 @@ ], "blade": [ - "Extending blade; up close and personal? I like that.", "Extending blade; wipe me off after we're finished.", "Extending blade, stab stab stab!", "Swing the sword, swing the sword!", - "CQC mode initiated, stick me in there deep!", "Eviscerate!", "Show me your motivation...", "I'll cut them in two!", @@ -121,12 +103,12 @@ "Fabricating 'Balrog' energy flares; can you feel the fire?", "Firestarter, twisted firestarter!", "Apocalyptic meltdown!", - "Incendiary weapons are banned in numerous sectors; makes it kind of risqué..", + "Incendiary weapons are banned in numerous sectors!", "Dragon breath!" ], "shotgun": [ - "Focusing lens, one shot, one kill!", + "Focusing lens, one shot, ten kills!", "Focusing lens, let's go all the way through.", "Focusing lens, aim for the head!", "Let me show you what a real diffusion lens looks like...",