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

config junk

Browse Source
This commit is contained in:
DragonTrance
2022-06-09 17:54:40 -04:00
parent c771649850
commit 7bae2a36ee
51 changed files with 192 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/gloves/color.dm
+6 -3
View File
@@ -8,7 +8,8 @@
item_color="yellow"
resistance_flags = NONE
var/can_be_cut = 1
price = PRICE_EXPENSIVE
economy_type = ECONOMY_PRICE_EXPENSIVE_AF
economy_price_mul = 0.85
/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."
@@ -34,7 +35,8 @@
item_color="yellow"
resistance_flags = NONE
var/can_be_cut = 1
price = PRICE_LOW * 0.5
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 1.2
/obj/item/clothing/gloves/color/fyellow/New()
..()
@@ -129,7 +131,8 @@
siemens_coefficient = 0
permeability_coefficient = 0.05
resistance_flags = NONE
price = PRICE_EXPENSIVE
economy_type = ECONOMY_PRICE_EXPENSIVE_AF
economy_price_mul = 0.85
/obj/item/clothing/gloves/color/rainbow
name = "rainbow gloves"
code/modules/clothing/head/jobs.dm
+2 -1
View File
@@ -260,7 +260,8 @@
name = "security's bitch beret"
desc = "A softer beret with the word 'BITCH' embroidered on it in pink thread."
icon_state = "bitchberet"
price = PRICE_BASE * 1.5
economy_type = ECONOMY_PRICE_EROTIC
economy_price_mul = 0.85
//Curator
/obj/item/clothing/head/fedora/curator
code/modules/clothing/masks/hailer.dm
+2 -1
View File
@@ -45,7 +45,8 @@
item_state = "sluthailer"
aggressiveness = 0 //can't have your pets being mean!
actions_types = list(/datum/action/item_action/halt)
price = PRICE_EROTICA
economy_type = ECONOMY_PRICE_EXPENSIVE
economy_price_mul = 0.85
/obj/item/clothing/mask/gas/sechailer/slut/attack_hand(mob/user)
if(iscarbon(user))
code/modules/clothing/neck/_neck.dm
+2 -1
View File
@@ -302,4 +302,5 @@
icon = 'icons/obj/clothing/neck.dmi'
icon_state = "bling"
item_color = "bling"
price = PRICE_EXPENSIVE
economy_type = ECONOMY_PRICE_EXPENSIVE
economy_price_mul = 1.25
code/modules/clothing/shoes/miscellaneous.dm
+2 -1
View File
@@ -137,7 +137,8 @@
desc = "A pair of knee-high jackboots, complete with heels. All style, all the time."
icon_state = "jackboots-tall"
item_state = "jackboots-tall"
price = PRICE_BASE * 0.75
economy_type = ECONOMY_PRICE_DEFAULT
economy_price_mul = 0.75
/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
price = PRICE_HIGH
economy_type = ECONOMY_PRICE_EXPENSIVE
//Surgeon
/obj/item/clothing/suit/apron/surgical
code/modules/clothing/suits/miscellaneous.dm
+2 -1
View File
@@ -710,7 +710,8 @@
icon_state = "coatsecuritypink"
item_state = "coatsecuritypink"
hoodtype = /obj/item/clothing/head/hooded/winterhood/security/pink
price = PRICE_LOW
economy_type = ECONOMY_PRICE_EXPENSIVE
economy_price_mul = 0.85
/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
price = PRICE_EXPENSIVE
economy_type = ECONOMY_PRICE_DEFAULT
/obj/item/clothing/under/lawyer/galaxy_red
name = "\improper Pulsar Gonne"
code/modules/clothing/under/jobs/security.dm
+5 -3
View File
@@ -30,7 +30,8 @@
icon_state = "rsecuritypink"
item_state = "r_suit"
item_color = "rsecuritypink"
price = PRICE_LOW
economy_type = ECONOMY_PRICE_DEFAULT
economy_price_mul = 1.35
/obj/item/clothing/under/rank/security/skirt
name = "security jumpskirt"
desc = "A \"tactical\" security jumpsuit with the legs replaced by a skirt."
@@ -47,7 +48,8 @@
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
price = PRICE_EROTICA
economy_type = ECONOMY_PRICE_EROTIC
economy_price_mul = 0.75
/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"
@@ -61,7 +63,7 @@
can_adjust = FALSE
body_parts_covered = CHEST|GROIN
mutantrace_variation = NO_MUTANTRACE_VARIATION
price = PRICE_EROTICA
economy_type = ECONOMY_PRICE_EROTIC
/obj/item/clothing/under/rank/warden
code/modules/food_and_drinks/drinks/drinks.dm
+9 -6
View File
@@ -217,7 +217,7 @@
resistance_flags = FREEZE_PROOF
isGlass = FALSE
foodtype = BREAKFAST
price = PRICE_LOW
economy_type = ECONOMY_PRICE_LOW
//Used by MREs
/obj/item/reagent_containers/food/drinks/coffee/type2
@@ -241,7 +241,7 @@
icon_state = "tea"
item_state = "coffee"
spillable = TRUE
price = PRICE_LOW
economy_type = ECONOMY_PRICE_LOW
/* Doesn't exist lol
/datum/chemical_reaction/catnip_tea
@@ -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)
price = PRICE_LOW
economy_type = ECONOMY_PRICE_LOW
/obj/item/reagent_containers/food/drinks/mug/coco
name = "Dutch hot coco"
@@ -284,7 +284,8 @@
list_reagents = list(/datum/reagent/consumable/dry_ramen = 30)
foodtype = GRAIN
isGlass = FALSE
price = PRICE_BASE * 0.75
economy_type = ECONOMY_PRICE_DEFAULT
economy_price_mul = 1.5
/obj/item/reagent_containers/food/drinks/beer
name = "space beer"
@@ -423,7 +424,8 @@
reagent_flags = NONE
spillable = FALSE
isGlass = FALSE
price = PRICE_LOW
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 0.8
/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>")
@@ -548,4 +550,5 @@
icon_state = "menergy"
list_reagents = list(/datum/reagent/consumable/monkey_energy = 50)
foodtype = SUGAR
price = PRICE_HIGH * 1.25
economy_type = ECONOMY_PRICE_EXPENSIVE //same as insulated gloves but slightly cheaper given the nature of these
economy_price_mul = 0.75
code/modules/food_and_drinks/drinks/drinks/bottle.dm
+2 -1
View File
@@ -416,7 +416,8 @@
isGlass = FALSE
list_reagents = list(/datum/reagent/consumable/cream = 100)
foodtype = DAIRY
price = PRICE_LOW
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 1.5
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice
name = "tomato juice"
code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+3 -2
View File
@@ -93,10 +93,11 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
name = "Nuka Cola"
list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)
price = PRICE_BASE * 1.1
economy_type = ECONOMY_PRICE_DEFAULT
economy_price_mul = 1.5
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb
name = "Syndicat Bomb"
name = "Syndicate 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
+2 -1
View File
@@ -186,7 +186,8 @@
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
list_reagents = list(/datum/reagent/consumable/milk = 50)
possible_states = list()
price = PRICE_LOW
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 1.5
/obj/item/reagent_containers/food/condiment/flour
name = "flour sack"
code/modules/food_and_drinks/food/snacks.dm
+2
View File
@@ -35,6 +35,8 @@ 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 -1
View File
@@ -59,7 +59,8 @@
tastes = list("chocolate" = 1)
foodtype = JUNKFOOD | SUGAR
dunkable = TRUE
price = PRICE_LOW
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 1.5
/obj/item/reagent_containers/food/snacks/hugemushroomslice
code/modules/food_and_drinks/food/snacks_vend.dm
+4 -10
View File
@@ -12,7 +12,6 @@
filling_color = "#D2691E"
tastes = list("candy" = 1)
foodtype = JUNKFOOD | SUGAR
price = PRICE_LOW
/obj/item/reagent_containers/food/snacks/sosjerky
name = "\improper Scaredy's Private Reserve Beef Jerky"
@@ -24,7 +23,6 @@
filling_color = "#8B0000"
tastes = list("dried meat" = 1)
foodtype = JUNKFOOD | MEAT | SUGAR
price = PRICE_LOW
/obj/item/reagent_containers/food/snacks/sosjerky/healthy
name = "homemade beef jerky"
@@ -43,7 +41,6 @@
filling_color = "#FFD700"
tastes = list("salt" = 1, "crisps" = 1)
foodtype = JUNKFOOD | FRIED
price = PRICE_LOW
/obj/item/reagent_containers/food/snacks/no_raisin
name = "4no raisins"
@@ -55,7 +52,6 @@
filling_color = "#8B0000"
tastes = list("dried raisins" = 1)
foodtype = JUNKFOOD | FRUIT | SUGAR
price = PRICE_LOW
/obj/item/reagent_containers/food/snacks/no_raisin/healthy
name = "homemade raisins"
@@ -72,7 +68,6 @@
junkiness = 25
filling_color = "#FFD700"
foodtype = JUNKFOOD | GRAIN | SUGAR
price = PRICE_LOW
/obj/item/reagent_containers/food/snacks/cheesiehonkers
name = "cheesie honkers"
@@ -84,7 +79,6 @@
filling_color = "#FFD700"
tastes = list("cheese" = 5, "crisps" = 2)
foodtype = JUNKFOOD | DAIRY | SUGAR
price = PRICE_LOW
/obj/item/reagent_containers/food/snacks/soyfood
name = "Soyfood"
@@ -96,7 +90,7 @@
filling_color = "#FFD700"
tastes = list("nanomachines" = 2, "soybeans" = 5)
foodtype = JUNKFOOD | DAIRY | GRAIN
price = PRICE_LOW
economy_price_mul = 2
/obj/item/reagent_containers/food/snacks/syndicake
name = "syndi-cakes"
@@ -107,7 +101,7 @@
filling_color = "#F5F5DC"
tastes = list("sweetness" = 3, "cake" = 1)
foodtype = GRAIN | FRUIT | VEGETABLES | ANTITOXIC
price = PRICE_LOW
economy_price_mul = 2.5
/obj/item/reagent_containers/food/snacks/carbonnanotube_noodles
name = "carbon nanotube noodles"
@@ -119,7 +113,7 @@
filling_color = "#FFD700"
tastes = list("charcoal" = 1, "spiciness" = 3, "soysauce" = 3)
foodtype = GRAIN | VEGETABLES
price = PRICE_LOW
economy_price_mul = 2.5
/obj/item/reagent_containers/food/snacks/bird_seed
name = "Sunflower Seeds"
@@ -130,4 +124,4 @@
filling_color = "#b497162f"
tastes = list("olives" = 1, "Nuts" = 3, "spice" = 2)
foodtype = GRAIN | VEGETABLES
price = PRICE_LOW
economy_price_mul = 2.5
code/modules/jobs/job_types/assistant.dm
-2
View File
@@ -14,8 +14,6 @@ Assistant
minimal_access = list() //See /datum/job/assistant/get_access()
outfit = /datum/outfit/job/assistant
antag_rep = 7
base_paycheck_multiplier = BASEPAY_ASSISTANT
/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 -2
View File
@@ -16,7 +16,7 @@ Captain
exp_requirements = 3000
exp_type = EXP_TYPE_COMMAND
exp_type_department = EXP_TYPE_COMMAND
base_paycheck_multiplier = BASEPAY_CAPTAIN
economy_type = ECONOMY_TYPE_COMMAND
outfit = /datum/outfit/job/captain
@@ -97,7 +97,7 @@ Head of Personnel
exp_requirements = 1500
exp_type = EXP_TYPE_SERVICE
exp_type_department = EXP_TYPE_SERVICE
base_paycheck_multiplier = BASEPAY_COMMAND
economy_type = ECONOMY_TYPE_COMMAND
outfit = /datum/outfit/job/hop
code/modules/jobs/job_types/cargo_service.dm
+10 -8
View File
@@ -15,7 +15,7 @@ Quartermaster is a real head fuck you
minimal_player_age = 7
exp_type = EXP_TYPE_SUPPLY
exp_type_department = EXP_TYPE_SUPPLY
base_paycheck_multiplier = BASEPAY_COMMAND
economy_type = ECONOMY_TYPE_COMMAND
exp_requirements = 1200
outfit = /datum/outfit/job/quartermaster
@@ -89,7 +89,7 @@ Shaft Miner
exp_requirements = 600
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_SUPPLY
base_paycheck_multiplier = BASEPAY_DEFAULT * 1.2 //Just a teeny tiny bit more because they dangerous bro
economy_type = ECONOMY_TYPE_DANGEROUS
outfit = /datum/outfit/job/miner
@@ -169,7 +169,7 @@ Bartender
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#bbe291"
base_paycheck_multiplier = BASEPAY_ROOKIE
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/bartender
@@ -202,14 +202,15 @@ Cook
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#bbe291"
base_paycheck_multiplier = BASEPAY_ROOKIE
var/cooks = 0 //Counts cooks amount
economy_type = ECONOMY_TYPE_ROOKIE
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
@@ -256,7 +257,7 @@ Botanist
spawn_positions = 2
supervisors = "the head of personnel"
selection_color = "#bbe291"
base_paycheck_multiplier = BASEPAY_ROOKIE
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/botanist
@@ -295,14 +296,15 @@ Janitor
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#bbe291"
base_paycheck_multiplier = BASEPAY_ROOKIE
var/global/janitors = 0
economy_type = ECONOMY_TYPE_ROOKIE
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 -4
View File
@@ -11,7 +11,7 @@ Clown
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#dddddd"
base_paycheck_multiplier = BASEPAY_ROOKIE
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/clown
@@ -79,7 +79,7 @@ Mime
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#dddddd"
base_paycheck_multiplier = BASEPAY_ROOKIE
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/mime
@@ -132,7 +132,7 @@ Curator
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#dddddd"
base_paycheck_multiplier = BASEPAY_ROOKIE
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/curator
@@ -176,7 +176,7 @@ Lawyer
spawn_positions = 2
supervisors = "the head of personnel"
selection_color = "#dddddd"
base_paycheck_multiplier = BASEPAY_ROOKIE
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 -1
View File
@@ -13,7 +13,7 @@ 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."
base_paycheck_multiplier = BASEPAY_ROOKIE
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/chaplain
code/modules/jobs/job_types/engineering.dm
+2 -2
View File
@@ -17,7 +17,7 @@ Chief Engineer
exp_requirements = 1500
exp_type = EXP_TYPE_ENGINEERING
exp_type_department = EXP_TYPE_ENGINEERING
base_paycheck_multiplier = BASEPAY_COMMAND
economy_type = ECONOMY_TYPE_COMMAND
outfit = /datum/outfit/job/ce
@@ -190,7 +190,7 @@ Junior Engineer
selection_color = "#fff5cc"
exp_requirements = 120
exp_type = EXP_TYPE_CREW
base_paycheck_multiplier = BASEPAY_ROOKIE
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/engineer/junior
code/modules/jobs/job_types/job.dm
+6
View File
@@ -63,6 +63,8 @@
/// 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
@@ -71,6 +73,10 @@
/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
code/modules/jobs/job_types/medical.dm
+3 -3
View File
@@ -17,7 +17,7 @@ Chief Medical Officer
exp_requirements = 1500
exp_type = EXP_TYPE_MEDICAL
exp_type_department = EXP_TYPE_MEDICAL
base_paycheck_multiplier = BASEPAY_COMMAND
economy_type = ECONOMY_TYPE_COMMAND
outfit = /datum/outfit/job/cmo
@@ -238,7 +238,7 @@ Junior Doctor
selection_color = "#ffeef0"
exp_requirements = 120
exp_type = EXP_TYPE_CREW
base_paycheck_multiplier = BASEPAY_ROOKIE
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/doctor/junior
@@ -280,7 +280,7 @@ Psychologist
selection_color = "#ffeef0"
exp_requirements = 240
exp_type = EXP_TYPE_CREW
base_paycheck_multiplier = BASEPAY_ROOKIE
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/doctor/psychologist
code/modules/jobs/job_types/science.dm
+2 -2
View File
@@ -17,7 +17,7 @@ Research Director
exp_requirements = 1500
exp_type = EXP_TYPE_SCIENCE
exp_type_department = EXP_TYPE_SCIENCE
base_paycheck_multiplier = BASEPAY_COMMAND
economy_type = ECONOMY_TYPE_COMMAND
outfit = /datum/outfit/job/rd
@@ -155,7 +155,7 @@ Junior Scientist
selection_color = "#ffeeff"
exp_requirements = 120
exp_type = EXP_TYPE_CREW
base_paycheck_multiplier = BASEPAY_ROOKIE
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/scientist/junior
code/modules/jobs/job_types/security.dm
+5 -2
View File
@@ -23,7 +23,7 @@ Head of Security
exp_requirements = 2000
exp_type = EXP_TYPE_SECURITY
exp_type_department = EXP_TYPE_SECURITY
base_paycheck_multiplier = BASEPAY_COMMAND
economy_type = ECONOMY_TYPE_COMMAND
outfit = /datum/outfit/job/hos
@@ -92,6 +92,7 @@ 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
@@ -151,6 +152,7 @@ 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
@@ -208,6 +210,7 @@ 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
@@ -368,7 +371,7 @@ Junior Security Officer
minimal_player_age = 3
exp_requirements = 300
exp_type = EXP_TYPE_CREW
base_paycheck_multiplier = BASEPAY_ROOKIE
economy_type = ECONOMY_TYPE_ROOKIE
outfit = /datum/outfit/job/security/junior
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
price = PRICE_LOW
economy_type = ECONOMY_PRICE_LOW
/obj/item/reagent_containers/glass/beaker/waterbottle/Initialize()
beaker_weakness_bitflag |= TEMP_WEAK
code/modules/reagents/reagent_containers/pill.dm
+7 -4
View File
@@ -269,17 +269,20 @@
/obj/item/reagent_containers/pill/penis_enlargement
name = "penis enlargement pill"
list_reagents = list(/datum/reagent/fermi/penis_enlarger = 10)
price = PRICE_LOW
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 = PRICE_LOW
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)
price = PRICE_LOW
icon_state = "pill_lewd"
icon_state = "pill_lewd"
economy_type = ECONOMY_PRICE_EROTIC
economy_price_mul = 0.25
code/modules/vending/_vending.dm
+6 -8
View File
@@ -167,14 +167,12 @@ 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
R.price = baseprice
if(product) //its a item!
if((initial(product.price)))
R.price = FLOOR(initial(product.price), 1)
else
R.price = baseprice
if(free)
R.price = 0
if(!free)
R.price = baseprice
if(product) //its a item!
var/product_price = SSeconomy.GetPrice(product)
if(!isnull(product_price))
R.price = product_price
if(!start_empty)
R.amount = amount
R.max_amount = amount