cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Merges the Export Scanner, Sales Tagger, and Price Tagger into one item. [MDB IGNORE] (#17212)

Browse Source 
* Merges the Export Scanner, Sales Tagger, and Price Tagger into one item.

* Update code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

Co-authored-by: coldud13 <coldud13@users.noreply.github.com>

* maps and crates

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
Co-authored-by: coldud13 <coldud13@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-10-28 22:11:01 -04:00
committed by GitHub
co-authored by coldud13 ArcaneMusic Tastyfish
parent b2aec95405
commit 7502ddf9bb
18 changed files with 249 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/_vending.dm
-28
View File
@@ -1425,34 +1425,6 @@ GLOBAL_LIST_EMPTY(vending_products)
icon_state = "refill_custom"
custom_premium_price = PAYCHECK_CREW
/obj/item/price_tagger
name = "price tagger"
desc = "This tool is used to set a price for items used in custom vendors."
icon = 'icons/obj/device.dmi'
icon_state = "pricetagger"
custom_premium_price = PAYCHECK_CREW * 0.5
///the price of the item
var/price = 1
/obj/item/price_tagger/attack_self(mob/user)
if(loc != user)
to_chat(user, span_warning("You must be holding the price tagger to continue!"))
return
var/chosen_price = tgui_input_number(user, "Set price", "Price", price)
if(!chosen_price || QDELETED(user) || QDELETED(src) || !user.canUseTopic(src, be_close = TRUE, no_dexterity = FALSE, no_tk = TRUE) || loc != user)
return
price = chosen_price
to_chat(user, span_notice(" The [src] will now give things a [price] cr tag."))
/obj/item/price_tagger/afterattack(atom/target, mob/user, proximity)
. = ..()
if(!proximity)
return
if(isitem(target))
var/obj/item/I = target
I.custom_price = price
to_chat(user, span_notice("You set the price of [I] to [price] cr."))
/obj/machinery/vending/custom/greed //name and like decided by the spawn
icon_state = "greed"
icon_deny = "greed-deny"
code/modules/vending/assist.dm
+1 -1
View File
@@ -25,7 +25,7 @@
premium = list(
/obj/item/assembly/igniter/condenser = 2,
/obj/item/circuitboard/machine/vendor = 3,
/obj/item/price_tagger = 3,
/obj/item/universal_scanner = 3,
/obj/item/vending_refill/custom = 3,
)