diff --git a/code/_core/obj/item/_item_data_saving.dm b/code/_core/obj/item/_item_data_saving.dm index 9f42bf1f1..3227a83dc 100644 --- a/code/_core/obj/item/_item_data_saving.dm +++ b/code/_core/obj/item/_item_data_saving.dm @@ -76,7 +76,7 @@ return null FINALIZE(I) - if(I.contraband || !I.can_save) + if(!I.can_save) qdel(I) return null diff --git a/code/_core/obj/item/attachment/attachment_sight.dm b/code/_core/obj/item/attachment/attachment_sight.dm index d99e505cf..72d6513b5 100644 --- a/code/_core/obj/item/attachment/attachment_sight.dm +++ b/code/_core/obj/item/attachment/attachment_sight.dm @@ -91,13 +91,13 @@ value = 1600 /obj/item/attachment/sight/scope/massive - name = "sniper scope (x8)" + name = "sniper scope (x6)" desc = "What's wrong with ironsights?" desc_extended = "An absolutely bulky sniper scope that increases the zoom range of the weapon, making the weapon more precise. Significantly increases movement spread and heat spread as a penalty." icon_state = "x8_scope" attachment_stats = list( - zoom_mul = 8, + zoom_mul = 6, movement_spread = 3, heat_spread = 1.25, inaccuracy_modifier = 0.1, diff --git a/code/_core/obj/structure/interactive/local_machine/vendor/contract.dm b/code/_core/obj/structure/interactive/local_machine/vendor/contract.dm index 869d9dcb2..49183d4fc 100644 --- a/code/_core/obj/structure/interactive/local_machine/vendor/contract.dm +++ b/code/_core/obj/structure/interactive/local_machine/vendor/contract.dm @@ -3,27 +3,6 @@ markup = 2 stored_types = list() - var/list/possible_rewards = list( - /obj/item/weapon/ranged/bullet/magazine/pistol/brown/mod, - /obj/item/weapon/ranged/bullet/magazine/pistol/deagle/mod, - /obj/item/weapon/ranged/bullet/magazine/pistol/high_calibre/mod, - /obj/item/weapon/ranged/bullet/magazine/pistol/high_power/mod, - /obj/item/weapon/ranged/bullet/magazine/pistol/laton/mod, - /obj/item/weapon/ranged/bullet/magazine/pistol/overseer/mod, - /obj/item/weapon/ranged/bullet/magazine/pistol/syndie/mod, - /obj/item/weapon/ranged/bullet/magazine/pistol/tactical/mod, - /obj/item/weapon/ranged/bullet/magazine/rifle/ak47/mod, - /obj/item/weapon/ranged/bullet/magazine/rifle/burst/mod, - /obj/item/weapon/ranged/bullet/magazine/rifle/carbine/mod, - /obj/item/weapon/ranged/bullet/magazine/rifle/marksman/mod, - /obj/item/weapon/ranged/bullet/pump/shotgun/combat/mod, - /obj/item/weapon/melee/energy/sword/katana, - /obj/item/weapon/melee/energy/stunbaton, - /obj/item/weapon/melee/sword/zweihander, - /obj/item/weapon/unarmed/brass_knuckles, - /obj/item/weapon/unarmed/powerfist - ) - health = null apc_powered = FALSE //Does not require power. @@ -72,11 +51,6 @@ return ..() var/obj/item/contract/I = new item_path(turf_spawn) - if(!I.reward) - var/chosen_reward = pick(possible_rewards) - possible_rewards -= chosen_reward - I.reward = chosen_reward - INITIALIZE(I) GENERATE(I) FINALIZE(I) @@ -92,7 +66,5 @@ return TRUE - - /obj/structure/interactive/vending/contract/get_bullshit_price(var/desired_price) return CEILING(desired_price,10) \ No newline at end of file