From 8456caa095f1a71c727132cc029485c989f8fd0b Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Tue, 2 Aug 2022 13:28:01 -0700 Subject: [PATCH 01/10] Makes untied shoes take lacing difficulty into account --- code/modules/events/untie_shoes.dm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/code/modules/events/untie_shoes.dm b/code/modules/events/untie_shoes.dm index 92e53b4eab..19e238154a 100644 --- a/code/modules/events/untie_shoes.dm +++ b/code/modules/events/untie_shoes.dm @@ -9,7 +9,7 @@ fakeable = FALSE /datum/round_event/untied_shoes/start() - var/iterations = 1 + var/budget = rand(5 SECONDS,20 SECONDS) for(var/mob/living/carbon/C in shuffle(GLOB.alive_mob_list)) if(!C.client) continue @@ -17,12 +17,8 @@ continue if (HAS_TRAIT(C,TRAIT_EXEMPT_HEALTH_EVENTS)) continue - if(!C.shoes || !C.shoes.can_be_tied || C.shoes.tied != SHOES_TIED) + if(!C.shoes || !C.shoes.can_be_tied || C.shoes.tied != SHOES_TIED || C.shoes.lace_time > budget) continue - if(prob(5)) - C.shoes.adjust_laces(SHOES_KNOTTED) - else - C.shoes.adjust_laces(SHOES_UNTIED) - iterations++ - if(prob(100/iterations)) + budget -= C.shoes.lace_time + if(budget < 5 SECONDS) return From db06dbcd58b56eac29fa527ee09eef9c8c96ee99 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Tue, 2 Aug 2022 16:44:05 -0700 Subject: [PATCH 02/10] forgot to commit and push --- code/modules/clothing/shoes/miscellaneous.dm | 1 + code/modules/events/untie_shoes.dm | 2 ++ 2 files changed, 3 insertions(+) diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 06c2c19ad8..cdf5512fc6 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -213,6 +213,7 @@ heat_protection = FEET|LEGS max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF + lace_time = 10 SECONDS /obj/item/clothing/shoes/cult name = "\improper Nar'Sien invoker boots" diff --git a/code/modules/events/untie_shoes.dm b/code/modules/events/untie_shoes.dm index 19e238154a..70d0dc650d 100644 --- a/code/modules/events/untie_shoes.dm +++ b/code/modules/events/untie_shoes.dm @@ -19,6 +19,8 @@ continue if(!C.shoes || !C.shoes.can_be_tied || C.shoes.tied != SHOES_TIED || C.shoes.lace_time > budget) continue + if(!is_station_level(C.z) && prob(50)) + continue budget -= C.shoes.lace_time if(budget < 5 SECONDS) return From 0238d9fbe5e200ba3b5c08f58d58ed07284ef9a4 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Tue, 2 Aug 2022 21:50:56 -0700 Subject: [PATCH 03/10] make it actually do something lol --- code/modules/events/untie_shoes.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/events/untie_shoes.dm b/code/modules/events/untie_shoes.dm index 70d0dc650d..ddc97f261f 100644 --- a/code/modules/events/untie_shoes.dm +++ b/code/modules/events/untie_shoes.dm @@ -21,6 +21,11 @@ continue if(!is_station_level(C.z) && prob(50)) continue + if(prob(5) + C.shoes.adjust_laces(SHOES_KNOTTED) + budget -= C.shoes.lace_time // doubling up on the budget removal on purpose + else + C.shoes.adjust_laces(SHOES_UNTIED) budget -= C.shoes.lace_time if(budget < 5 SECONDS) return From 1fb60fbb31425e31fc13d3774c13a810fb88b78b Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Wed, 3 Aug 2022 14:04:40 +0800 Subject: [PATCH 04/10] linelimit is 1k --- tools/midi2piano/midi2piano.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/midi2piano/midi2piano.py b/tools/midi2piano/midi2piano.py index f4494801d3..ed01297b93 100644 --- a/tools/midi2piano/midi2piano.py +++ b/tools/midi2piano/midi2piano.py @@ -8,7 +8,7 @@ import easygui as egui import pyperclip as pclip LINE_LENGTH_LIM = 50 -LINES_LIMIT = 200 +LINES_LIMIT = 1000 TICK_LAG = 0.5 OVERALL_IMPORT_LIM = 2*LINE_LENGTH_LIM*LINES_LIMIT END_OF_LINE_CHAR = """ From cb87b004f1193c42429d3864b2d002255c9a8e35 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 2 Aug 2022 23:13:36 -0700 Subject: [PATCH 05/10] Update airlock.dm --- code/game/machinery/doors/airlock.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index ed62019824..84e7b93e1b 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1356,6 +1356,7 @@ /obj/machinery/door/airlock/proc/remove_electrify() secondsElectrified = NOT_ELECTRIFIED unelectrify_timerid = null + diag_hud_set_electrified() /obj/machinery/door/airlock/proc/set_electrified(seconds, mob/user) secondsElectrified = seconds From 8ab1a12ef725b296e6b5087b508973bcb8f2187b Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Tue, 2 Aug 2022 23:15:10 -0700 Subject: [PATCH 06/10] i forgot to compile?? --- code/modules/events/untie_shoes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/untie_shoes.dm b/code/modules/events/untie_shoes.dm index ddc97f261f..708a72f40b 100644 --- a/code/modules/events/untie_shoes.dm +++ b/code/modules/events/untie_shoes.dm @@ -21,7 +21,7 @@ continue if(!is_station_level(C.z) && prob(50)) continue - if(prob(5) + if(prob(5)) C.shoes.adjust_laces(SHOES_KNOTTED) budget -= C.shoes.lace_time // doubling up on the budget removal on purpose else From 2155a8bdce5530a587a74709ff322e2868eb2093 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 3 Aug 2022 06:11:04 -0500 Subject: [PATCH 07/10] funny ammo --- code/controllers/subsystem/traumas.dm | 2 +- code/modules/cargo/exports/weapons.dm | 2 +- .../projectiles/ammunition/ballistic/lmg.dm | 46 ++++++++----------- .../boxes_magazines/external/lmg.dm | 28 +++++------ .../projectiles/guns/ballistic/automatic.dm | 4 +- .../projectiles/projectile/bullets/lmg.dm | 26 +++++++---- code/modules/tcg/pack_nuclear.dm | 2 +- .../uplink/uplink_items/uplink_ammo.dm | 24 +++++----- .../uplink/uplink_items/uplink_dangerous.dm | 2 +- 9 files changed, 68 insertions(+), 68 deletions(-) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index edf10f89c4..7f1ece6937 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -169,7 +169,7 @@ SUBSYSTEM_DEF(traumas) /obj/structure/fluff/empty_sleeper/syndicate, /obj/item/implant/radio/syndicate, /obj/item/clothing/head/helmet/space/syndicate, /obj/machinery/nuclearbomb/syndicate, /obj/item/grenade/syndieminibomb, /obj/item/storage/backpack/duffelbag/syndie, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/gun/ballistic/automatic/shotgun/bulldog, /obj/item/gun/ballistic/automatic/c20r, /obj/item/gun/ballistic/automatic/m90, /obj/item/gun/ballistic/automatic/l6_saw, /obj/item/storage/belt/grenade/full, /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate, /obj/item/gun/energy/kinetic_accelerator/crossbow, /obj/item/melee/transforming/energy/sword/saber, /obj/item/dualsaber, /obj/item/melee/powerfist, /obj/item/storage/box/syndie_kit, /obj/item/grenade/spawnergrenade/manhacks, /obj/item/grenade/chem_grenade/bioterrorfoam, /obj/item/reagent_containers/spray/chemsprayer/bioterror, /obj/item/ammo_box/magazine/m10mm, - /obj/item/ammo_box/magazine/pistolm9mm, /obj/item/ammo_box/a357, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/mm195x129, /obj/item/antag_spawner/nuke_ops, /obj/vehicle/sealed/mecha/combat/gygax/dark, /obj/vehicle/sealed/mecha/combat/marauder/mauler, /obj/item/soap/syndie, /obj/item/gun/syringe/syndicate, /obj/item/cartridge/virus/syndicate, + /obj/item/ammo_box/magazine/pistolm9mm, /obj/item/ammo_box/a357, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/mm712x82, /obj/item/antag_spawner/nuke_ops, /obj/vehicle/sealed/mecha/combat/gygax/dark, /obj/vehicle/sealed/mecha/combat/marauder/mauler, /obj/item/soap/syndie, /obj/item/gun/syringe/syndicate, /obj/item/cartridge/virus/syndicate, /obj/item/cartridge/virus/frame, /obj/item/chameleon, /obj/item/storage/box/syndie_kit/cutouts, /obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/card/emag, /obj/item/storage/toolbox/syndicate, /obj/item/storage/book/bible/syndicate, /obj/item/encryptionkey/binary, /obj/item/encryptionkey/syndicate, /obj/item/aiModule/syndicate, /obj/item/clothing/shoes/magboots/syndie, /obj/item/powersink, /obj/item/sbeacondrop, /obj/item/sbeacondrop/bomb, /obj/item/syndicatedetonator, /obj/item/shield/energy, /obj/item/assault_pod, /obj/item/slimepotion/slime/sentience/nuclear, /obj/item/stack/telecrystal, /obj/item/jammer, /obj/item/codespeak_manual/unlimited, /obj/item/toy/cards/deck/syndicate, /obj/item/storage/secure/briefcase/syndie, /obj/item/storage/fancy/cigarettes/cigpack_syndicate, /obj/item/toy/syndicateballoon, /obj/item/clothing/gloves/fingerless/pugilist/rapid, /obj/item/paper/fluff/ruins/thederelict/syndie_mission, /obj/item/organ/cyberimp/eyes/hud/security/syndicate, /obj/item/clothing/head/HoS/syndicate, diff --git a/code/modules/cargo/exports/weapons.dm b/code/modules/cargo/exports/weapons.dm index 42cd1dccea..5f2146200b 100644 --- a/code/modules/cargo/exports/weapons.dm +++ b/code/modules/cargo/exports/weapons.dm @@ -332,7 +332,7 @@ /datum/export/weapon/l6sawammo cost = 60 unit_name = "L6 SAW ammo box" - export_types = list(/obj/item/ammo_box/magazine/mm195x129) + export_types = list(/obj/item/ammo_box/magazine/mm712x82) include_subtypes = TRUE /datum/export/weapon/rocket diff --git a/code/modules/projectiles/ammunition/ballistic/lmg.dm b/code/modules/projectiles/ammunition/ballistic/lmg.dm index bf8b4007bf..1c39a73f1f 100644 --- a/code/modules/projectiles/ammunition/ballistic/lmg.dm +++ b/code/modules/projectiles/ammunition/ballistic/lmg.dm @@ -1,36 +1,28 @@ -// 1.95x129mm (SAW) +// 7.12x82mm (SAW) -/obj/item/ammo_casing/mm195x129 - name = "1.95x129mm bullet casing" - desc = "A 1.95x129mm bullet casing." +/obj/item/ammo_casing/mm712x82 + name = "7.12x82mm bullet casing" + desc = "A 7.12x82mm bullet casing." icon_state = "762-casing" - caliber = "mm195129" - projectile_type = /obj/item/projectile/bullet/mm195x129 + caliber = "mm71282" + projectile_type = /obj/item/projectile/bullet/mm712x82 -/obj/item/ammo_casing/mm195x129/ap - name = "1.95x129mm armor-piercing bullet casing" - desc = "A 1.95x129mm bullet casing designed with a hardened-tipped core to help penetrate armored targets." - projectile_type = /obj/item/projectile/bullet/mm195x129_ap +/obj/item/ammo_casing/mm712x82/ap + name = "7.12x82mm armor-piercing bullet casing" + desc = "A 7.12x82mm bullet casing designed with a hardened-tipped core to help penetrate armored targets." + projectile_type = /obj/item/projectile/bullet/mm712x82_ap -/obj/item/ammo_casing/mm195x129/hollow - name = "1.95x129mm hollow-point bullet casing" - desc = "A 1.95x129mm bullet casing designed to cause more damage to unarmored targets." - projectile_type = /obj/item/projectile/bullet/mm195x129_hp +/obj/item/ammo_casing/mm712x82/hollow + name = "7.12x82mm hollow-point bullet casing" + desc = "A 7.12x82mm bullet casing designed to cause more damage to unarmored targets." + projectile_type = /obj/item/projectile/bullet/mm712x82_hp -/obj/item/ammo_casing/mm195x129/incen - name = "1.95x129mm incendiary bullet casing" - desc = "A 1.95x129mm bullet casing designed with a chemical-filled capsule on the tip that when bursted, reacts with the atmosphere to produce a fireball, engulfing the target in flames." - projectile_type = /obj/item/projectile/bullet/incendiary/mm195x129 +/obj/item/ammo_casing/mm712x82/incen + name = "7.12x82mm incendiary bullet casing" + desc = "A 7.12x82mm bullet casing designed with a chemical-filled capsule on the tip that when bursted, reacts with the atmosphere to produce a fireball, engulfing the target in flames." + projectile_type = /obj/item/projectile/bullet/incendiary/mm712x82 /obj/item/ammo_casing/mm712x82/match name = "7.12x82mm match bullet casing" desc = "A 7.12x82mm bullet casing manufactured to unfailingly high standards, you could pull off some cool trickshots with this." - projectile_type = /obj/item/projectile/bullet/mm712x82_match - -/obj/item/projectile/bullet/mm712x82_match - name = "7.12x82mm match bullet" - damage = 40 - ricochets_max = 2 - ricochet_chance = 60 - ricochet_auto_aim_range = 4 - ricochet_incidence_leeway = 35 + projectile_type = /obj/item/projectile/bullet/mm712x82/match diff --git a/code/modules/projectiles/boxes_magazines/external/lmg.dm b/code/modules/projectiles/boxes_magazines/external/lmg.dm index 95ba17c733..e8447950ce 100644 --- a/code/modules/projectiles/boxes_magazines/external/lmg.dm +++ b/code/modules/projectiles/boxes_magazines/external/lmg.dm @@ -1,23 +1,23 @@ -/obj/item/ammo_box/magazine/mm195x129 - name = "box magazine (1.95x129mm)" +/obj/item/ammo_box/magazine/mm712x82 + name = "box magazine (7.12x82mm)" icon_state = "a762-50" - ammo_type = /obj/item/ammo_casing/mm195x129 - caliber = "mm195129" + ammo_type = /obj/item/ammo_casing/mm712x82 + caliber = "mm71282" max_ammo = 50 -/obj/item/ammo_box/magazine/mm195x129/hollow - name = "box magazine (Hollow-Point 1.95x129mm)" - ammo_type = /obj/item/ammo_casing/mm195x129/hollow +/obj/item/ammo_box/magazine/mm712x82/hollow + name = "box magazine (Hollow-Point 7.12x82mm)" + ammo_type = /obj/item/ammo_casing/mm712x82/hollow -/obj/item/ammo_box/magazine/mm195x129/ap - name = "box magazine (Armor Penetrating 1.95x129mm)" - ammo_type = /obj/item/ammo_casing/mm195x129/ap +/obj/item/ammo_box/magazine/mm712x82/ap + name = "box magazine (Armor Penetrating 7.12x82mm)" + ammo_type = /obj/item/ammo_casing/mm712x82/ap -/obj/item/ammo_box/magazine/mm195x129/incen - name = "box magazine (Incendiary 1.95x129mm)" - ammo_type = /obj/item/ammo_casing/mm195x129/incen +/obj/item/ammo_box/magazine/mm712x82/incen + name = "box magazine (Incendiary 7.12x82mm)" + ammo_type = /obj/item/ammo_casing/mm712x82/incen -/obj/item/ammo_box/magazine/mm195x129/update_icon() +/obj/item/ammo_box/magazine/mm712x82/update_icon() ..() icon_state = "a762-[round(ammo_count(),10)]" diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index aa3ac20cb8..4b871d59b2 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -296,13 +296,13 @@ /obj/item/gun/ballistic/automatic/l6_saw name = "\improper L6 SAW" - desc = "A heavily modified 1.95x129mm light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation." + desc = "A heavily modified 7.12x82mm light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation." icon_state = "l6closed100" item_state = "l6closedmag" fire_sound = "sound/weapons/lmgshot.ogg" w_class = WEIGHT_CLASS_HUGE slot_flags = 0 - mag_type = /obj/item/ammo_box/magazine/mm195x129 + mag_type = /obj/item/ammo_box/magazine/mm712x82 weapon_weight = WEAPON_HEAVY var/cover_open = FALSE can_suppress = FALSE diff --git a/code/modules/projectiles/projectile/bullets/lmg.dm b/code/modules/projectiles/projectile/bullets/lmg.dm index e3eff6dcb0..177a98201c 100644 --- a/code/modules/projectiles/projectile/bullets/lmg.dm +++ b/code/modules/projectiles/projectile/bullets/lmg.dm @@ -21,22 +21,22 @@ /obj/item/projectile/bullet/syndicate_turret damage = 20 -// 1.95x129mm (SAW) +// 7.12x82mm (SAW) -/obj/item/projectile/bullet/mm195x129 - name = "1.95x129mm bullet" +/obj/item/projectile/bullet/mm712x82 + name = "7.12x82mm bullet" damage = 40 armour_penetration = 5 wound_bonus = -50 wound_falloff_tile = 0 -/obj/item/projectile/bullet/mm195x129_ap - name = "1.95x129mm armor-piercing bullet" +/obj/item/projectile/bullet/mm712x82_ap + name = "7.12x82mm armor-piercing bullet" damage = 40 armour_penetration = 75 -/obj/item/projectile/bullet/mm195x129_hp - name = "1.95x129mm hollow-point bullet" +/obj/item/projectile/bullet/mm712x82_hp + name = "7.12x82mm hollow-point bullet" damage = 50 armour_penetration = -60 sharpness = SHARP_EDGED @@ -44,7 +44,15 @@ bare_wound_bonus = 30 wound_falloff_tile = -8 -/obj/item/projectile/bullet/incendiary/mm195x129 - name = "1.95x129mm incendiary bullet" +/obj/item/projectile/bullet/incendiary/mm712x82 + name = "7.12x82mm incendiary bullet" damage = 20 fire_stacks = 3 + +/obj/item/projectile/bullet/mm712x82/match + name = "7.12x82mm match bullet" + damage = 40 + ricochets_max = 2 + ricochet_chance = 60 + ricochet_auto_aim_range = 4 + ricochet_incidence_leeway = 35 diff --git a/code/modules/tcg/pack_nuclear.dm b/code/modules/tcg/pack_nuclear.dm index 96ec174a4b..cb82c98571 100644 --- a/code/modules/tcg/pack_nuclear.dm +++ b/code/modules/tcg/pack_nuclear.dm @@ -59,7 +59,7 @@ /datum/tcg_card/pack_nuclear/l6saw name = "L6 Saw LMG" - desc = "A heavily modified 1.95x129mm light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation." + desc = "A heavily modified 7.12x82mm light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation." rules = "After equipped unit dies, this card goes to the bottom of draw deck" icon_state = "l6saw" diff --git a/code/modules/uplink/uplink_items/uplink_ammo.dm b/code/modules/uplink/uplink_items/uplink_ammo.dm index a1c96d1082..1ce8b7914a 100644 --- a/code/modules/uplink/uplink_items/uplink_ammo.dm +++ b/code/modules/uplink/uplink_items/uplink_ammo.dm @@ -209,29 +209,29 @@ purchasable_from = UPLINK_NUKE_OPS /datum/uplink_item/ammo/machinegun/basic - name = "1.95x129mm Box Magazine" - desc = "A 50-round magazine of 1.95x129mm ammunition for use with the L6 SAW. \ + name = "7.12x82mm Box Magazine" + desc = "A 50-round magazine of 7.12x82mm ammunition for use with the L6 SAW. \ By the time you need to use this, you'll already be standing on a pile of corpses" - item = /obj/item/ammo_box/magazine/mm195x129 + item = /obj/item/ammo_box/magazine/mm712x82 /datum/uplink_item/ammo/machinegun/ap - name = "1.95x129mm (Armor Penetrating) Box Magazine" - desc = "A 50-round magazine of 1.95x129mm ammunition for use in the L6 SAW; equipped with special properties \ + name = "7.12x82mm (Armor Penetrating) Box Magazine" + desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; equipped with special properties \ to puncture even the most durable armor." - item = /obj/item/ammo_box/magazine/mm195x129/ap + item = /obj/item/ammo_box/magazine/mm712x82/ap cost = 9 /datum/uplink_item/ammo/machinegun/hollow - name = "1.95x129mm (Hollow-Point) Box Magazine" - desc = "A 50-round magazine of 1.95x129mm ammunition for use in the L6 SAW; equipped with hollow-point tips to help \ + name = "7.12x82mm (Hollow-Point) Box Magazine" + desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; equipped with hollow-point tips to help \ with the unarmored masses of crew." - item = /obj/item/ammo_box/magazine/mm195x129/hollow + item = /obj/item/ammo_box/magazine/mm712x82/hollow /datum/uplink_item/ammo/machinegun/incen - name = "1.95x129mm (Incendiary) Box Magazine" - desc = "A 50-round magazine of 1.95x129mm ammunition for use in the L6 SAW; tipped with a special flammable \ + name = "7.12x82mm (Incendiary) Box Magazine" + desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; tipped with a special flammable \ mixture that'll ignite anyone struck by the bullet. Some men just want to watch the world burn." - item = /obj/item/ammo_box/magazine/mm195x129/incen + item = /obj/item/ammo_box/magazine/mm712x82/incen /datum/uplink_item/ammo/rocket purchasable_from = UPLINK_NUKE_OPS diff --git a/code/modules/uplink/uplink_items/uplink_dangerous.dm b/code/modules/uplink/uplink_items/uplink_dangerous.dm index dac426db2b..6bfe3f5bb8 100644 --- a/code/modules/uplink/uplink_items/uplink_dangerous.dm +++ b/code/modules/uplink/uplink_items/uplink_dangerous.dm @@ -213,7 +213,7 @@ /datum/uplink_item/dangerous/machinegun name = "L6 Squad Automatic Weapon" desc = "A fully-loaded Aussec Armoury belt-fed machine gun. \ - This deadly weapon has a massive 50-round magazine of devastating 1.95x129mm ammunition." + This deadly weapon has a massive 50-round magazine of devastating 7.12x82mm ammunition." item = /obj/item/gun/ballistic/automatic/l6_saw cost = 18 surplus = 0 From 3fbf1b6594e71090dcea6eab05ebd235344d91ed Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 4 Aug 2022 18:21:03 -0500 Subject: [PATCH 08/10] Automatic changelog generation for PR #15752 [ci skip] --- html/changelogs/AutoChangeLog-pr-15752.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15752.yml diff --git a/html/changelogs/AutoChangeLog-pr-15752.yml b/html/changelogs/AutoChangeLog-pr-15752.yml new file mode 100644 index 0000000000..18ed1f4d93 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15752.yml @@ -0,0 +1,4 @@ +author: "Hatterhat" +delete-after: True +changes: + - tweak: "The L6 Squad Automatic Weapon, as used by Syndicate nuclear operatives, now fires 7.12x82mm, with no change in ballistic performance. This has the side effect of making it now capable of utilizing match-grade ammunition, which some would think are mutually incompatible concepts." From 989f269717a0c135f692e91c1ef8fd3689d5d04b Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 4 Aug 2022 18:29:21 -0500 Subject: [PATCH 09/10] Automatic changelog generation for PR #15744 [ci skip] --- html/changelogs/AutoChangeLog-pr-15744.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15744.yml diff --git a/html/changelogs/AutoChangeLog-pr-15744.yml b/html/changelogs/AutoChangeLog-pr-15744.yml new file mode 100644 index 0000000000..3d6aee8e74 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15744.yml @@ -0,0 +1,5 @@ +author: "Putnam3145" +delete-after: True +changes: + - tweak: "Untied shoelaces probabilities rework" + - balance: "Miner boots are slightly harder to tie/untie now" From d3940436d4691d2896877e930789684f7a2886e8 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 5 Aug 2022 01:01:28 +0000 Subject: [PATCH 10/10] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15744.yml | 5 ----- html/changelogs/AutoChangeLog-pr-15752.yml | 4 ---- html/changelogs/archive/2022-08.yml | 9 +++++++++ 3 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15744.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15752.yml diff --git a/html/changelogs/AutoChangeLog-pr-15744.yml b/html/changelogs/AutoChangeLog-pr-15744.yml deleted file mode 100644 index 3d6aee8e74..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15744.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - tweak: "Untied shoelaces probabilities rework" - - balance: "Miner boots are slightly harder to tie/untie now" diff --git a/html/changelogs/AutoChangeLog-pr-15752.yml b/html/changelogs/AutoChangeLog-pr-15752.yml deleted file mode 100644 index 18ed1f4d93..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15752.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - tweak: "The L6 Squad Automatic Weapon, as used by Syndicate nuclear operatives, now fires 7.12x82mm, with no change in ballistic performance. This has the side effect of making it now capable of utilizing match-grade ammunition, which some would think are mutually incompatible concepts." diff --git a/html/changelogs/archive/2022-08.yml b/html/changelogs/archive/2022-08.yml index 00469bd6ae..a51fe1bc6e 100644 --- a/html/changelogs/archive/2022-08.yml +++ b/html/changelogs/archive/2022-08.yml @@ -21,3 +21,12 @@ - qol: Three gateways will no longer lose power via Magical SMES Units timothyteakettle: - rscadd: lets AIs control status displays (vtuber mode) +2022-08-05: + Hatterhat: + - tweak: The L6 Squad Automatic Weapon, as used by Syndicate nuclear operatives, + now fires 7.12x82mm, with no change in ballistic performance. This has the side + effect of making it now capable of utilizing match-grade ammunition, which some + would think are mutually incompatible concepts. + Putnam3145: + - tweak: Untied shoelaces probabilities rework + - balance: Miner boots are slightly harder to tie/untie now