mirror of
https://github.com/quotefox/Hyper-Station-13.git
synced 2026-07-18 19:22:43 +01:00
Revert "(CONFIG CHANGE) Updating Economy: Adding Paychecks, and makes Bank Accounts easier to work with"
This commit is contained in:
@@ -171,10 +171,10 @@
|
||||
var/registered_name = null // The name registered_name on the card
|
||||
var/assignment = null
|
||||
var/access_txt // mapping aid
|
||||
var/datum/bank_account/registered_account
|
||||
var/uses_overlays = TRUE
|
||||
var/uses_assignment = TRUE
|
||||
var/icon/cached_flat_icon
|
||||
var/datum/bank_account/registered_account
|
||||
|
||||
/obj/item/card/id/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -200,9 +200,6 @@
|
||||
if(mining_points)
|
||||
. += "There's [mining_points] mining equipment redemption point\s loaded onto this card."
|
||||
|
||||
/obj/item/card/id/proc/create_bank_account(owner, job_assignment)
|
||||
registered_account = new/datum/bank_account(owner, job_assignment, src)
|
||||
|
||||
/obj/item/card/id/GetAccess()
|
||||
return access
|
||||
|
||||
@@ -646,7 +643,7 @@
|
||||
icon_state = "retrosci"
|
||||
uses_overlays = FALSE
|
||||
uses_assignment = FALSE
|
||||
|
||||
|
||||
/obj/item/card/id/away/snowdin/med
|
||||
name = "Arctic Station Doctor's ID card"
|
||||
desc = "A faded Arctic Station ID card. You can make out the rank \"Doctor\"."
|
||||
|
||||
@@ -510,7 +510,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
resistance_flags = FIRE_PROOF
|
||||
price = 1
|
||||
light_color = LIGHT_COLOR_FIRE
|
||||
|
||||
var/lit = 0
|
||||
var/fancy = TRUE
|
||||
var/overlay_state
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
throw_range = 7
|
||||
throw_speed = 3
|
||||
economy_type = ECONOMY_PRICE_EROTIC
|
||||
var/mob/living/carbon/subject = null
|
||||
var/closed = FALSE
|
||||
price = 10
|
||||
|
||||
|
||||
//Hypnotize someone
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
/obj/item/stack/spacecash/proc/update_desc()
|
||||
var/total_worth = amount*value
|
||||
desc = "An outdated form of currency, It's worth [total_worth] credit[( total_worth > 1 ) ? "s" : ""]"
|
||||
desc = "A outdated form of currency, It's worth [total_worth] credit[( total_worth > 1 ) ? "s" : ""]"
|
||||
|
||||
|
||||
/obj/item/stack/spacecash/merge(obj/item/stack/S)
|
||||
|
||||
@@ -240,7 +240,7 @@
|
||||
desc = "Holds a variety of gear for \"alternative\" peacekeeping."
|
||||
icon_state = "slutbelt"
|
||||
item_state = "slut"
|
||||
economy_type = ECONOMY_PRICE_EROTIC
|
||||
price = 5
|
||||
|
||||
obj/item/storage/belt/slut/ComponentInitialize()
|
||||
. = ..()
|
||||
|
||||
@@ -418,8 +418,7 @@
|
||||
desc = "<B>Instructions:</B> <I>Heat in microwave. Product will cool if not eaten within seven minutes.</I>"
|
||||
icon_state = "donkpocketbox"
|
||||
illustration=null
|
||||
economy_type = ECONOMY_PRICE_EXPENSIVE_AF
|
||||
economy_price_mul = 0.85
|
||||
price = 10
|
||||
var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket
|
||||
var/warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm
|
||||
|
||||
@@ -676,10 +675,9 @@
|
||||
item_state = "zippo"
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
price = 2
|
||||
drop_sound = 'sound/items/handling/matchbox_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/matchbox_pickup.ogg'
|
||||
economy_type = ECONOMY_PRICE_LOW
|
||||
economy_price_mul = 0.5
|
||||
|
||||
/obj/item/storage/box/matches/ComponentInitialize()
|
||||
. = ..()
|
||||
|
||||
@@ -136,7 +136,7 @@
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
icon_type = "cigarette"
|
||||
spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette
|
||||
economy_type = ECONOMY_PRICE_LOW
|
||||
price = 5
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/ComponentInitialize()
|
||||
. = ..()
|
||||
@@ -231,7 +231,7 @@
|
||||
desc = "Smoked by the truly robust."
|
||||
icon_state = "robustg"
|
||||
spawn_type = /obj/item/clothing/mask/cigarette/robustgold
|
||||
economy_price_mul = 1.5
|
||||
price = 6
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_carp
|
||||
name = "\improper Carp Classic packet"
|
||||
@@ -283,7 +283,7 @@
|
||||
icon_state = "cig_paper_pack"
|
||||
icon_type = "rolling paper"
|
||||
spawn_type = /obj/item/rollingpaper
|
||||
economy_price_mul = 0.25
|
||||
price = 2
|
||||
|
||||
/obj/item/storage/fancy/rollingpapers/ComponentInitialize()
|
||||
. = ..()
|
||||
@@ -308,8 +308,7 @@
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
icon_type = "premium cigar"
|
||||
spawn_type = /obj/item/clothing/mask/cigarette/cigar
|
||||
economy_type = ECONOMY_PRICE_EXPENSIVE
|
||||
economy_price_mul = 0.75
|
||||
price = 8
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/cigars/ComponentInitialize()
|
||||
. = ..()
|
||||
|
||||
@@ -343,8 +343,7 @@
|
||||
item_state = "upindwelder"
|
||||
max_fuel = 80
|
||||
materials = list(MAT_METAL=70, MAT_GLASS=120)
|
||||
economy_type = ECONOMY_PRICE_EXPENSIVE_AF
|
||||
economy_price_mul = 1.5
|
||||
price = 10
|
||||
|
||||
/obj/item/weldingtool/experimental
|
||||
name = "experimental welding tool"
|
||||
|
||||
Reference in New Issue
Block a user