Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Удобный ефтпос. #10884

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
5d91bd0
начальное
DarthSidiousPalpatine Feb 27, 2023
50fabf9
готово
DarthSidiousPalpatine Feb 27, 2023
2f112db
Update cardpay.dm
DarthSidiousPalpatine Feb 27, 2023
d45cad3
блять что я закодил
DarthSidiousPalpatine Feb 27, 2023
0dd2ad1
Update cardpay.dm
DarthSidiousPalpatine Feb 27, 2023
edbc130
Update cardpay.dm
DarthSidiousPalpatine Feb 27, 2023
b435ee7
Update cardpay.dm
DarthSidiousPalpatine Feb 27, 2023
9dc3f0a
готово
DarthSidiousPalpatine Mar 1, 2023
52896bd
Merge remote-tracking branch 'upstream/master' into Money-Rework-pt.2
DarthSidiousPalpatine Mar 9, 2023
20e0a72
Update device.dmi
DarthSidiousPalpatine Mar 9, 2023
6aae0e3
Update code/modules/economy/cardpay.dm
DarthSidiousPalpatine Mar 10, 2023
687b214
Update cardpay.dm
DarthSidiousPalpatine Mar 10, 2023
77a96be
Update cardpay.dm
DarthSidiousPalpatine Mar 11, 2023
812f14a
Merge remote-tracking branch 'upstream/master' into Money-Rework-pt.2
DarthSidiousPalpatine Mar 11, 2023
769c2a4
Update tgui.bundle.js
DarthSidiousPalpatine Mar 11, 2023
6831809
Update cardpay.dm
DarthSidiousPalpatine Mar 11, 2023
c846614
Update cardpay.dm
DarthSidiousPalpatine Apr 15, 2023
a8b8323
Merge remote-tracking branch 'upstream/master' into Money-Rework-pt.2
DarthSidiousPalpatine Apr 15, 2023
913da11
Update tgui.bundle.js
DarthSidiousPalpatine Apr 15, 2023
a81a9a7
Update boxstation.dmm
DarthSidiousPalpatine Apr 15, 2023
eb41f38
Update device.dmi
DarthSidiousPalpatine Apr 15, 2023
8b723ee
Update boxstation.dmm
DarthSidiousPalpatine Apr 15, 2023
b7ec7e2
Update cardpay.dm
DarthSidiousPalpatine Apr 22, 2023
b58d6cb
Update cardpay.dm
DarthSidiousPalpatine Apr 22, 2023
d16481f
Update cardpay.dm
DarthSidiousPalpatine Apr 22, 2023
e98030a
Update cardpay.dm
DarthSidiousPalpatine May 21, 2023
f4d041a
Merge remote-tracking branch 'upstream/master' into Money-Rework-pt.2
DarthSidiousPalpatine May 21, 2023
c029d24
в
DarthSidiousPalpatine May 21, 2023
b192ed4
Update cardpay.dm
DarthSidiousPalpatine May 21, 2023
bfd733e
Update cardpay.dm
DarthSidiousPalpatine May 26, 2023
cb925ac
Update cardpay.dm
DarthSidiousPalpatine May 26, 2023
c430520
Update cardpay.dm
DarthSidiousPalpatine May 26, 2023
c9f4141
Update cardpay.dm
DarthSidiousPalpatine May 26, 2023
b5b815e
Update cardpay.dm
DarthSidiousPalpatine May 26, 2023
98c5b99
Update cardpay.dm
DarthSidiousPalpatine May 26, 2023
3f1d6c1
Update cardpay.dm
DarthSidiousPalpatine May 27, 2023
9fb35d8
gg
DarthSidiousPalpatine May 27, 2023
c68612b
Update cardpay.dm
DarthSidiousPalpatine May 27, 2023
d36c8bb
Update cardpay.dm
DarthSidiousPalpatine May 27, 2023
9666296
Update cardpay.dm
DarthSidiousPalpatine May 27, 2023
2e3fe52
Update cardpay.dm
DarthSidiousPalpatine May 27, 2023
984813b
Update cardpay.dm
DarthSidiousPalpatine May 27, 2023
e7f78dd
Update CardPay.js
DarthSidiousPalpatine Jun 1, 2023
f4b4927
Update tgui.bundle.js
DarthSidiousPalpatine Jun 1, 2023
7cd7766
Merge remote-tracking branch 'upstream/master' into Money-Rework-pt.2
DarthSidiousPalpatine Jun 2, 2023
17b0e54
а
DarthSidiousPalpatine Jun 2, 2023
6e05363
Merge remote-tracking branch 'upstream/master' into Money-Rework-pt.2
DarthSidiousPalpatine Jun 3, 2023
4b79354
готово
DarthSidiousPalpatine Jun 3, 2023
413185c
Update gamma.dmm
DarthSidiousPalpatine Jun 3, 2023
5cffebd
Update prometheus.dmm
DarthSidiousPalpatine Jun 3, 2023
9055b00
Update device.dmi
DarthSidiousPalpatine Jun 3, 2023
0cee525
Update delta.dmm
DarthSidiousPalpatine Jun 3, 2023
a58bc68
f
DarthSidiousPalpatine Jun 3, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions code/__DEFINES/memories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
#define MEM_MAX_COUNT 256

// Memories.
#define MEM_ACCOUNT_NUMBER "Account Number"
#define MEM_ACCOUNT_PIN "Account PIN"
#define MEM_ACCOUNT_NUMBER "Account Number"
#define MEM_ACCOUNT_PIN "Account PIN"

#define MEM_DEPARTMENT_ACCOUNT_NUMBER "Department Account Number"
#define MEM_DEPARTMENT_ACCOUNT_PIN "Department Account PIN"
3 changes: 3 additions & 0 deletions code/controllers/subsystem/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,9 @@ SUBSYSTEM_DEF(job)

H.mind.store_memory(remembered_info)

H.mind.add_key_memory(MEM_DEPARTMENT_ACCOUNT_NUMBER, department_account.account_number)
H.mind.add_key_memory(MEM_DEPARTMENT_ACCOUNT_PIN, department_account.remote_access_pin)

spawn(0)
to_chat(H, "<span class='notice'><b>Your account number is: [M.account_number], your account pin is: [M.remote_access_pin]</b></span>")

Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/autolathe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ var/global/list/datum/autolathe_recipe/autolathe_recipes = list(
R(/obj/item/device/assembly/prox_sensor, CATEGORY_DEVICES),
R(/obj/item/device/flashlight, CATEGORY_DEVICES),
R(/obj/item/device/tagger/shop, CATEGORY_DEVICES),
R(/obj/item/device/cardpay, CATEGORY_DEVICES),
R(/obj/item/device/analyzer, CATEGORY_DEVICES),
R(/obj/item/device/plant_analyzer, CATEGORY_DEVICES),
R(/obj/item/device/healthanalyzer, CATEGORY_DEVICES),
Expand Down
6 changes: 0 additions & 6 deletions code/modules/cargo/packs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1742,12 +1742,6 @@ var/global/list/all_supply_groups = list("Operations","Security","Hospitality","
crate_name = "Formalwear for the best occasions."
group = "Miscellaneous"

/datum/supply_pack/eftpos
contains = list(/obj/item/device/eftpos)
name = "EFTPOS scanner"
crate_name = "EFTPOS crate"
group = "Miscellaneous"

/datum/supply_pack/laser_tag
name = "Laser Tag Crate"
contains = list(/obj/item/weapon/gun/energy/laser/selfcharging/lasertag/redtag,
Expand Down
271 changes: 0 additions & 271 deletions code/modules/economy/EFTPOS.dm

This file was deleted.