From f71f68e5f693a55a838843c120adff0980172af1 Mon Sep 17 00:00:00 2001 From: nopeingeneer Date: Sat, 18 May 2024 19:48:49 +0300 Subject: [PATCH 1/3] clear after splurt --- modular_splurt/code/modules/jobs/job_types/_job_alt_titles.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modular_splurt/code/modules/jobs/job_types/_job_alt_titles.dm b/modular_splurt/code/modules/jobs/job_types/_job_alt_titles.dm index 0c92e7532cdfb..6776fdb3328a2 100644 --- a/modular_splurt/code/modules/jobs/job_types/_job_alt_titles.dm +++ b/modular_splurt/code/modules/jobs/job_types/_job_alt_titles.dm @@ -71,6 +71,7 @@ "Supply Chief", "Cargonia Chief", "Brigadier", + "Logistics Syndicate Supervisor", "Manager of Shipping Sex" ) LAZYADD(alt_titles, extra_titles) @@ -80,6 +81,7 @@ var/list/extra_titles = list( "Science Administrator", "Cybersun Lead Specialist", + "Donk Co. Lead Specialist", "CEO of Sex", "Sex Research Director", "Research Manager" @@ -222,7 +224,6 @@ "Prey Prepper", "Poissonier", "Chef De Sexe", - "Waffle Co. Specialist", "Baker" ) LAZYADD(alt_titles, extra_titles) @@ -286,6 +287,7 @@ "Rack Researcher", "Nanite Programmer", "Tetromino Researcher", + "Donk Co. Specialist", "Xenoarchaeologist" ) LAZYADD(alt_titles, extra_titles) From 2acf5e92fc18b05156c14396d88bbcd4bfb36c84 Mon Sep 17 00:00:00 2001 From: nopeingeneer Date: Thu, 19 Dec 2024 02:33:32 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=94=D0=B0=D0=BB=20=D1=8D=D0=BD=D1=84?= =?UTF-8?q?=D0=BE=D1=80=D1=81=D0=B5=D1=80=D1=83=20=D0=91=D0=A9=20=D0=B1?= =?UTF-8?q?=D1=8E=D1=80=D1=81=D1=82=20-=20=D0=B4=D0=B0=D0=BB=20=D0=93-22?= =?UTF-8?q?=20=D1=85=D0=BE=D1=81=D0=B0=20=D1=84=D0=BE=D0=BD=D0=B0=D1=80?= =?UTF-8?q?=D0=B8=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_bluemoon/kovac_shitcode/code/modules/guns/weapons.dm | 3 +++ .../code/modules/projectiles/guns/ballistic/pistol.dm | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/modular_bluemoon/kovac_shitcode/code/modules/guns/weapons.dm b/modular_bluemoon/kovac_shitcode/code/modules/guns/weapons.dm index 179303cfa62b8..d1e2c2e7951c2 100644 --- a/modular_bluemoon/kovac_shitcode/code/modules/guns/weapons.dm +++ b/modular_bluemoon/kovac_shitcode/code/modules/guns/weapons.dm @@ -97,6 +97,9 @@ automatic_burst_overlay = TRUE spawnwithmagazine = FALSE fire_sound = 'modular_bluemoon/kovac_shitcode/sound/weapons/g22.ogg' + can_flashlight = 1 + flight_x_offset = 18 + flight_y_offset = 14 /obj/item/gun/ballistic/automatic/pistol/g22/update_icon_state() icon_state = "[initial(icon_state)][chambered ? "" : "-e"]" diff --git a/modular_splurt/code/modules/projectiles/guns/ballistic/pistol.dm b/modular_splurt/code/modules/projectiles/guns/ballistic/pistol.dm index 95139598d04cf..ade076b7dcf12 100644 --- a/modular_splurt/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/modular_splurt/code/modules/projectiles/guns/ballistic/pistol.dm @@ -45,6 +45,11 @@ w_class = WEIGHT_CLASS_NORMAL mag_type = /obj/item/ammo_box/magazine/e45 can_suppress = TRUE + burst_shot_delay = 2.5 + burst_size = 2 + fire_delay = 2.5 + fire_select_modes = list(SELECT_SEMI_AUTOMATIC, SELECT_BURST_SHOT, SELECT_FULLY_AUTOMATIC) + automatic_burst_overlay = TRUE can_flashlight = 1 flight_x_offset = 18 flight_y_offset = 14 From b6d2f28c8238172c15254b3878e1b0f2ccc934a2 Mon Sep 17 00:00:00 2001 From: nopeingeneer Date: Tue, 24 Dec 2024 14:52:28 +0300 Subject: [PATCH 3/3] blueshield enforcer. V 2.0. --- .../code/modules/projectiles/guns/ballistic/pistol.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_splurt/code/modules/projectiles/guns/ballistic/pistol.dm b/modular_splurt/code/modules/projectiles/guns/ballistic/pistol.dm index ade076b7dcf12..65e931cc428c7 100644 --- a/modular_splurt/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/modular_splurt/code/modules/projectiles/guns/ballistic/pistol.dm @@ -45,7 +45,7 @@ w_class = WEIGHT_CLASS_NORMAL mag_type = /obj/item/ammo_box/magazine/e45 can_suppress = TRUE - burst_shot_delay = 2.5 + burst_shot_delay = 2 burst_size = 2 fire_delay = 2.5 fire_select_modes = list(SELECT_SEMI_AUTOMATIC, SELECT_BURST_SHOT, SELECT_FULLY_AUTOMATIC)