cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

i hate runtimestation i hate runtimestation

Browse Source
This commit is contained in:
Hatterhat
2022-10-31 11:50:54 -05:00
parent bf6084f17e
commit bab984be30
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/civilian_bountys.dm
View File

@@ -21,11 +21,11 @@
pad = /obj/machinery/piratepad/civilian
/obj/machinery/computer/piratepad_control/civilian/attackby(obj/item/I, mob/living/user, params)
. = ..()
if(isidcard(I))
if(id_insert(user, I, inserted_scan_id))
inserted_scan_id = I
return TRUE
. = ..()
/obj/machinery/computer/piratepad_control/multitool_act(mob/living/user, obj/item/multitool/I)
if(istype(I) && istype(I.buffer,/obj/machinery/piratepad/civilian))

45
code/modules/mining/machine_vending.dm
View File

@@ -27,7 +27,7 @@
new /datum/data/mining_equipment("GAR Meson Scanners", /obj/item/clothing/glasses/meson/gar, 500),
new /datum/data/mining_equipment("Explorer's Webbing", /obj/item/storage/belt/mining, 500),
new /datum/data/mining_equipment("Larger Ore Bag", /obj/item/storage/bag/ore/large, 500),
new /datum/data/mining_equipment("500 Point Transfer Card", /obj/item/card/mining_point_card/mp500, 500),
new /datum/data/mining_equipment("Mining Point Transfer Card", /obj/item/card/mining_point_card, 500),
new /datum/data/mining_equipment("Tracking Implant Kit", /obj/item/storage/box/minertracker, 600),
new /datum/data/mining_equipment("Jaunter", /obj/item/wormhole_jaunter, 750),
new /datum/data/mining_equipment("Kinetic Crusher", /obj/item/kinetic_crusher, 750),
@@ -43,9 +43,6 @@
new /datum/data/mining_equipment("Lazarus Injector", /obj/item/lazarus_injector, 1000),
new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 1000),
new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining/conscript, 1000),
new /datum/data/mining_equipment("1000 Point Transfer Card", /obj/item/card/mining_point_card/mp1000, 1000),
new /datum/data/mining_equipment("1500 Point Transfer Card", /obj/item/card/mining_point_card/mp1500, 1500),
new /datum/data/mining_equipment("2000 Point Transfer Card", /obj/item/card/mining_point_card/mp2000, 2000),
new /datum/data/mining_equipment("Jetpack Upgrade", /obj/item/tank/jetpack/suit, 2000),
new /datum/data/mining_equipment("Space Cash", /obj/item/stack/spacecash/c1000, 2000),
new /datum/data/mining_equipment("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000),
@@ -328,28 +325,31 @@
//TODO add in cr = Credits for cargo
/obj/item/card/mining_point_card
name = "mining points card"
desc = "A small card preloaded with mining points. Swipe your ID card over it to transfer the points, then discard. This one only holds a small 50 points on it."
desc = "A small card for transferring mining points. Swipe your ID card over it to start the process."
icon_state = "data_1"
var/points = 50
/obj/item/card/mining_point_card/mp500
desc = "A small card preloaded with 500 mining points. Swipe your ID card over it to transfer the points, then discard."
points = 500
/obj/item/card/mining_point_card/mp1000
desc = "A small card preloaded with 1000 mining points. Swipe your ID card over it to transfer the points, then discard."
points = 1000
/obj/item/card/mining_point_card/mp1500
desc = "A small card preloaded with 1500 mining points. Swipe your ID card over it to transfer the points, then discard."
points = 1500
/obj/item/card/mining_point_card/mp2000
desc = "A small card preloaded with 2000 mining points. Swipe your ID card over it to transfer the points, then discard."
points = 2000
var/points = 500
/obj/item/card/mining_point_card/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/card/id))
var/obj/item/card/id/id = I
to_chat(user, span_info("You swipe [id] on [src] and start the transfer process."))
var/choice = alert(user, "Do you want to transfer points to or from the point card's storage?", "Mining Points Transfer", "From Point Card/Storage", "To Point Card/Storage", "Cancel")
if(choice != "Cancel")
var/amount = input(user, "How much do you want to transfer? ID Balance: [id.mining_points], Transfer Card Balance: [points]", "Transfer Points") as num|null
if(!amount || amount <= 0)
return
amount = round(amount, 1)
if(choice == "To Point Card/Storage")
if(amount && amount <= id.mining_points)
id.mining_points -= amount
points += amount
to_chat(user, span_info("You transfer [amount] points to [src] from [id]."))
else if(choice == "From Point Card/Storage")
if(amount && amount <= points)
id.mining_points += amount
points -= amount
to_chat(user, span_info("You transfer [amount] points to [id] from [src]."))
/*
if(points)
var/obj/item/card/id/C = I
C.mining_points += points
@@ -357,6 +357,7 @@
points = 0
else
to_chat(user, "<span class='info'>There's no points left on [src].</span>")
*/
..()
/obj/item/card/mining_point_card/examine(mob/user)