Skip to content

Commit

Permalink
More tweaks & fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
EgorDinamit committed Feb 13, 2024
1 parent 179a275 commit d5cc30e
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 9 deletions.
3 changes: 3 additions & 0 deletions code/controllers/subsystems/supply.dm
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,9 @@ SUBSYSTEM_DEF(supply)

// We go backwards, so it'll be innermost objects sold first
for(var/atom/movable/item in reverseRange(contents_incl_self))
if(istype(item, /obj/screen))
continue

var/item_price = get_value(item)
var/export_value = item_price

Expand Down
3 changes: 2 additions & 1 deletion code/datums/uplink/devices and tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@

/datum/uplink_item/item/tools/money
name = "Operations Funding"
item_cost = 8
item_cost = 10
path = /obj/item/storage/secure/briefcase/money

/datum/uplink_item/item/tools/money/New()
. = ..()
desc = "A briefcase with 10,000 untraceable [GLOB.using_map.local_currency_name]. Makes a great bribe if they're willing to take you up on your offer."
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/trade_beacon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
continue
if(A.invisibility)
continue
if(istype(A, /obj/screen))
continue
objects += A
return objects

Expand Down
1 change: 0 additions & 1 deletion code/game/objects/items/weapons/storage/uplink_kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@
make_exact_fit()

/obj/item/storage/secure/briefcase/money

startswith = list(/obj/item/spacecash/bundle/c1000 = 10)

/obj/item/storage/backpack/satchel/syndie_kit/armor
Expand Down
10 changes: 7 additions & 3 deletions code/modules/item_worth/worths_list.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ var/list/worths = list(
/obj/item/gun/energy/temperature = 4000,
/obj/item/gun/energy = 2000,
//LAUNCHERS,
/obj/item/gun/launcher/crossbow = 120,
/obj/item/gun/launcher/crossbow = 150,
/obj/item/gun/launcher/pneumatic/small = 100,
/obj/item/gun/launcher/pneumatic = 200,
/obj/item/gun/launcher/syringe = 150,
/obj/item/gun/launcher/pneumatic = 300,
/obj/item/gun/launcher/syringe = 450,
/obj/item/gun/launcher/alien = 3500,
/obj/item/gun/launcher = 300,
//AUTOMATICS,
Expand Down Expand Up @@ -101,13 +101,15 @@ var/list/worths = list(
/obj/item/stack/medical/advanced/bruise_pack = -20,
/obj/item/stack/medical/advanced/ointment = -30,
/obj/item/stack/medical/splint = -25,
/obj/item/stack/medical/resin = -50,
/obj/item/stack/medical = -15,
/obj/item/stack/nanopaste = -30,
/obj/item/stack/material/rods = -5,
/obj/item/stack/telecrystal = -1000,
/obj/item/stack/wax = -5,
/obj/item/stack = -5,
//STORAGE,
/obj/item/storage/backpack/holding = -2500,
/obj/item/storage/briefcase/crimekit = -50,
/obj/item/storage = -30,
//WEAPONS,
Expand Down Expand Up @@ -583,6 +585,8 @@ var/list/worths = list(
/obj/item/bee_pack = 200,
/obj/item/weedkiller = 30,
/obj/item/sign/medipolma = 1500,
/obj/item/mop/advanced = 250,
/obj/item/mop = 25,
/obj/item = 5,
//STRUCTURES,
/obj/structure/dogbed = 15,
Expand Down
10 changes: 6 additions & 4 deletions code/modules/research/designs/designs_hud_optical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@
build_path = /obj/item/clothing/glasses/hud/janitor
sort_string = "GAAAC"

/datum/design/item/optical
materials = list(MATERIAL_STEEL = 250, MATERIAL_GLASS = 250)

/datum/design/item/optical/AssembleDesignName()
..()
name = "\[Optical HUD\] - [item_name]"
materials = list(MATERIAL_STEEL = 50, MATERIAL_GLASS = 50)

/datum/design/item/optical/mesons
name = "mesons"
Expand All @@ -47,12 +49,12 @@
id = "mesons_material"
req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3)
build_path = /obj/item/clothing/glasses/material
sort_string = "GAAAB"
sort_string = "GBAAB"

/datum/design/item/optical/tactical
name = "tactical"
id = "tactical_goggles"
req_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 5)
materials = list(MATERIAL_STEEL = 50, MATERIAL_GLASS = 50, MATERIAL_SILVER = 50, MATERIAL_GOLD = 50)
materials = list(MATERIAL_STEEL = 250, MATERIAL_GLASS = 250, MATERIAL_SILVER = 250, MATERIAL_GOLD = 250, MATERIAL_DIAMOND = 250)
build_path = /obj/item/clothing/glasses/tacgoggles
sort_string = "GAAAC"
sort_string = "GBAAC"

0 comments on commit d5cc30e

Please sign in to comment.