diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm index d07ef1193..eb2055e06 100644 --- a/code/__DEFINES/economy.dm +++ b/code/__DEFINES/economy.dm @@ -5,8 +5,8 @@ #define BASEPAY_CAPTAIN 1.65 -#define PRICE_BASE (FLOOR(BASEPAY_ASSISTANT * 16, 1)) -#define PRICE_LOW (FLOOR(PRICE_BASE * 0.5, 1)) -#define PRICE_HIGH (FLOOR(PRICE_BASE * 2, 1)) -#define PRICE_EROTICA (FLOOR(PRICE_HIGH * 1.15, 1)) -#define PRICE_EXPENSIVE (FLOOR(PRICE_HIGH * 1.5), 1) +#define PRICE_BASE (BASEPAY_ASSISTANT * 16) +#define PRICE_LOW (PRICE_BASE * 0.75) +#define PRICE_HIGH (PRICE_BASE * 2) +#define PRICE_EROTICA (PRICE_HIGH * 1.15) +#define PRICE_EXPENSIVE (PRICE_HIGH * 1.5) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 6f533b245..8f581933f 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -231,7 +231,7 @@ desc = "Smoked by the truly robust." icon_state = "robustg" spawn_type = /obj/item/clothing/mask/cigarette/robustgold - price = PRICE_LOW * 0.75 + price = PRICE_LOW * 1.25 /obj/item/storage/fancy/cigarettes/cigpack_carp name = "\improper Carp Classic packet" diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index de3a7d5af..622a63bb6 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -260,7 +260,7 @@ name = "security's bitch beret" desc = "A softer beret with the word 'BITCH' embroidered on it in pink thread." icon_state = "bitchberet" - price = PRICE_LOW * 1.5 + price = PRICE_BASE * 1.5 //Curator /obj/item/clothing/head/fedora/curator diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 916b012cb..20a06dedd 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -47,7 +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 - price = PRICE_LOW + price = PRICE_EROTICA /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" diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 435326ea0..b83e25905 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -59,7 +59,7 @@ tastes = list("chocolate" = 1) foodtype = JUNKFOOD | SUGAR dunkable = TRUE - price = PRICE_LOW * 0.5 + price = PRICE_LOW /obj/item/reagent_containers/food/snacks/hugemushroomslice diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm index 797a4f4a7..a894e3bd0 100644 --- a/code/modules/food_and_drinks/food/snacks_vend.dm +++ b/code/modules/food_and_drinks/food/snacks_vend.dm @@ -12,7 +12,7 @@ filling_color = "#D2691E" tastes = list("candy" = 1) foodtype = JUNKFOOD | SUGAR - price = PRICE_LOW * 0.5 + price = PRICE_LOW /obj/item/reagent_containers/food/snacks/sosjerky name = "\improper Scaredy's Private Reserve Beef Jerky" @@ -24,7 +24,7 @@ filling_color = "#8B0000" tastes = list("dried meat" = 1) foodtype = JUNKFOOD | MEAT | SUGAR - price = PRICE_LOW * 0.75 + price = PRICE_LOW /obj/item/reagent_containers/food/snacks/sosjerky/healthy name = "homemade beef jerky" @@ -43,7 +43,7 @@ filling_color = "#FFD700" tastes = list("salt" = 1, "crisps" = 1) foodtype = JUNKFOOD | FRIED - price = PRICE_LOW * 0.5 + price = PRICE_LOW /obj/item/reagent_containers/food/snacks/no_raisin name = "4no raisins" @@ -55,7 +55,7 @@ filling_color = "#8B0000" tastes = list("dried raisins" = 1) foodtype = JUNKFOOD | FRUIT | SUGAR - price = PRICE_LOW * 0.5 + price = PRICE_LOW /obj/item/reagent_containers/food/snacks/no_raisin/healthy name = "homemade raisins" @@ -84,7 +84,7 @@ filling_color = "#FFD700" tastes = list("cheese" = 5, "crisps" = 2) foodtype = JUNKFOOD | DAIRY | SUGAR - price = PRICE_LOW * 0.5 + price = PRICE_LOW /obj/item/reagent_containers/food/snacks/soyfood name = "Soyfood" @@ -96,7 +96,7 @@ filling_color = "#FFD700" tastes = list("nanomachines" = 2, "soybeans" = 5) foodtype = JUNKFOOD | DAIRY | GRAIN - price = PRICE_LOW * 1.25 + price = PRICE_LOW /obj/item/reagent_containers/food/snacks/syndicake name = "syndi-cakes" @@ -107,7 +107,7 @@ filling_color = "#F5F5DC" tastes = list("sweetness" = 3, "cake" = 1) foodtype = GRAIN | FRUIT | VEGETABLES | ANTITOXIC - price = PRICE_LOW * 1.75 + price = PRICE_LOW /obj/item/reagent_containers/food/snacks/carbonnanotube_noodles name = "carbon nanotube noodles" @@ -119,7 +119,7 @@ filling_color = "#FFD700" tastes = list("charcoal" = 1, "spiciness" = 3, "soysauce" = 3) foodtype = GRAIN | VEGETABLES - price = PRICE_LOW * 1.75 + price = PRICE_LOW /obj/item/reagent_containers/food/snacks/bird_seed name = "Sunflower Seeds" diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index d57c37f32..0e06b1638 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -170,7 +170,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C R.price = baseprice if(product) //its a item! if((initial(product.price))) - R.price = initial(product.price) + R.price = FLOOR(initial(product.price), 1) else R.price = baseprice if(free) diff --git a/hyperstation/code/game/objects/items/lovedice.dm b/hyperstation/code/game/objects/items/lovedice.dm index a3d36b163..1bba2e1a1 100644 --- a/hyperstation/code/game/objects/items/lovedice.dm +++ b/hyperstation/code/game/objects/items/lovedice.dm @@ -12,7 +12,7 @@ sarcoph mar 2022 desc = "Contains all the intimate ideas you'll ever need. A game that everyone wins!" icon = 'hyperstation/icons/obj/toy.dmi' icon_state = "lovedicebag" - price = PRICE_LOW + price = PRICE_LOW * 1.25 /obj/item/storage/pill_bottle/lovedice/Initialize() . = ..() diff --git a/hyperstation/code/obj/condom.dm b/hyperstation/code/obj/condom.dm index 1e3aeb8f3..bdb8ff3b6 100644 --- a/hyperstation/code/obj/condom.dm +++ b/hyperstation/code/obj/condom.dm @@ -9,7 +9,7 @@ icon_state = "b_condom_wrapped" var/unwrapped = 0 w_class = WEIGHT_CLASS_TINY - price = PRICE_LOW + price = PRICE_LOW * 1.25 obj/item/condom/Initialize() create_reagents(300, DRAWABLE|NO_REACT) diff --git a/hyperstation/code/obj/rope.dm b/hyperstation/code/obj/rope.dm index 28bb84750..a66cde289 100644 --- a/hyperstation/code/obj/rope.dm +++ b/hyperstation/code/obj/rope.dm @@ -10,7 +10,7 @@ item_state = "rope" //This sprite is in restraints.dmi until I figure out how to refrence somewhere else cuffsound = 'sound/weapons/cablecuff.ogg' armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) - price = PRICE_LOW * 1.25 //What's so expensive about a rope? + price = PRICE_LOW * 1.25 /mob/living/proc/rope_add(source) //Check to see if the rope is on, and then add effects var/mob/living/carbon/M = source diff --git a/hyperstation/code/obj/sounding.dm b/hyperstation/code/obj/sounding.dm index 94b8b33bf..685d658d5 100644 --- a/hyperstation/code/obj/sounding.dm +++ b/hyperstation/code/obj/sounding.dm @@ -6,7 +6,7 @@ icon_state = "sounding_wrapped" var/unwrapped = 0 w_class = WEIGHT_CLASS_TINY - price = PRICE_LOW + price = PRICE_LOW * 1.25 /obj/item/sounding/attack_self(mob/user) if(!istype(user)) diff --git a/hyperstation/code/obj/vibrator.dm b/hyperstation/code/obj/vibrator.dm index 870b5069b..df93113c4 100644 --- a/hyperstation/code/obj/vibrator.dm +++ b/hyperstation/code/obj/vibrator.dm @@ -13,7 +13,7 @@ var/style = "long" var/inside = FALSE var/last = 0 - price = PRICE_LOW * 1.2 + price = PRICE_LOW * 1.25 /obj/item/electropack/vibrator/Initialize() //give the device its own code . = ..()