From 9099487e5ba6060ea718c17986008c4ae9509a9a Mon Sep 17 00:00:00 2001 From: grifp71 <39208328+grifp71@users.noreply.github.com> Date: Thu, 4 Apr 2024 16:02:15 -0400 Subject: [PATCH 01/11] Update special_ammo.dm --- code/datums/ammo/bullet/special_ammo.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm index e0ba0084bb..b2070c83b5 100644 --- a/code/datums/ammo/bullet/special_ammo.dm +++ b/code/datums/ammo/bullet/special_ammo.dm @@ -11,8 +11,9 @@ max_range = 12 accuracy = HIT_ACCURACY_TIER_4 - damage = 36 + damage = 65 penetration = 0 + damage_falloff = DAMAGE_FALLOFF_TIER_7 /datum/ammo/bullet/smartgun/armor_piercing name = "armor-piercing smartgun bullet" @@ -20,8 +21,9 @@ accurate_range = 12 accuracy = HIT_ACCURACY_TIER_2 - damage = 24 + damage = 55 penetration = ARMOR_PENETRATION_TIER_8 + damage_falloff = DAMAGE_FALLOFF_TIER_7 damage_armor_punch = 1 /datum/ammo/bullet/smartgun/dirty From 5cb2751f924c809b103fe548fdff32db01d38b77 Mon Sep 17 00:00:00 2001 From: grifp71 <39208328+grifp71@users.noreply.github.com> Date: Thu, 4 Apr 2024 16:03:23 -0400 Subject: [PATCH 02/11] Update backpack.dm --- code/game/objects/items/storage/backpack.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 81e838b30b..59cfe448dc 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -623,6 +623,7 @@ w_class = SIZE_LARGE max_w_class = SIZE_MEDIUM flags_equip_slot = SLOT_WAIST + cant_hold = list(/obj/item/ammo_magazine/smartgun) icon = 'icons/obj/items/clothing/belts.dmi' icon_state = "g8pouch" item_state = "g8pouch" From 77911a20cc118a2092fdbd8cd3637db4aad1e42a Mon Sep 17 00:00:00 2001 From: grifp71 <39208328+grifp71@users.noreply.github.com> Date: Thu, 4 Apr 2024 16:04:18 -0400 Subject: [PATCH 03/11] Update pouch.dm --- code/game/objects/items/storage/pouch.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 36149138a6..85483cb231 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -60,6 +60,7 @@ /obj/item/storage/firstaid, /obj/item/storage/bible, /obj/item/storage/box, + /obj/item/ammo_magazine/smartgun, ) storage_slots = null max_storage_space = 2 From 1e08a6fe1029d295882d8c7a528a23755c47843d Mon Sep 17 00:00:00 2001 From: grifp71 <39208328+grifp71@users.noreply.github.com> Date: Thu, 4 Apr 2024 16:04:46 -0400 Subject: [PATCH 04/11] Update ties.dm --- code/modules/clothing/under/ties.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index 23080104a4..e1cf34f86c 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -777,6 +777,7 @@ /obj/item/storage/firstaid, /obj/item/storage/bible, /obj/item/storage/toolkit, + /obj/item/ammo_magazine/smartgun, ) storage_flags = NONE //no verb, no quick draw, no tile gathering From 45fc1001cab71077de241514aa7dfc5dde7141cc Mon Sep 17 00:00:00 2001 From: grifp71 <39208328+grifp71@users.noreply.github.com> Date: Thu, 4 Apr 2024 16:11:49 -0400 Subject: [PATCH 05/11] Update job_closets.dm --- .../structures/crates_lockers/closets/job_closets.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 586832e746..e1ccf7c578 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -143,8 +143,8 @@ new /obj/item/ammo_magazine/smartgun(src) new /obj/item/ammo_magazine/smartgun(src) new /obj/item/ammo_magazine/smartgun(src) - new /obj/item/storage/belt/marine/smartgunner(src) - new /obj/item/storage/belt/gun/smartgunner(src) + new /obj/item/ammo_magazine/smartgun(src) + new /obj/item/ammo_magazine/smartgun(src) /obj/structure/closet/secure_closet/smartgunner_forecon name = "smartgunner locker" @@ -160,8 +160,8 @@ new /obj/item/ammo_magazine/smartgun(src) new /obj/item/ammo_magazine/smartgun(src) new /obj/item/ammo_magazine/smartgun(src) - new /obj/item/storage/belt/marine/smartgunner/standard(src) - new /obj/item/storage/belt/gun/smartgunner/standard(src) + new /obj/item/ammo_magazine/smartgun(src) + new /obj/item/ammo_magazine/smartgun(src) /obj/structure/closet/cryo/Initialize() . = ..() From 4d06d51a2ecf8d5e3ac51ccebc0795cc51798d8d Mon Sep 17 00:00:00 2001 From: grifp71 <39208328+grifp71@users.noreply.github.com> Date: Thu, 4 Apr 2024 23:35:32 -0400 Subject: [PATCH 06/11] Update special_ammo.dm --- code/datums/ammo/bullet/special_ammo.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm index b2070c83b5..0b82c846ca 100644 --- a/code/datums/ammo/bullet/special_ammo.dm +++ b/code/datums/ammo/bullet/special_ammo.dm @@ -11,7 +11,7 @@ max_range = 12 accuracy = HIT_ACCURACY_TIER_4 - damage = 65 + damage = 50 penetration = 0 damage_falloff = DAMAGE_FALLOFF_TIER_7 @@ -21,7 +21,7 @@ accurate_range = 12 accuracy = HIT_ACCURACY_TIER_2 - damage = 55 + damage = 42 penetration = ARMOR_PENETRATION_TIER_8 damage_falloff = DAMAGE_FALLOFF_TIER_7 damage_armor_punch = 1 From 46f23107f4c231c591a32bd497333d7ce6594ff6 Mon Sep 17 00:00:00 2001 From: morrow <8919187+morrowwolf@users.noreply.github.com> Date: Fri, 5 Apr 2024 21:41:40 -0400 Subject: [PATCH 07/11] fixes annoying VV bug --- code/modules/admin/view_variables/modify_variables.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/admin/view_variables/modify_variables.dm b/code/modules/admin/view_variables/modify_variables.dm index 5b2ec3f0e5..e9595baf22 100644 --- a/code/modules/admin/view_variables/modify_variables.dm +++ b/code/modules/admin/view_variables/modify_variables.dm @@ -245,11 +245,15 @@ GLOBAL_PROTECT(VVpixelmovement) if("DELETE FROM LIST") L.Cut(index, index+1) + + var/temp_type = O.type + if (O) if (O.vv_edit_var(objectvar, L)) to_chat(src, "Your edit was rejected by the object.", confidential = TRUE) return - log_world("### ListVarEdit by [src]: [O.type] [objectvar]: REMOVED=[html_encode("[original_var]")]") + + log_world("### ListVarEdit by [src]: [temp_type] [objectvar]: REMOVED=[html_encode("[original_var]")]") log_admin("[key_name(src)] modified [original_name]'s [objectvar]: REMOVED=[original_var]") message_admins("[key_name_admin(src)] modified [original_name]'s [objectvar]: REMOVED=[original_var]") return From 36c99ddb822a2b0a9f1fcbf35234c612820f5a97 Mon Sep 17 00:00:00 2001 From: morrow <8919187+morrowwolf@users.noreply.github.com> Date: Fri, 5 Apr 2024 21:41:51 -0400 Subject: [PATCH 08/11] let's try this, may revert later --- code/datums/ammo/bullet/special_ammo.dm | 4 ++-- code/game/objects/items/storage/backpack.dm | 1 - code/game/objects/items/storage/pouch.dm | 1 - code/modules/clothing/under/ties.dm | 1 - code/modules/gear_presets/uscm_ship.dm | 4 ++-- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm index 0b82c846ca..ee4b3f95b4 100644 --- a/code/datums/ammo/bullet/special_ammo.dm +++ b/code/datums/ammo/bullet/special_ammo.dm @@ -11,7 +11,7 @@ max_range = 12 accuracy = HIT_ACCURACY_TIER_4 - damage = 50 + damage = 42 penetration = 0 damage_falloff = DAMAGE_FALLOFF_TIER_7 @@ -21,7 +21,7 @@ accurate_range = 12 accuracy = HIT_ACCURACY_TIER_2 - damage = 42 + damage = 30 penetration = ARMOR_PENETRATION_TIER_8 damage_falloff = DAMAGE_FALLOFF_TIER_7 damage_armor_punch = 1 diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 59cfe448dc..81e838b30b 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -623,7 +623,6 @@ w_class = SIZE_LARGE max_w_class = SIZE_MEDIUM flags_equip_slot = SLOT_WAIST - cant_hold = list(/obj/item/ammo_magazine/smartgun) icon = 'icons/obj/items/clothing/belts.dmi' icon_state = "g8pouch" item_state = "g8pouch" diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 85483cb231..36149138a6 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -60,7 +60,6 @@ /obj/item/storage/firstaid, /obj/item/storage/bible, /obj/item/storage/box, - /obj/item/ammo_magazine/smartgun, ) storage_slots = null max_storage_space = 2 diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index e1cf34f86c..23080104a4 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -777,7 +777,6 @@ /obj/item/storage/firstaid, /obj/item/storage/bible, /obj/item/storage/toolkit, - /obj/item/ammo_magazine/smartgun, ) storage_flags = NONE //no verb, no quick draw, no tile gathering diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index b89708e5af..5644e8c515 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -564,8 +564,8 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/bridge(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_L_HAND) /datum/equipment_preset/uscm_ship/so/load_status(mob/living/carbon/human/new_human, client/mob_client) From 58babee03d1c8ae5894ece9b31d28efde2c08f7d Mon Sep 17 00:00:00 2001 From: morrow <8919187+morrowwolf@users.noreply.github.com> Date: Fri, 5 Apr 2024 22:05:14 -0400 Subject: [PATCH 09/11] woops --- .../structures/crates_lockers/closets/job_closets.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 1683dc90e6..08fd802726 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -161,8 +161,10 @@ new /obj/item/ammo_magazine/smartgun(src) new /obj/item/ammo_magazine/smartgun(src) new /obj/item/ammo_magazine/smartgun(src) - new /obj/item/storage/belt/marine/smartgunner/standard(src) - new /obj/item/storage/belt/gun/smartgunner/standard(src) + new /obj/item/ammo_magazine/smartgun(src) + new /obj/item/ammo_magazine/smartgun(src) + new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(src) + /obj/structure/closet/cryo/Initialize() . = ..() From a5b4c655cb54b0c98e93d57a56b68ca7a8c7a76f Mon Sep 17 00:00:00 2001 From: morrow <8919187+morrowwolf@users.noreply.github.com> Date: Fri, 5 Apr 2024 22:10:18 -0400 Subject: [PATCH 10/11] kills space --- .../objects/structures/crates_lockers/closets/job_closets.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 08fd802726..ae476b0f73 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -165,7 +165,6 @@ new /obj/item/ammo_magazine/smartgun(src) new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(src) - /obj/structure/closet/cryo/Initialize() . = ..() new /obj/item/clothing/under/marine(src) From f7e2f8275888d5b23976f3ef0227980f64d5cae2 Mon Sep 17 00:00:00 2001 From: grifp71 Date: Sun, 7 Apr 2024 20:37:59 -0400 Subject: [PATCH 11/11] increase ROF, default damage --- code/__DEFINES/weapon_stats.dm | 2 +- code/datums/ammo/bullet/special_ammo.dm | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/__DEFINES/weapon_stats.dm b/code/__DEFINES/weapon_stats.dm index 05206a136c..4816fa38e5 100644 --- a/code/__DEFINES/weapon_stats.dm +++ b/code/__DEFINES/weapon_stats.dm @@ -149,7 +149,7 @@ As such, don't expect any values assigned to common firearms to even consider ho #define FIRE_DELAY_TIER_10 2.5 #define FIRE_DELAY_TIER_11 2 #define FIRE_DELAY_TIER_LMG 1.5 -#define FIRE_DELAY_TIER_SG 1.5 +#define FIRE_DELAY_TIER_SG 1.0 #define FIRE_DELAY_TIER_SMG 1.5 #define FIRE_DELAY_TIER_12 1 diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm index bf78c8c0a1..127e8b1ba1 100644 --- a/code/datums/ammo/bullet/special_ammo.dm +++ b/code/datums/ammo/bullet/special_ammo.dm @@ -11,9 +11,8 @@ max_range = 12 accuracy = HIT_ACCURACY_TIER_4 - damage = 42 + damage = 36 penetration = 0 - damage_falloff = DAMAGE_FALLOFF_TIER_7 /datum/ammo/bullet/smartgun/armor_piercing name = "armor-piercing smartgun bullet" @@ -21,9 +20,8 @@ accurate_range = 12 accuracy = HIT_ACCURACY_TIER_2 - damage = 30 + damage = 24 penetration = ARMOR_PENETRATION_TIER_8 - damage_falloff = DAMAGE_FALLOFF_TIER_7 damage_armor_punch = 1 /datum/ammo/bullet/smartgun/dirty