From 12e19c3d3d3ebf1e7ca1eecfb779b55341658c15 Mon Sep 17 00:00:00 2001 From: Bierkraan Date: Sun, 12 May 2024 22:03:11 +0200 Subject: [PATCH 1/3] Update vehicle choises --- code/modules/1713/computers/programs.dm | 3 --- code/modules/1713/machinery/vehicles.dm | 2 -- code/modules/1713/weapons/guns/mg/stationary/mg.dm | 1 + 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/1713/computers/programs.dm b/code/modules/1713/computers/programs.dm index e6376a1e78..b5699003f8 100644 --- a/code/modules/1713/computers/programs.dm +++ b/code/modules/1713/computers/programs.dm @@ -2064,7 +2064,6 @@ ) var/list/rus_choice = list( "T-90A Tank (1200)", - "BMD-2 IFV with ATGM (1200)", "BMD-2 IFV (900)", "BTR-80 APC (700)", "Tigr-M Humvee with MG (400)", @@ -2255,8 +2254,6 @@ if ("T-90A Tank (1200)") PV = new /obj/effects/premadevehicles/tank/t90a(locate(origin.x+3,origin.y-5,origin.z)) - if ("BMD-2 IFV with ATGM (1200)") - PV = new /obj/structure/vehicleparts/axis/heavy/bmd2/atgm(locate(origin.x+3,origin.y-5,origin.z)) if ("BMD-2 IFV (900)") PV = new /obj/structure/vehicleparts/axis/heavy/bmd2(locate(origin.x+3,origin.y-5,origin.z)) if ("BTR-80 APC (700)") diff --git a/code/modules/1713/machinery/vehicles.dm b/code/modules/1713/machinery/vehicles.dm index 6cf7720a64..dc7ae55bba 100644 --- a/code/modules/1713/machinery/vehicles.dm +++ b/code/modules/1713/machinery/vehicles.dm @@ -263,8 +263,6 @@ tank_names_soviet -= pickedname name = "[name] \'[pickedname]\'" -/obj/structure/vehicleparts/axis/heavy/bmd2/atgm - /obj/structure/vehicleparts/axis/heavy/btr80 name = "BTR-80" speeds = 5 diff --git a/code/modules/1713/weapons/guns/mg/stationary/mg.dm b/code/modules/1713/weapons/guns/mg/stationary/mg.dm index e537e0a0f6..f8cb494e71 100644 --- a/code/modules/1713/weapons/guns/mg/stationary/mg.dm +++ b/code/modules/1713/weapons/guns/mg/stationary/mg.dm @@ -601,6 +601,7 @@ base_icon = "atgm" caliber = "rocket" fire_sound = 'sound/weapons/guns/fire/rpg7.ogg' + zoom_amount = ZOOM_CONSTANT*2+4 load_method = SINGLE_CASING handle_casings = REMOVE_CASINGS magazine_type = /obj/item/ammo_magazine/mosin From 8cdc2832a8af48155a60553dbf570de5de464ac4 Mon Sep 17 00:00:00 2001 From: Bierkraan Date: Mon, 13 May 2024 20:21:31 +0200 Subject: [PATCH 2/3] update defines --- code/__defines/maps.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__defines/maps.dm b/code/__defines/maps.dm index 931477b964..9fc0aa6b1c 100644 --- a/code/__defines/maps.dm +++ b/code/__defines/maps.dm @@ -77,7 +77,7 @@ #define MAP_JUNGLE_OF_THE_CHADS "JUNGLE_OF_THE_CHADS" #define MAP_FOOTBALL "FOOTBALL" -#define MAP_FOOTBALL_CMP "FOOTBALL_CAMPAIGN" +#define MAP_FOOTBALL_CMP "FOOTBALL_CMP" #define MODE_WAR 1 #define MAP_ABASHIRI "ABASHIRI" @@ -139,7 +139,7 @@ #define MAP_WACO "WACO" #define MAP_ARCTIC_SUB "ARCTIC_SUB" #define MAP_NATIONSRP_COLDWAR "NATIONSRP_COLDWAR" -#define MAP_NATIONSRP_COLDWAR_CMP "NATIONSRP_COLDWAR_CAMPAIGN" +#define MAP_NATIONSRP_COLDWAR_CMP "NATIONSRP_COLDWAR_CMP" #define MAP_CZECH_BORDER "CZECH_BORDER" #define MAP_HOSTAGES "HOSTAGES" From 7bface0e38fceb0ea1aa77758c0c5d4050ecd75c Mon Sep 17 00:00:00 2001 From: Bierkraan Date: Mon, 13 May 2024 20:24:23 +0200 Subject: [PATCH 3/3] Quicker ATGM retrieve time, can_move TRUE for etools --- code/modules/1713/tools.dm | 4 ++-- code/modules/1713/weapons/guns/mg/stationary/mg.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/1713/tools.dm b/code/modules/1713/tools.dm index 766c9c21f3..a70c5eac0e 100644 --- a/code/modules/1713/tools.dm +++ b/code/modules/1713/tools.dm @@ -168,7 +168,7 @@ /obj/item/weapon/material/shovel/spade/foldable/secondary_attack_self(mob/living/human/user) if (secondary_action) - if (do_after(user, 10, src)) + if (do_after(user, 10, src, can_move = TRUE)) user.visible_message("[user] folds their [src] closed.", "You fold your [src] closed.", "You hear something being folded nearby.") qdel(src) usr.put_in_any_hand_if_possible(new path, prioritize_active_hand = TRUE) @@ -267,7 +267,7 @@ /obj/item/weapon/foldable_shovel/secondary_attack_self(mob/living/human/user) if (secondary_action) - if (do_after(user, 5, src)) + if (do_after(user, 5, src, can_move = TRUE)) to_chat(usr, SPAN_NOTICE("You quickly snap your [src] open.")) qdel(src) usr.put_in_any_hand_if_possible(new path, prioritize_active_hand = TRUE) diff --git a/code/modules/1713/weapons/guns/mg/stationary/mg.dm b/code/modules/1713/weapons/guns/mg/stationary/mg.dm index f8cb494e71..1e7280e76e 100644 --- a/code/modules/1713/weapons/guns/mg/stationary/mg.dm +++ b/code/modules/1713/weapons/guns/mg/stationary/mg.dm @@ -715,7 +715,7 @@ return usr.face_atom(src) visible_message(SPAN_WARNING("[usr] starts to get the [src] from the ground.")) - if (do_after(usr, 40, get_turf(usr))) + if (do_after(usr, 30, get_turf(usr))) for (var/obj/item/ammo_casing/rocket/I in rockets) I.loc = get_turf(src) rockets -= I