Skip to content

Commit

Permalink
fixes several oversights
Browse files Browse the repository at this point in the history
  • Loading branch information
BurgerLUA committed Oct 13, 2024
1 parent ab89d69 commit 934be99
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 31 deletions.
2 changes: 1 addition & 1 deletion code/_core/obj/item/_item_data_saving.dm
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
return null
FINALIZE(I)

if(I.contraband || !I.can_save)
if(!I.can_save)
qdel(I)
return null

Expand Down
4 changes: 2 additions & 2 deletions code/_core/obj/item/attachment/attachment_sight.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)
Expand All @@ -92,7 +66,5 @@

return TRUE



/obj/structure/interactive/vending/contract/get_bullshit_price(var/desired_price)
return CEILING(desired_price,10)

0 comments on commit 934be99

Please sign in to comment.