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/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index fa1c08b410..ae476b0f73 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) new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(src) /obj/structure/closet/secure_closet/smartgunner_forecon @@ -161,8 +161,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) new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(src) /obj/structure/closet/cryo/Initialize() 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 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)