From 6504815fe3db364e8e9a589e8c664910e619cc77 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Fri, 9 Aug 2024 19:08:37 +0200 Subject: [PATCH 1/9] Gravity generator removal (#6751) # About the pull request not used and super ugly old ss13 sprites that should not be used on maps # Explain why it's good for the game less legacy mess # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: del: removes gravity generator (ugly legacy stuff) /:cl: --------- Co-authored-by: vincibrv --- code/_onclick/human.dm | 2 +- code/modules/power/gravitygenerator.dm | 23 ----------------------- colonialmarines.dme | 1 - maps/map_files/CORSAT/Corsat.dmm | 6 ------ maps/predship/huntership.dmm | 6 ++++-- 5 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 code/modules/power/gravitygenerator.dm diff --git a/code/_onclick/human.dm b/code/_onclick/human.dm index b09c26ffb92f..4a353d5ed5c5 100644 --- a/code/_onclick/human.dm +++ b/code/_onclick/human.dm @@ -38,7 +38,7 @@ if (A != src) return ..() var/mob/living/carbon/human/H = A - if (last_chew + 75 > world.time) + if (last_chew + 1 > world.time) to_chat(H, SPAN_DANGER("You can't bite your hand again yet...")) return diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm deleted file mode 100644 index c3d4698fbc03..000000000000 --- a/code/modules/power/gravitygenerator.dm +++ /dev/null @@ -1,23 +0,0 @@ -// It... uses a lot of power. Everything under power is engineering stuff, at least. - -/obj/structure/machinery/computer/gravity_control_computer - name = "Gravity Generator Control" - desc = "A computer to control a local gravity generator. Qualified personnel only." - icon = 'icons/obj/structures/machinery/computer.dmi' - icon_state = "gravitycomp" - anchored = TRUE - density = TRUE - var/obj/structure/machinery/gravity_generator = null - - -/obj/structure/machinery/gravity_generator - name = "Gravitational Generator" - desc = "A device which produces a gravaton field when set up." - icon = 'icons/obj/structures/props/singularity.dmi' - icon_state = "TheSingGen" - anchored = TRUE - density = TRUE - use_power = USE_POWER_IDLE - idle_power_usage = 200 - active_power_usage = 1000 - var/on = 1 diff --git a/colonialmarines.dme b/colonialmarines.dme index a5109c8dd48a..8374bb19415a 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -2192,7 +2192,6 @@ #include "code\modules\power\cell.dm" #include "code\modules\power\fractal_reactor.dm" #include "code\modules\power\generator.dm" -#include "code\modules\power\gravitygenerator.dm" #include "code\modules\power\lighting.dm" #include "code\modules\power\port_gen.dm" #include "code\modules\power\power.dm" diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index 42c903cab227..59f0a59d6ca5 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -40319,12 +40319,6 @@ /turf/open/floor/corsat/yellow, /area/corsat/gamma/engineering/atmos) "qVd" = ( -/obj/structure/machinery/gravity_generator{ - desc = "Absorbs and redirects radiation, hopefully away from you."; - name = "Radiation Collector"; - pixel_x = 15; - pixel_y = -5 - }, /obj/structure/platform{ dir = 1 }, diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm index 70bfb5c2914b..6247c6ce1347 100644 --- a/maps/predship/huntership.dmm +++ b/maps/predship/huntership.dmm @@ -828,7 +828,8 @@ /turf/open/shuttle/predship, /area/yautja) "co" = ( -/obj/structure/machinery/gravity_generator, +/obj/structure/machinery/portable_atmospherics/canister/phoron, +/obj/structure/window/phoronreinforced, /obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow" }, @@ -934,7 +935,8 @@ /turf/open/floor/corsat/squareswood/north, /area/yautja) "cy" = ( -/obj/structure/machinery/gravity_generator, +/obj/structure/window/phoronreinforced, +/obj/structure/machinery/portable_atmospherics/canister/phoron, /obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow" }, From 03bb2bdfbc27a86a9641a395b23e5dfa7e7b0f5b Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Fri, 9 Aug 2024 18:14:11 +0100 Subject: [PATCH 2/9] Automatic changelog for PR #6751 [ci skip] --- html/changelogs/AutoChangeLog-pr-6751.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6751.yml diff --git a/html/changelogs/AutoChangeLog-pr-6751.yml b/html/changelogs/AutoChangeLog-pr-6751.yml new file mode 100644 index 000000000000..8071a05c7bdf --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6751.yml @@ -0,0 +1,4 @@ +author: "cuberound" +delete-after: True +changes: + - rscdel: "removes gravity generator (ugly legacy stuff)" \ No newline at end of file From 7b793776c0f56aa75199ad2ebf7f811c3361adce Mon Sep 17 00:00:00 2001 From: BasilHerb <168701329+BasilHerb@users.noreply.github.com> Date: Sat, 10 Aug 2024 03:51:26 +1000 Subject: [PATCH 3/9] Standardises unmeltable SG & Specialist Gear, and removes the (now-legacy) SG kit from req. (#6893) # About the pull request This PR makes the M56 Combat Harness & the M45 Ghillie Suit unmeltable, and removes the $10K SG kit from requisitions, now that there is no need for SGs to buy it if their shit gets melted. The purpose of this PR is to standardise the ongoing trend of unmeltable unique marine gear, and serves to patch up the stragglers that were left behind during the initial un-meltification of specialist & SG equipment. I have tested all my changes- I can confirm the SG kit is no longer in req, and that you can no longer melt the M56 Combat Harness, nor the M45 Ghillie Suit. I have also tested for any spec kits that are still meltable, and found none (besides the sniper, which I fixed.) # Explain why it's good for the game The pain of losing your unique gear to Young Drone (XX-420) while your fellow protagonists have unmeltable gear is well-felt across the playerbase. John Marine strips your ass of your gear to defib you on the frontline, the xenos overrun your position, you go back to retrieve it, but it's been melted to shit because a sentinel took the 0.5 microseconds needed to melt it down. Congrats. You rolled SG, and you are now useless, because whilst your gun is unmeltable, for some strange reason your armour isn't. If you're the sniper, it sucks a bit less since you don't need the armour to fire your gun- But still, you've lost your sweet camo armour and are now dripless. I removed the SG kit from req because it's useless now, plus no one used it anyways because it costs 10K (and also Drathek told me to) # Testing Photographs and Procedure ![Screenshot 2024-08-07 144616](https://github.com/user-attachments/assets/e229e4ea-2b3b-4422-8977-264dc4a1e268) (The SG kit has been thanos snapped from req) ![Screenshot 2024-08-07 143618](https://github.com/user-attachments/assets/d0df683a-3fff-4a9b-a71a-81d74a5a7c43) (The M45 Ghillie Suit is no longer meltable now, despite what the image says) # Changelog :cl: del: removed the M56B Smartgun Kit from requisitions. balance: made the M56 Combat Harness unmeltable. balance: made the M45 Ghillie Suit unmeltable. /:cl: --- code/datums/supply_packs/weapons.dm | 10 ---------- code/modules/clothing/suits/marine_armor/ghillie.dm | 1 + .../modules/clothing/suits/marine_armor/smartgunner.dm | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/code/datums/supply_packs/weapons.dm b/code/datums/supply_packs/weapons.dm index 8939b80e52d6..f7802089cbfe 100644 --- a/code/datums/supply_packs/weapons.dm +++ b/code/datums/supply_packs/weapons.dm @@ -1,13 +1,3 @@ -/datum/supply_packs/m56b_smartgun - name = "M56B Smartgun System Package (x1)" - contains = list( - /obj/item/storage/box/m56_system, - ) - cost = 100 - containertype = /obj/structure/closet/crate/weapon - containername = "M56B Smartgun System Package" - group = "Weapons" - /datum/supply_packs/m56_hmg name = "M56D Heavy Machine Gun (x1)" contains = list( diff --git a/code/modules/clothing/suits/marine_armor/ghillie.dm b/code/modules/clothing/suits/marine_armor/ghillie.dm index 44729ac16b2f..c55e1d054b79 100644 --- a/code/modules/clothing/suits/marine_armor/ghillie.dm +++ b/code/modules/clothing/suits/marine_armor/ghillie.dm @@ -11,6 +11,7 @@ specialty = "M45 pattern ghillie" valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_PONCHO) restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND) + unacidable = TRUE var/camo_active = FALSE var/hide_in_progress = FALSE diff --git a/code/modules/clothing/suits/marine_armor/smartgunner.dm b/code/modules/clothing/suits/marine_armor/smartgunner.dm index f52956edd97d..64cf88d22cfe 100644 --- a/code/modules/clothing/suits/marine_armor/smartgunner.dm +++ b/code/modules/clothing/suits/marine_armor/smartgunner.dm @@ -9,6 +9,7 @@ storage_slots = 2 slowdown = SLOWDOWN_ARMOR_LIGHT flags_inventory = BLOCKSHARPOBJ|SMARTGUN_HARNESS + unacidable = TRUE allowed = list( /obj/item/tank/emergency_oxygen, /obj/item/device/flashlight, From 05f258743b8e77497e1346508cc929f03308bf6e Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Fri, 9 Aug 2024 18:56:49 +0100 Subject: [PATCH 4/9] Automatic changelog for PR #6893 [ci skip] --- html/changelogs/AutoChangeLog-pr-6893.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6893.yml diff --git a/html/changelogs/AutoChangeLog-pr-6893.yml b/html/changelogs/AutoChangeLog-pr-6893.yml new file mode 100644 index 000000000000..bc0bb168d9c1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6893.yml @@ -0,0 +1,6 @@ +author: "BasilHerb" +delete-after: True +changes: + - rscdel: "removed the M56B Smartgun Kit from requisitions." + - balance: "made the M56 Combat Harness unmeltable." + - balance: "made the M45 Ghillie Suit unmeltable." \ No newline at end of file From c09d86465b665817f88243feee7b9d3031d700b9 Mon Sep 17 00:00:00 2001 From: HaultyAnonie <131271192+HaultyAnonie@users.noreply.github.com> Date: Fri, 9 Aug 2024 20:51:33 +0300 Subject: [PATCH 5/9] Accurately depicts the mine amount in claymore boxes on vendor labels. (#6898) # About the pull request Makes the vendor button accurately depict `(x5 mines)` instead of `(x4 mines)` ``` /obj/item/storage/box/explosive_mines/fill_preset_inventory() for(var/i in 1 to 5) new /obj/item/explosive/mine(src) ``` # Changelog :cl: fix: Made claymore boxes in vendors be accurately labeled as the amount of claymores they contain. From (x4 mines) to (x5 mines). The actual contents of the box. /:cl: --- .../vending/vendor_types/squad_prep/squad_engineer.dm | 4 ++-- .../machinery/vending/vendor_types/squad_prep/squad_leader.dm | 2 +- .../machinery/vending/vendor_types/squad_prep/squad_medic.dm | 2 +- .../vending/vendor_types/squad_prep/squad_rifleman.dm | 2 +- .../vending/vendor_types/squad_prep/squad_smartgunner.dm | 2 +- .../machinery/vending/vendor_types/squad_prep/squad_tl.dm | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm index 53ce7986f195..74a3d2a6167b 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm @@ -33,7 +33,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list( list("M74 AGM-Incendiary Airburst Packet (x3 airburst grenades)", 18, /obj/item/storage/box/packet/airburst_incen, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Smoke Airburst Packet (x3 airburst grenades)", 10, /obj/item/storage/box/packet/airburst_smoke, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR), - list("M20 Mine Box (x4 mines)", 18, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), + list("M20 Mine Box (x5 mines)", 18, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), list("M40 MFHS Metal Foam Grenade", 5, /obj/item/explosive/grenade/metal_foam, null, VENDOR_ITEM_REGULAR), list("G2 Electroshock Grenade Packet (x3 grenades)", 16, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR), @@ -155,7 +155,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list( list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Engineer kit Pouch", 0, /obj/item/storage/pouch/engikit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm index d3985adf5fab..0055dc2b1375 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm @@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list( list("M74 AGM-Incendiary Airburst Packet (x3 airburst grenades)", 20, /obj/item/storage/box/packet/airburst_incen, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Smoke Airburst Packet (x3 airburst grenades)", 10, /obj/item/storage/box/packet/airburst_smoke, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR), - list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), + list("M20 Mine Box (x5 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), list("M40 MFHS Metal Foam Grenade", 5, /obj/item/explosive/grenade/metal_foam, null, VENDOR_ITEM_REGULAR), list("G2 Electroshock Grenade Packet (x3 grenades)", 16, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index 917bf2850997..a8cc8be64bda 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -56,7 +56,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("M74 AGM-Incendiary Airburst Packet (x3 airburst grenades)", 20, /obj/item/storage/box/packet/airburst_incen, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Smoke Airburst Packet (x3 airburst grenades)", 10, /obj/item/storage/box/packet/airburst_smoke, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR), - list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), + list("M20 Mine Box (x5 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), list("G2 Electroshock Grenade Packet (x3 grenades)", 16, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR), list("PRIMARY AMMUNITION", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm index 75e7fc36e4d3..1db378bd1d98 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm @@ -65,7 +65,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( list("M74 AGM-Incendiary Airburst Packet (x3 airburst grenades)", 15, /obj/item/storage/box/packet/airburst_incen, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Smoke Airburst Packet (x3 airburst grenades)", 10, /obj/item/storage/box/packet/airburst_smoke, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 15, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR), - list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), + list("M20 Mine Box (x5 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), list("PRIMARY AMMUNITION", 0, null, null, null), list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm index bedffdec7f90..962580529eb2 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm @@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_smartgun, list( list("M74 AGM-Incendiary Airburst Packet (x3 airburst grenades)", 20, /obj/item/storage/box/packet/airburst_incen, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Smoke Airburst Packet (x3 airburst grenades)", 10, /obj/item/storage/box/packet/airburst_smoke, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR), - list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), + list("M20 Mine Box (x5 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), list("SIDEARM AMMUNITION", 0, null, null, null), list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm index 8bd46110aba5..a4535fc7bfb4 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm @@ -10,7 +10,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_tl, list( list("M74 AGM-Incendiary Airburst Packet (x3 airburst grenades)", 20, /obj/item/storage/box/packet/airburst_incen, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Smoke Airburst Packet (x3 airburst grenades)", 10, /obj/item/storage/box/packet/airburst_smoke, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR), - list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), + list("M20 Mine Box (x5 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), list("M40 MFHS Metal Foam Grenade", 5, /obj/item/explosive/grenade/metal_foam, null, VENDOR_ITEM_REGULAR), list("G2 Electroshock Grenade Packet (x3 grenades)", 16, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR), From 3d188700c2eb27c6260cb43f81138ef962e8b85d Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Fri, 9 Aug 2024 19:04:29 +0100 Subject: [PATCH 6/9] Automatic changelog for PR #6898 [ci skip] --- html/changelogs/AutoChangeLog-pr-6898.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6898.yml diff --git a/html/changelogs/AutoChangeLog-pr-6898.yml b/html/changelogs/AutoChangeLog-pr-6898.yml new file mode 100644 index 000000000000..950747f73983 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6898.yml @@ -0,0 +1,4 @@ +author: "HaultyAnonie" +delete-after: True +changes: + - bugfix: "Made claymore boxes in vendors be accurately labeled as the amount of claymores they contain. From (x4 mines) to (x5 mines). The actual contents of the box." \ No newline at end of file From 9ef9edfc22fecec082011f52b313b85c506c5455 Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Fri, 9 Aug 2024 13:51:39 -0400 Subject: [PATCH 7/9] Reorders the Essential SG Kit (#6899) # About the pull request Reorders the Essential SG Kit OLD: Goggles, Gun, Battery, Armor, 3 Ammo NEW: Armor, Gun, Goggles, Battery, 3 Ammo # Explain why it's good for the game Goggles require the gun, gun requires the armor. By placing them in this order, it becomes easier for new players to learn this requirement and equip the kit. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: qol: Reorders the Essential SG Kit in order of Armor, Smartgun, Goggles /:cl: --- code/modules/cm_marines/equipment/weapons.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/cm_marines/equipment/weapons.dm b/code/modules/cm_marines/equipment/weapons.dm index 9a84c84125d5..085289cd3cbf 100644 --- a/code/modules/cm_marines/equipment/weapons.dm +++ b/code/modules/cm_marines/equipment/weapons.dm @@ -12,10 +12,10 @@ /obj/item/storage/box/m56_system/Initialize() . = ..() - new /obj/item/clothing/glasses/night/m56_goggles(src) + new /obj/item/clothing/suit/storage/marine/smartgunner(src) new /obj/item/weapon/gun/smartgun(src) + new /obj/item/clothing/glasses/night/m56_goggles(src) new /obj/item/smartgun_battery(src) - new /obj/item/clothing/suit/storage/marine/smartgunner(src) for(var/i in 1 to 3) new /obj/item/ammo_magazine/smartgun(src) update_icon() From 365fed1a7cc461e4219d3cd234038af3949d97d5 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Fri, 9 Aug 2024 19:13:05 +0100 Subject: [PATCH 8/9] Automatic changelog for PR #6899 [ci skip] --- html/changelogs/AutoChangeLog-pr-6899.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6899.yml diff --git a/html/changelogs/AutoChangeLog-pr-6899.yml b/html/changelogs/AutoChangeLog-pr-6899.yml new file mode 100644 index 000000000000..485a8f6bb34f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6899.yml @@ -0,0 +1,4 @@ +author: "Contrabang" +delete-after: True +changes: + - qol: "Reorders the Essential SG Kit in order of Armor, Smartgun, Goggles" \ No newline at end of file From 04b313463e6645f7a68ffc62e7a8976a10cbc002 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 10 Aug 2024 01:21:21 +0000 Subject: [PATCH 9/9] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-6751.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6893.yml | 6 ------ html/changelogs/AutoChangeLog-pr-6898.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6899.yml | 4 ---- html/changelogs/archive/2024-08.yml | 13 +++++++++++++ 5 files changed, 13 insertions(+), 18 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-6751.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6893.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6898.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6899.yml diff --git a/html/changelogs/AutoChangeLog-pr-6751.yml b/html/changelogs/AutoChangeLog-pr-6751.yml deleted file mode 100644 index 8071a05c7bdf..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6751.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "cuberound" -delete-after: True -changes: - - rscdel: "removes gravity generator (ugly legacy stuff)" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6893.yml b/html/changelogs/AutoChangeLog-pr-6893.yml deleted file mode 100644 index bc0bb168d9c1..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6893.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "BasilHerb" -delete-after: True -changes: - - rscdel: "removed the M56B Smartgun Kit from requisitions." - - balance: "made the M56 Combat Harness unmeltable." - - balance: "made the M45 Ghillie Suit unmeltable." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6898.yml b/html/changelogs/AutoChangeLog-pr-6898.yml deleted file mode 100644 index 950747f73983..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6898.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "HaultyAnonie" -delete-after: True -changes: - - bugfix: "Made claymore boxes in vendors be accurately labeled as the amount of claymores they contain. From (x4 mines) to (x5 mines). The actual contents of the box." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6899.yml b/html/changelogs/AutoChangeLog-pr-6899.yml deleted file mode 100644 index 485a8f6bb34f..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6899.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Contrabang" -delete-after: True -changes: - - qol: "Reorders the Essential SG Kit in order of Armor, Smartgun, Goggles" \ No newline at end of file diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml index afb87c91ce88..dd7e9fc7ba82 100644 --- a/html/changelogs/archive/2024-08.yml +++ b/html/changelogs/archive/2024-08.yml @@ -179,3 +179,16 @@ are replaced with upgraded APC variant containing high capacity cell, weak variant got replaced with normal APC variant. - bugfix: Fixes APC's with wrong offsets (strata and Prison) +2024-08-10: + BasilHerb: + - rscdel: removed the M56B Smartgun Kit from requisitions. + - balance: made the M56 Combat Harness unmeltable. + - balance: made the M45 Ghillie Suit unmeltable. + Contrabang: + - qol: Reorders the Essential SG Kit in order of Armor, Smartgun, Goggles + HaultyAnonie: + - bugfix: Made claymore boxes in vendors be accurately labeled as the amount of + claymores they contain. From (x4 mines) to (x5 mines). The actual contents of + the box. + cuberound: + - rscdel: removes gravity generator (ugly legacy stuff)