cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-07-19 03:33:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "(CONFIG CHANGE) Updating Economy: Adding Paychecks, and makes Bank Accounts easier to work with"

Browse Source
This commit is contained in:
Dahlular
2022-07-06 16:38:30 -06:00
committed by GitHub
parent f6f3a63b4e
commit eaaca202a6
60 changed files with 187 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/economy.dm
-11
View File
@@ -1,11 +0,0 @@
#define ECONOMY_TYPE_ROOKIE "Rookie"
#define ECONOMY_TYPE_DANGEROUS "Dangerous"
#define ECONOMY_TYPE_COMMAND "Command"
#define ECONOMY_PRICE_DEFAULT 1
#define ECONOMY_PRICE_LOW 2
#define ECONOMY_PRICE_HIGH 3
#define ECONOMY_PRICE_EROTIC 4
#define ECONOMY_PRICE_EXPENSIVE 5
#define ECONOMY_PRICE_EXPENSIVE_AF 6
#define ECONOMY_PRICE_FORCED_FREE 7 //i sure do love force_free'd-ing with items :)
code/__DEFINES/subsystems.dm
+30 -31
View File
@@ -90,38 +90,37 @@
// Subsystem fire priority, from lowest to highest priority
// If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child)
#define FIRE_PRIORITY_PING 10
#define FIRE_PRIORITY_IDLE_NPC 10
#define FIRE_PRIORITY_SERVER_MAINT 10
#define FIRE_PRIORITY_RESEARCH 10
#define FIRE_PRIORITY_VIS 10
#define FIRE_PRIORITY_VORE 10
#define FIRE_PRIORITY_GARBAGE 15
#define FIRE_PRIORITY_ECONOMY 20
#define FIRE_PRIORITY_WET_FLOORS 20
#define FIRE_PRIORITY_AIR 20
#define FIRE_PRIORITY_PROCESS 25
#define FIRE_PRIORITY_THROWING 25
#define FIRE_PRIORITY_SPACEDRIFT 30
#define FIRE_PRIORITY_FIELDS 30
#define FIRE_PRIOTITY_SMOOTHING 35
#define FIRE_PRIORITY_NETWORKS 40
#define FIRE_PRIORITY_OBJ 40
#define FIRE_PRIORITY_ACID 40
#define FIRE_PRIOTITY_BURNING 40
#define FIRE_PRIORITY_AIR_TURFS 40
#define FIRE_PRIORITY_DEFAULT 50
#define FIRE_PRIORITY_PARALLAX 65
#define FIRE_PRIORITY_NPC 80
#define FIRE_PRIORITY_FLIGHTPACKS 80
#define FIRE_PRIORITY_MOBS 100
#define FIRE_PRIORITY_TGUI 110
#define FIRE_PRIORITY_TICKER 200
#define FIRE_PRIORITY_PING 10
#define FIRE_PRIORITY_IDLE_NPC 10
#define FIRE_PRIORITY_SERVER_MAINT 10
#define FIRE_PRIORITY_RESEARCH 10
#define FIRE_PRIORITY_VIS 10
#define FIRE_PRIORITY_VORE 10
#define FIRE_PRIORITY_GARBAGE 15
#define FIRE_PRIORITY_WET_FLOORS 20
#define FIRE_PRIORITY_AIR 20
#define FIRE_PRIORITY_NPC 80
#define FIRE_PRIORITY_PROCESS 25
#define FIRE_PRIORITY_THROWING 25
#define FIRE_PRIORITY_SPACEDRIFT 30
#define FIRE_PRIORITY_FIELDS 30
#define FIRE_PRIOTITY_SMOOTHING 35
#define FIRE_PRIORITY_NETWORKS 40
#define FIRE_PRIORITY_OBJ 40
#define FIRE_PRIORITY_ACID 40
#define FIRE_PRIOTITY_BURNING 40
#define FIRE_PRIORITY_AIR_TURFS 40
#define FIRE_PRIORITY_DEFAULT 50
#define FIRE_PRIORITY_PARALLAX 65
#define FIRE_PRIORITY_FLIGHTPACKS 80
#define FIRE_PRIORITY_MOBS 100
#define FIRE_PRIORITY_TGUI 110
#define FIRE_PRIORITY_TICKER 200
#define FIRE_PRIORITY_ATMOS_ADJACENCY 300
#define FIRE_PRIORITY_STATPANEL 390
#define FIRE_PRIORITY_CHAT 400
#define FIRE_PRIORITY_OVERLAYS 500
#define FIRE_PRIORITY_INPUT 1000 // This must always always be the max highest priority. Player input must never be lost.
#define FIRE_PRIORITY_STATPANEL 390
#define FIRE_PRIORITY_CHAT 400
#define FIRE_PRIORITY_OVERLAYS 500
#define FIRE_PRIORITY_INPUT 1000 // This must always always be the max highest priority. Player input must never be lost.
// SS runlevels
code/controllers/configuration/entries/game_options.dm
-52
View File
@@ -384,55 +384,3 @@
min_val = 0
/datum/config_entry/flag/dynamic_mode
/datum/config_entry/number/economy_base_payment
config_entry_value = 60
min_val = 0
/datum/config_entry/number/economy_base_pay_ratio
config_entry_value = 6
min_val = 1
/datum/config_entry/number/economy_price_multiplier
config_entry_value = 1
min_val = 0
/datum/config_entry/number/economy_price_low
config_entry_value = 8
min_val = 0
/datum/config_entry/number/economy_price_default
config_entry_value = 15
min_val = 0
/datum/config_entry/number/economy_price_high
config_entry_value = 30
min_val = 0
/datum/config_entry/number/economy_price_erotic
config_entry_value = 25
min_val = 0
/datum/config_entry/number/economy_price_expensive
config_entry_value = 60
min_val = 0
/datum/config_entry/number/economy_price_expensive_af
config_entry_value = 90
min_val = 0
/datum/config_entry/number/economy_job_rate_default
config_entry_value = 1.2
min_val = 0
/datum/config_entry/keyed_list/economy_job_rate
key_mode = KEY_MODE_TEXT
value_mode = VALUE_MODE_NUM
lowercase = FALSE
splitter = ","
/datum/config_entry/keyed_list/economy_job_rate_area
key_mode = KEY_MODE_TEXT
value_mode = VALUE_MODE_NUM
lowercase = FALSE
splitter = ","
code/controllers/subsystem/job.dm
+6 -13
View File
@@ -14,16 +14,9 @@ SUBSYSTEM_DEF(job)
var/overflow_role = "Assistant"
var/static/list/economy_multipliers_by_job
var/static/list/economy_multipliers_by_type
/datum/controller/subsystem/job/Initialize(timeofday)
SSmapping.HACK_LoadMapConfig()
if(!economy_multipliers_by_job)
economy_multipliers_by_job = CONFIG_GET(keyed_list/economy_job_rate)
if(!economy_multipliers_by_type)
economy_multipliers_by_type = CONFIG_GET(keyed_list/economy_job_rate_area)
if(!occupations.len)
SetupOccupations()
if(CONFIG_GET(flag/load_jobs_from_txt))
@@ -338,7 +331,7 @@ SUBSYSTEM_DEF(job)
if((job.title in GLOB.silly_positions) && (player.client.prefs.sillyroles == FALSE))
JobDebug("DO is not whitelisted, Player: [player], Job:[job.title]")
continue
continue
if(!job.player_old_enough(player.client))
JobDebug("DO player not old enough, Player: [player], Job:[job.title]")
@@ -477,13 +470,13 @@ SUBSYSTEM_DEF(job)
job.after_spawn(H, M, joined_late)
//Account ID. ID is handled by outfit initialization
//Account ID. ID is handled by human initialization
if(ishuman(H))
var/mob/living/carbon/human/wageslave = H
if(wageslave.wear_id)
var/obj/item/card/id/id_card = wageslave.wear_id
to_chat(M, "<b><span class='big'>Your account ID is [id_card.registered_account.account_id]</span></b>")
to_chat(M, "<b><span class='notice'>You do not have a pin, can set your pin at an ATM.</b>")
to_chat(M, "<b><span class='big'>Your account ID is [wageslave.account_id]</span></b>")
to_chat(M, "<b><span class='notice'>You do not have a pin, can set your pin at an ATM.</b>")
if(H.mind)
H.mind.memory += "Your account ID is [wageslave.account_id].<BR>"
return H
code/game/machinery/computer/card.dm
+1 -1
View File
@@ -254,7 +254,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
else if(mode == 4)
dat += {"<a href='?src=[REF(src)];choice=return'>Return</a>
<table><tr><td style='width:25%'><b>Bank Accounts</b></td><td style='width:25%'></td></tr>"}
for(var/datum/bank_account/account as anything in SSeconomy.bank_accounts)
for(var/datum/bank_account/account in SSeconomy.bank_accounts)
dat += {"<td>[account.account_holder] - [account.account_id]"}
dat += "<a href='?src=[REF(src)];choice=bankassign;assign_bank=[REF(account)]'>Assign to ID</a></td>"
dat += "</td><tr>"
code/game/objects/items.dm
+2 -3
View File
@@ -118,9 +118,8 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/list/grind_results //A reagent list containing the reagents this item produces when ground up in a grinder - this can be an empty list to allow for reagent transferring only
var/list/juice_results //A reagent list containing blah blah... but when JUICED in a grinder!
//Hyper Economy
var/economy_type = 0
var/economy_price_mul = 1
//Hyper economy
var/price = 0
//Hyper, for clothes that reveal your behind! butt stuff, you know how it is.
var/do_not_cover_butt = FALSE
code/game/objects/items/cards_ids.dm
+2 -5
View File
@@ -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\"."
code/game/objects/items/cigs_lighters.dm
-1
View File
@@ -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
code/game/objects/items/mesmetron.dm
+1 -1
View File
@@ -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
code/game/objects/items/stacks/cash.dm
+1 -1
View File
@@ -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)
code/game/objects/items/storage/belt.dm
+1 -1
View File
@@ -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()
. = ..()
code/game/objects/items/storage/boxes.dm
+2 -4
View File
@@ -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()
. = ..()
code/game/objects/items/storage/fancy.dm
+4 -5
View File
@@ -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()
. = ..()
code/game/objects/items/tools/weldingtool.dm
+1 -2
View File
@@ -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"
code/modules/antagonists/bloodsucker/bloodsucker_ui.dm
+1 -1
View File
@@ -93,7 +93,7 @@
dat += "</table>"
dat += "</div>"
if(onstation && C && C.registered_account)
dat += "<b>Balance: $[account.balance]</b>"
dat += "<b>Balance: $[account.account_balance]</b>"
if(istype(src, /obj/machinery/vending/snack))
dat += "<h3>Chef's Food Selection</h3>"
dat += "<div class='statusDisplay'>"
code/modules/clothing/gloves/color.dm
+3 -6
View File
@@ -8,8 +8,7 @@
item_color="yellow"
resistance_flags = NONE
var/can_be_cut = 1
economy_type = ECONOMY_PRICE_EXPENSIVE_AF
economy_price_mul = 0.85
price = 10
/obj/item/clothing/gloves/color/yellow/ce //funky looking, basically combat gloves
desc = "Special Insulated gloves with pricy thermal shielding normally only found in combat gloves."
@@ -35,8 +34,7 @@
item_color="yellow"
resistance_flags = NONE
var/can_be_cut = 1
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 1.2
price = 5
/obj/item/clothing/gloves/color/fyellow/New()
..()
@@ -131,8 +129,7 @@
siemens_coefficient = 0
permeability_coefficient = 0.05
resistance_flags = NONE
economy_type = ECONOMY_PRICE_EXPENSIVE_AF
economy_price_mul = 0.85
price = 12
/obj/item/clothing/gloves/color/rainbow
name = "rainbow gloves"
code/modules/clothing/head/jobs.dm
+1 -2
View File
@@ -260,8 +260,7 @@
name = "security's bitch beret"
desc = "A softer beret with the word 'BITCH' embroidered on it in pink thread."
icon_state = "bitchberet"
economy_type = ECONOMY_PRICE_EROTIC
economy_price_mul = 0.85
price = 5
//Curator
/obj/item/clothing/head/fedora/curator
code/modules/clothing/masks/hailer.dm
+1 -2
View File
@@ -45,8 +45,7 @@
item_state = "sluthailer"
aggressiveness = 0 //can't have your pets being mean!
actions_types = list(/datum/action/item_action/halt)
economy_type = ECONOMY_PRICE_EXPENSIVE
economy_price_mul = 0.85
price = 5
/obj/item/clothing/mask/gas/sechailer/slut/attack_hand(mob/user)
if(iscarbon(user))
code/modules/clothing/neck/_neck.dm
+1 -2
View File
@@ -302,5 +302,4 @@
icon = 'icons/obj/clothing/neck.dmi'
icon_state = "bling"
item_color = "bling"
economy_type = ECONOMY_PRICE_EXPENSIVE
economy_price_mul = 1.25
price = 30
code/modules/clothing/shoes/miscellaneous.dm
+1 -2
View File
@@ -137,8 +137,7 @@
desc = "A pair of knee-high jackboots, complete with heels. All style, all the time."
icon_state = "jackboots-tall"
item_state = "jackboots-tall"
economy_type = ECONOMY_PRICE_DEFAULT
economy_price_mul = 0.75
price = 5
/obj/item/clothing/shoes/jackboots/fast
slowdown = -1
code/modules/clothing/suits/jobs.dm
+1 -1
View File
@@ -169,7 +169,7 @@
cold_protection = CHEST|LEGS|ARMS
heat_protection = CHEST|LEGS|ARMS
mutantrace_variation = NO_MUTANTRACE_VARIATION //you don't need it
economy_type = ECONOMY_PRICE_EXPENSIVE
price = 5
//Surgeon
/obj/item/clothing/suit/apron/surgical
code/modules/clothing/suits/miscellaneous.dm
+1 -2
View File
@@ -670,8 +670,7 @@
icon_state = "coatsecuritypink"
item_state = "coatsecuritypink"
hoodtype = /obj/item/clothing/head/hooded/winterhood/security/pink
economy_type = ECONOMY_PRICE_EXPENSIVE
economy_price_mul = 0.85
price = 5
/obj/item/clothing/suit/hooded/wintercoat/security/Initialize()
. = ..()
code/modules/clothing/under/jobs/civilian.dm
+1 -1
View File
@@ -381,7 +381,7 @@
item_state = "b_suit"
item_color = "galaxy_blue"
can_adjust = FALSE
economy_type = ECONOMY_PRICE_DEFAULT
price = 10
/obj/item/clothing/under/lawyer/galaxy_red
name = "\improper Pulsar Gonne"
code/modules/clothing/under/jobs/security.dm
+3 -5
View File
@@ -30,8 +30,7 @@
icon_state = "rsecuritypink"
item_state = "r_suit"
item_color = "rsecuritypink"
economy_type = ECONOMY_PRICE_DEFAULT
economy_price_mul = 1.35
price = 3
/obj/item/clothing/under/rank/security/skirt
name = "security jumpskirt"
desc = "A \"tactical\" security jumpsuit with the legs replaced by a skirt."
@@ -48,8 +47,7 @@
item_state = "secslutskirt"
item_color = null //i dont understand what item_color even is, apparently setting it to null means it won't change color in a washing machine?
mutantrace_variation = NO_MUTANTRACE_VARIATION //look at the first two comments in vg_under.dm
economy_type = ECONOMY_PRICE_EROTIC
economy_price_mul = 0.75
price = 3
/obj/item/clothing/under/rank/security/skirt/slut/pink
desc = "A \"\"\"tactical\"\"\" security jumpsuit with the legs replaced by a skirt. No matter how you adjust it, it always feels a little too small. This one seems to have an experimental color scheme."
icon_state = "secslutskirtpink"
@@ -63,7 +61,7 @@
can_adjust = FALSE
body_parts_covered = CHEST|GROIN
mutantrace_variation = NO_MUTANTRACE_VARIATION
economy_type = ECONOMY_PRICE_EROTIC
price = 5
/obj/item/clothing/under/rank/warden
code/modules/food_and_drinks/drinks/drinks.dm
+7 -10
View File
@@ -217,7 +217,7 @@
resistance_flags = FREEZE_PROOF
isGlass = FALSE
foodtype = BREAKFAST
economy_type = ECONOMY_PRICE_LOW
price = 2
//Used by MREs
/obj/item/reagent_containers/food/drinks/coffee/type2
@@ -241,7 +241,7 @@
icon_state = "tea"
item_state = "coffee"
spillable = TRUE
economy_type = ECONOMY_PRICE_LOW
price = 2
/* Doesn't exist lol
/datum/chemical_reaction/catnip_tea
@@ -252,7 +252,7 @@
*/
/obj/item/reagent_containers/food/drinks/mug/on_reagent_change(changetype)
cut_overlays()
cut_overlays()
if(reagents.total_volume)
var/mutable_appearance/MA = mutable_appearance(icon,"mugoverlay")
MA.color = mix_color_from_reagents(reagents.reagent_list)
@@ -265,7 +265,7 @@
icon_state = "tea"
desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
list_reagents = list(/datum/reagent/consumable/tea = 30)
economy_type = ECONOMY_PRICE_LOW
price = 2
/obj/item/reagent_containers/food/drinks/mug/coco
name = "Dutch hot coco"
@@ -284,8 +284,7 @@
list_reagents = list(/datum/reagent/consumable/dry_ramen = 30)
foodtype = GRAIN
isGlass = FALSE
economy_type = ECONOMY_PRICE_DEFAULT
economy_price_mul = 1.5
price = 3
/obj/item/reagent_containers/food/drinks/beer
name = "space beer"
@@ -424,8 +423,7 @@
reagent_flags = NONE
spillable = FALSE
isGlass = FALSE
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 0.8
price = 2
/obj/item/reagent_containers/food/drinks/soda_cans/suicide_act(mob/living/carbon/user)
user.visible_message("<span class='suicide'>[user] is trying to eat \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -550,5 +548,4 @@
icon_state = "menergy"
list_reagents = list(/datum/reagent/consumable/monkey_energy = 50)
foodtype = SUGAR
economy_type = ECONOMY_PRICE_EXPENSIVE //same as insulated gloves but slightly cheaper given the nature of these
economy_price_mul = 0.75
price = 3
code/modules/food_and_drinks/drinks/drinks/bottle.dm
+1 -2
View File
@@ -416,8 +416,7 @@
isGlass = FALSE
list_reagents = list(/datum/reagent/consumable/cream = 100)
foodtype = DAIRY
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 1.5
price = 3
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice
name = "tomato juice"
code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+2 -3
View File
@@ -93,11 +93,10 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
name = "Nuka Cola"
list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)
economy_type = ECONOMY_PRICE_DEFAULT
economy_price_mul = 1.5
price = 7
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb
name = "Syndicate Bomb"
name = "Syndicat Bomb"
list_reagents = list(/datum/reagent/consumable/ethanol/syndicatebomb = 50)
/obj/item/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params)
code/modules/food_and_drinks/food/condiment.dm
+1 -2
View File
@@ -186,8 +186,7 @@
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
list_reagents = list(/datum/reagent/consumable/milk = 50)
possible_states = list()
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 1.5
price = 5
/obj/item/reagent_containers/food/condiment/flour
name = "flour sack"
code/modules/food_and_drinks/food/snacks.dm
-2
View File
@@ -35,8 +35,6 @@ All foods are distributed among various categories. Use common sense.
righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
obj_flags = UNIQUE_RENAME
grind_results = list() //To let them be ground up to transfer their reagents
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 1.5
var/bitesize = 2
var/bitecount = 0
var/trash = null
code/modules/food_and_drinks/food/snacks_other.dm
+2 -3
View File
@@ -59,8 +59,7 @@
tastes = list("chocolate" = 1)
foodtype = JUNKFOOD | SUGAR
dunkable = TRUE
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 1.5
price = 2
/obj/item/reagent_containers/food/snacks/hugemushroomslice
@@ -664,4 +663,4 @@
else if (icon_state != "marshmallowrburned")
icon_state = "marshmallowburned"
desc = "[initial(desc)] It looks just right for eating!"
tastes = list("marshmallow" = 1, "cream" = 1)
tastes = list("marshmallow" = 1, "cream" = 1)
code/modules/food_and_drinks/food/snacks_vend.dm
+10 -4
View File
@@ -12,6 +12,7 @@
filling_color = "#D2691E"
tastes = list("candy" = 1)
foodtype = JUNKFOOD | SUGAR
price = 2
/obj/item/reagent_containers/food/snacks/sosjerky
name = "\improper Scaredy's Private Reserve Beef Jerky"
@@ -23,6 +24,7 @@
filling_color = "#8B0000"
tastes = list("dried meat" = 1)
foodtype = JUNKFOOD | MEAT | SUGAR
price = 3
/obj/item/reagent_containers/food/snacks/sosjerky/healthy
name = "homemade beef jerky"
@@ -41,6 +43,7 @@
filling_color = "#FFD700"
tastes = list("salt" = 1, "crisps" = 1)
foodtype = JUNKFOOD | FRIED
price = 2
/obj/item/reagent_containers/food/snacks/no_raisin
name = "4no raisins"
@@ -52,6 +55,7 @@
filling_color = "#8B0000"
tastes = list("dried raisins" = 1)
foodtype = JUNKFOOD | FRUIT | SUGAR
price = 2
/obj/item/reagent_containers/food/snacks/no_raisin/healthy
name = "homemade raisins"
@@ -68,6 +72,7 @@
junkiness = 25
filling_color = "#FFD700"
foodtype = JUNKFOOD | GRAIN | SUGAR
price = 4
/obj/item/reagent_containers/food/snacks/cheesiehonkers
name = "cheesie honkers"
@@ -79,6 +84,7 @@
filling_color = "#FFD700"
tastes = list("cheese" = 5, "crisps" = 2)
foodtype = JUNKFOOD | DAIRY | SUGAR
price = 4
/obj/item/reagent_containers/food/snacks/soyfood
name = "Soyfood"
@@ -90,7 +96,7 @@
filling_color = "#FFD700"
tastes = list("nanomachines" = 2, "soybeans" = 5)
foodtype = JUNKFOOD | DAIRY | GRAIN
economy_price_mul = 2
price = 3
/obj/item/reagent_containers/food/snacks/syndicake
name = "syndi-cakes"
@@ -101,7 +107,7 @@
filling_color = "#F5F5DC"
tastes = list("sweetness" = 3, "cake" = 1)
foodtype = GRAIN | FRUIT | VEGETABLES | ANTITOXIC
economy_price_mul = 2.5
price = 5
/obj/item/reagent_containers/food/snacks/carbonnanotube_noodles
name = "carbon nanotube noodles"
@@ -113,7 +119,7 @@
filling_color = "#FFD700"
tastes = list("charcoal" = 1, "spiciness" = 3, "soysauce" = 3)
foodtype = GRAIN | VEGETABLES
economy_price_mul = 2.5
price = 3
/obj/item/reagent_containers/food/snacks/bird_seed
name = "Sunflower Seeds"
@@ -124,4 +130,4 @@
filling_color = "#b497162f"
tastes = list("olives" = 1, "Nuts" = 3, "spice" = 2)
foodtype = GRAIN | VEGETABLES
economy_price_mul = 2.5
price = 3
code/modules/jobs/job_types/assistant.dm
+1
View File
@@ -15,6 +15,7 @@ Assistant
outfit = /datum/outfit/job/assistant
antag_rep = 7
/datum/job/assistant/get_access()
if(CONFIG_GET(flag/assistants_have_maint_access) || !CONFIG_GET(flag/jobs_have_minimal_access)) //Config has assistant maint access set
. = ..()
code/modules/jobs/job_types/captain.dm
-2
View File
@@ -16,7 +16,6 @@ Captain
exp_requirements = 3000
exp_type = EXP_TYPE_COMMAND
exp_type_department = EXP_TYPE_COMMAND
economy_type = ECONOMY_TYPE_COMMAND
outfit = /datum/outfit/job/captain
@@ -97,7 +96,6 @@ Head of Personnel
exp_requirements = 1500
exp_type = EXP_TYPE_SERVICE
exp_type_department = EXP_TYPE_SERVICE
economy_type = ECONOMY_TYPE_COMMAND
outfit = /datum/outfit/job/hop
code/modules/jobs/job_types/cargo_service.dm
+2 -10
View File
@@ -15,7 +15,6 @@ Quartermaster is a real head fuck you
minimal_player_age = 7
exp_type = EXP_TYPE_SUPPLY
exp_type_department = EXP_TYPE_SUPPLY
economy_type = ECONOMY_TYPE_COMMAND
exp_requirements = 1200
outfit = /datum/outfit/job/quartermaster
@@ -89,7 +88,6 @@ Shaft Miner
exp_requirements = 600
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_SUPPLY
economy_type = ECONOMY_TYPE_DANGEROUS
outfit = /datum/outfit/job/miner
@@ -169,7 +167,6 @@ Bartender
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#bbe291"
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/bartender
@@ -202,15 +199,13 @@ Cook
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#bbe291"
economy_type = ECONOMY_TYPE_ROOKIE
var/cooks = 0 //Counts cooks amount
outfit = /datum/outfit/job/cook
access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM)
minimal_access = list(ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM)
var/cooks = 0 //Counts cooks amount
/datum/outfit/job/cook
name = "Cook"
jobtype = /datum/job/cook
@@ -257,7 +252,6 @@ Botanist
spawn_positions = 2
supervisors = "the head of personnel"
selection_color = "#bbe291"
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/botanist
@@ -296,15 +290,13 @@ Janitor
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#bbe291"
economy_type = ECONOMY_TYPE_ROOKIE
var/global/janitors = 0
outfit = /datum/outfit/job/janitor
access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)
minimal_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)
var/global/janitors = 0
/datum/outfit/job/janitor
name = "Janitor"
jobtype = /datum/job/janitor
code/modules/jobs/job_types/civilian.dm
-4
View File
@@ -11,7 +11,6 @@ Clown
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#dddddd"
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/clown
@@ -79,7 +78,6 @@ Mime
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#dddddd"
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/mime
@@ -132,7 +130,6 @@ Curator
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#dddddd"
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/curator
@@ -176,7 +173,6 @@ Lawyer
spawn_positions = 2
supervisors = "the head of personnel"
selection_color = "#dddddd"
economy_type = ECONOMY_TYPE_ROOKIE
var/lawyers = 0 //Counts lawyer amount
outfit = /datum/outfit/job/lawyer
code/modules/jobs/job_types/civilian_chaplain.dm
-1
View File
@@ -13,7 +13,6 @@ Chaplain
supervisors = "the head of personnel"
selection_color = "#dddddd"
custom_spawn_text = "You're playing a job that is essential for when the station deals with paranormal threats. While you have access to weapons, armor and tools such as your nullrod and bible, this does not mean you should hunt those threats unless warranted. If you have any questions, don't hesitate to ask mentors."
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/chaplain
code/modules/jobs/job_types/engineering.dm
-2
View File
@@ -17,7 +17,6 @@ Chief Engineer
exp_requirements = 1500
exp_type = EXP_TYPE_ENGINEERING
exp_type_department = EXP_TYPE_ENGINEERING
economy_type = ECONOMY_TYPE_COMMAND
outfit = /datum/outfit/job/ce
@@ -190,7 +189,6 @@ Junior Engineer
selection_color = "#fff5cc"
exp_requirements = 120
exp_type = EXP_TYPE_CREW
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/engineer/junior
code/modules/jobs/job_types/job.dm
+19 -18
View File
@@ -61,23 +61,11 @@
var/list/alt_titles = list()
/// A multiplier for how much a person gets each paycheck
var/base_paycheck_multiplier = 1.2
/// The "type" of economy this job falls under
var/economy_type
var/override_roundstart_spawn = null //Where the player spawns at roundstart if defined
//whitelisting
var/whitelist_type = ""
/datum/job/New()
base_paycheck_multiplier = CONFIG_GET(number/economy_job_rate_default)
if(SSjob.economy_multipliers_by_job[title])
base_paycheck_multiplier *= SSjob.economy_multipliers_by_job[title]
if(SSjob.economy_multipliers_by_type[economy_type])
base_paycheck_multiplier *= SSjob.economy_multipliers_by_type[economy_type]
//Only override this proc
//H is usually a human unless an /equip override transformed it
/datum/job/proc/after_spawn(mob/living/H, mob/M, latejoin = FALSE)
@@ -107,6 +95,15 @@
if(!H)
return FALSE
if(!visualsOnly)
var/datum/bank_account/bank_account = new(H.real_name, src)
bank_account.account_holder = H.real_name
bank_account.account_job = src
bank_account.account_id = rand(111111,999999) //give account ID!
//bank_account.account_pin = rand(1000,9999) //give random pin!
bank_account.account_balance = 80
H.account_id = bank_account.account_id
if(CONFIG_GET(flag/enforce_human_authority) && (title in GLOB.command_positions))
if(H.dna.species.id != "human")
H.set_species(/datum/species/human)
@@ -125,14 +122,14 @@
/datum/job/proc/get_access()
if(!config) //Needed for robots.
return minimal_access.Copy()
return src.minimal_access.Copy()
. = list()
if(CONFIG_GET(flag/jobs_have_minimal_access))
. = minimal_access.Copy()
. = src.minimal_access.Copy()
else
. = access.Copy()
. = src.access.Copy()
if(CONFIG_GET(flag/everyone_has_maint_access)) //Config has global maint access set
. |= list(ACCESS_MAINT_TUNNELS)
@@ -236,8 +233,8 @@
else
H.real_name = "[J.title] #[rand(10000, 99999)]"
var/client/preference_source = H.client
var/obj/item/card/id/C = H.wear_id
var/client/preference_source = H.client
if(istype(C))
C.access = J.get_access()
shuffle_inplace(C.access) // Shuffle access list to make NTNet passkeys less predictable
@@ -248,8 +245,12 @@
else
C.update_label()
C.create_bank_account(H, J)
for(var/A in SSeconomy.bank_accounts)
var/datum/bank_account/B = A
if(B.account_id == H.account_id)
C.registered_account = B
B.bank_cards += C
break
H.sec_hud_set_ID()
var/obj/item/pda/PDA = H.get_item_by_slot(pda_slot)
code/modules/jobs/job_types/medical.dm
-3
View File
@@ -17,7 +17,6 @@ Chief Medical Officer
exp_requirements = 1500
exp_type = EXP_TYPE_MEDICAL
exp_type_department = EXP_TYPE_MEDICAL
economy_type = ECONOMY_TYPE_COMMAND
outfit = /datum/outfit/job/cmo
@@ -238,7 +237,6 @@ Junior Doctor
selection_color = "#ffeef0"
exp_requirements = 120
exp_type = EXP_TYPE_CREW
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/doctor/junior
@@ -280,7 +278,6 @@ Psychologist
selection_color = "#ffeef0"
exp_requirements = 240
exp_type = EXP_TYPE_CREW
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/doctor/psychologist
code/modules/jobs/job_types/science.dm
-2
View File
@@ -17,7 +17,6 @@ Research Director
exp_requirements = 1500
exp_type = EXP_TYPE_SCIENCE
exp_type_department = EXP_TYPE_SCIENCE
economy_type = ECONOMY_TYPE_COMMAND
outfit = /datum/outfit/job/rd
@@ -155,7 +154,6 @@ Junior Scientist
selection_color = "#ffeeff"
exp_requirements = 120
exp_type = EXP_TYPE_CREW
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/scientist/junior
code/modules/jobs/job_types/security.dm
-5
View File
@@ -23,7 +23,6 @@ Head of Security
exp_requirements = 2000
exp_type = EXP_TYPE_SECURITY
exp_type_department = EXP_TYPE_SECURITY
economy_type = ECONOMY_TYPE_COMMAND
outfit = /datum/outfit/job/hos
@@ -92,7 +91,6 @@ Warden
exp_requirements = 720
exp_type = EXP_TYPE_SECURITY
exp_type_department = EXP_TYPE_SECURITY
economy_type = ECONOMY_TYPE_DANGEROUS
outfit = /datum/outfit/job/warden
@@ -152,7 +150,6 @@ Detective
exp_requirements = 300
exp_type = EXP_TYPE_SECURITY
exp_type_department = EXP_TYPE_SECURITY
economy_type = ECONOMY_TYPE_DANGEROUS
outfit = /datum/outfit/job/detective
@@ -210,7 +207,6 @@ Security Officer
exp_requirements = 420
exp_type = EXP_TYPE_SECURITY
exp_type_department = EXP_TYPE_SECURITY
economy_type = ECONOMY_TYPE_DANGEROUS
outfit = /datum/outfit/job/security
@@ -371,7 +367,6 @@ Junior Security Officer
minimal_player_age = 3
exp_requirements = 300
exp_type = EXP_TYPE_CREW
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/security/junior
code/modules/mob/living/carbon/human/human_defines.dm
+1
View File
@@ -79,5 +79,6 @@
var/static/list/can_ride_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot))
var/lastpuke = 0
var/last_fire_update
var/account_id
can_be_held = "micro"
appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE
code/modules/reagents/reagent_containers/glass.dm
+1 -1
View File
@@ -336,7 +336,7 @@
volume = 50
amount_per_transfer_from_this = 10
container_HP = 1
economy_type = ECONOMY_PRICE_LOW
price = 1
/obj/item/reagent_containers/glass/beaker/waterbottle/Initialize()
beaker_weakness_bitflag |= TEMP_WEAK
code/modules/reagents/reagent_containers/pill.dm
+4 -7
View File
@@ -269,20 +269,17 @@
/obj/item/reagent_containers/pill/penis_enlargement
name = "penis enlargement pill"
list_reagents = list(/datum/reagent/fermi/penis_enlarger = 10)
price = 4
icon_state = "pill_lewd"
economy_type = ECONOMY_PRICE_EROTIC
economy_price_mul = 0.25
/obj/item/reagent_containers/pill/breast_enlargement
name = "breast enlargement pill"
list_reagents = list(/datum/reagent/fermi/breast_enlarger = 10)
price = 4
icon_state = "pill_lewd"
economy_type = ECONOMY_PRICE_EROTIC
economy_price_mul = 0.25
/obj/item/reagent_containers/pill/butt_enlargement
name = "butt enlargement pill"
list_reagents = list(/datum/reagent/fermi/butt_enlarger = 10)
icon_state = "pill_lewd"
economy_type = ECONOMY_PRICE_EROTIC
economy_price_mul = 0.25
price = 4
icon_state = "pill_lewd"
code/modules/vending/_vending.dm
+10 -8
View File
@@ -167,12 +167,14 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
var/datum/data/vending_product/R = new /datum/data/vending_product()
R.name = initial(temp.name)
R.product_path = typepath
if(!free)
R.price = FLOOR(baseprice * CONFIG_GET(number/economy_price_multiplier), 1)
if(product) //its a item!
var/product_price = SSeconomy.GetPrice(product)
if(!isnull(product_price))
R.price = product_price
R.price = baseprice
if(product) //its a item!
if((initial(product.price)))
R.price = initial(product.price)
else
R.price = baseprice
if(free)
R.price = 0
if(!start_empty)
R.amount = amount
R.max_amount = amount
@@ -495,8 +497,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
updateUsrDialog()
vend_ready = 1
if(bankid && R == buying) //if we have a bank id, and we are trying to buy the same thing!
if(bankid.balance >= R.price)
bankid.balance -= R.price //take the money from the account.
if(bankid.account_balance >= R.price)
bankid.account_balance -= R.price //take the money from the account.
menu = 1
to_chat(usr, "<span class='notice'>You [R.name] via the provided bank account!</span>")
bankid = null //so noone can buy from your account after youve purchased stuff