mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-18 11:36:24 +01:00
[READY]Arconomy: Sales Taggers, split profits on barcoded, sold items! (#49111)
* Startwork * "Arcane: Everything works up until the export datum bullshit" * I got up to "Split Profit" in "sell object" * This is when I switched over to components and it STILL doesn't work * alright stopwork for the 'night' * So this is the version that crashes * One step further in my descent to madness. * Alright, this should be working (Minus maybe profit_split) * Alright splitting up custom sales splits is broken right now. * Profit split works now. * Alright what the hell is going on here. * Revert "Alright what the hell is going on here." This reverts commit 6cb3b6eb56ea45ede3496bbe219ca18302c806e2. * Oh wait, I can do commit messages through VSC? * Adds a quick little box with all the shipping supplies you'll ever want, unwrapping signal * Added shipping box to all maps and the service/cargo lathes. * Fuck you mapmerge hook you ain't shit * Alright, yet another take of making it get rid of the pricetag * [3:43 PM] oranges: anturk is smart (This is true) * Tested, cleaned up component procs, and limits signals sent a bit. * Whoops * Other comments from Ninja over discord * Left in a comment line. * Fixes the issue with ind. barcodes, adds examine. * Well thank GOD the children wern't there to see it * Adds a do_after to prevent accidents. * Fixes merge conflicts * Fixes merge conflict. Twice in one day. * Fixes merge conflict. * one tiny bit of documentation * Travis play nice.
This commit is contained in:
@@ -231,3 +231,9 @@
|
||||
icon = 'icons/obj/objects.dmi'
|
||||
icon_state = "shards"
|
||||
color = "#c6f4ff"
|
||||
|
||||
/obj/effect/decal/cleanable/wrapping
|
||||
name = "wrapping shreds"
|
||||
desc = "Torn pieces of cardboard and paper, left over from a package."
|
||||
icon = 'icons/obj/objects.dmi'
|
||||
icon_state = "paper_shreds"
|
||||
|
||||
@@ -20,6 +20,9 @@
|
||||
if(QDELETED(src) && !transfer)
|
||||
new /obj/item/c_tube(T)
|
||||
|
||||
/obj/item/stack/wrapping_paper/small
|
||||
desc = "Wrap packages with this festive paper to make gifts. This roll looks a bit skimpy."
|
||||
amount = 10
|
||||
|
||||
/*
|
||||
* Package Wrap
|
||||
@@ -121,6 +124,11 @@
|
||||
if(QDELETED(src) && !transfer)
|
||||
new /obj/item/c_tube(T)
|
||||
|
||||
/obj/item/stack/packageWrap/small
|
||||
desc = "You can use this to wrap items in. This roll looks a bit skimpy."
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
amount = 5
|
||||
|
||||
/obj/item/c_tube
|
||||
name = "cardboard tube"
|
||||
desc = "A tube... of cardboard."
|
||||
|
||||
@@ -1314,3 +1314,18 @@
|
||||
/obj/item/storage/box/gum/happiness/PopulateContents()
|
||||
for(var/i in 1 to 4)
|
||||
new/obj/item/reagent_containers/food/snacks/chewable/bubblegum/happiness(src)
|
||||
|
||||
/obj/item/storage/box/shipping
|
||||
name = "box of shipping supplies"
|
||||
desc = "Contains several scanners and labelers for shipping things. Wrapping Paper not included."
|
||||
illustration = "shipping"
|
||||
|
||||
/obj/item/storage/box/shipping/PopulateContents()
|
||||
var/static/items_inside = list(
|
||||
/obj/item/destTagger=1,\
|
||||
/obj/item/sales_tagger=1,\
|
||||
/obj/item/export_scanner=1,\
|
||||
/obj/item/stack/packageWrap/small=2,\
|
||||
/obj/item/stack/wrapping_paper/small=1
|
||||
)
|
||||
generate_items_inside(items_inside,src)
|
||||
|
||||
Reference in New Issue
Block a user