changes the price of everything to scale w/ pay

2026-07-20 12:12:26 +01:00 · 2022-06-08 18:38:41 -04:00
parent eed83f9e8c
commit a256ef54c0
38 changed files with 88 additions and 74 deletions
@@ -20,4 +20,4 @@ SUBSYSTEM_DEF(economy)
 * job datums if the respective one is null. You can pass zero arguments here and you'd get the "default" amount of a paycheck.
 */
 /datum/controller/subsystem/economy/proc/GetPaycheck(datum/bank_account/account, datum/job/job, multiplier=1)
-	return account:base_pay * job:base_paycheck_multiplier * multiplier
+	return FLOOR(account:base_pay * job:base_paycheck_multiplier * multiplier, 1)
@@ -8,7 +8,7 @@
 	item_state = "nailpolish"
 	w_class = WEIGHT_CLASS_SMALL
 	var/paint = "black"
-	price = 5
+	price = PRICE_LOW * 0.5
 	var/mutable_appearance/bottle //show the colour on the bottle.

 /obj/item/nailpolish/red
@@ -1,4 +1,4 @@
-/* 
+/*
 lover's dice: based off a really funny yakuza gif i saw on tumblr years ago
 these give suggestions for sex acts to perform. it's stupid but fun.

@@ -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 = 1
+	price = PRICE_LOW

 /obj/item/storage/pill_bottle/lovedice/Initialize()
 	. = ..()
@@ -8,7 +8,8 @@
 	/// The pin number that the owner wanted. Not set by default, so anyone can just steal your ID if you don't remember to set it
 	var/account_pin
 	/// The base amount of pay you get per paycheck
-	var/base_pay = 60
+	/// At the moment of documenting this, the base pay is 80
+	var/base_pay = PRICE_BASE * 5
 	/// The linked job datum for this bank account, for calculating unique base payment for each job
 	var/datum/job/account_job
 	/// The associated ID, for letting the card-holder know when a paycheck is processed
@@ -9,7 +9,7 @@
 	icon_state 			= "b_condom_wrapped"
 	var/unwrapped			= 0
 	w_class = WEIGHT_CLASS_TINY
-	price = 1
+	price = PRICE_LOW

 obj/item/condom/Initialize()
 	create_reagents(300, DRAWABLE|NO_REACT)
@@ -11,7 +11,7 @@
 	item_state = "fleshlight"
 	w_class = WEIGHT_CLASS_SMALL
 	var/sleevecolor = "#ffcbd4" //pink
-	price = 8
+	price = PRICE_EROTICA * 0.75
 	var/mutable_appearance/sleeve
 	var/inuse = 0

@@ -81,7 +81,7 @@
 	var/partnercolor = "#ffcbd4"
 	var/partnerbase = "normal"
 	var/partnerorgan = "portal_vag"
-	price = 20
+	price = PRICE_EROTICA
 	var/mutable_appearance/sleeve
 	var/mutable_appearance/organ
 	var/inuse = 0
@@ -96,7 +96,7 @@
 	else
 		. += "<span class='notice'>The device is paired, and awaiting input. </span>"

-/obj/item/portallight/attack(mob/living/carbon/user, mob/living/holder) 
+/obj/item/portallight/attack(mob/living/carbon/user, mob/living/holder)
 	if(inuse) //just to stop stacking and causing people to cum instantly
 		return
 	if(!UpdateUsability())
@@ -111,8 +111,8 @@
 	if(option == "Fuck" && !P.is_exposed())
 		to_chat(holder, "<span class='notice'>You don't see anywhere to use this on.</span>")
 		return
-	/* 
-	WARMUP START - prevents spam/instant climax 
+	/*
+	WARMUP START - prevents spam/instant climax
 	*/
 	inuse = TRUE
 	if(user != holder)
@@ -122,8 +122,8 @@
 		inuse = FALSE
 		return
 	inuse = FALSE
-	/* 
-	WARMUP END -	proceed with the action 
+	/*
+	WARMUP END -	proceed with the action
 	*/
 	switch(option)
 		if("Fuck")
@@ -140,7 +140,7 @@
 			user.adjustArousalLoss(20)
 			target.adjustArousalLoss(20)
 			target.do_jitter_animation()
-			if(target.can_orgasm() && prob(5)) 
+			if(target.can_orgasm() && prob(5))
 				target.mob_climax_outside(target_genital, spillage=target_genital.is_exposed())
 			if(user.can_orgasm())
 				var/mob/living/carbon/human/O = user
@@ -276,7 +276,7 @@
 	icon = 'hyperstation/icons/obj/fleshlight.dmi'
 	desc = "A small silver box with Silver Love Co embossed."
 	icon_state = "box"
-	price = 15
+	price = PRICE_EROTICA * 1.15

 // portal fleshlight box
 /obj/item/storage/box/portallight/PopulateContents()
@@ -6,14 +6,14 @@
 	icon = 'hyperstation/icons/obj/clothing/gloves.dmi'
 	alternate_worn_icon = 'hyperstation/icons/mobs/gloves.dmi'
 	mutantrace_variation = NO_MUTANTRACE_VARIATION
-	price = 5
+	price = PRICE_EROTICA * 0.75

 /obj/item/clothing/gloves/latexsleeves/security
 	name = "security sleeves"
 	desc = "A pair of latex sleeves, with a band of red above the elbows denoting that the wearer is part of the security team."
 	icon_state = "latexsec"
 	item_state = "latexsec"
-	price = 5
+	price = PRICE_EROTICA * 0.75

 /obj/item/clothing/head/dominatrixcap
 	name = "dominatrix cap"
@@ -45,7 +45,7 @@ obj/item/clothing/neck/stole
 	w_class = WEIGHT_CLASS_SMALL
 	icon_state = "stole"
 	item_state = ""	//no inhands
-	price = 3
+	price = PRICE_HIGH * 0.75

 obj/item/clothing/neck/stole/black
 	name = "black boa"
@@ -55,7 +55,7 @@ obj/item/clothing/neck/stole/black
 	icon_state = "stole"
 	item_state = ""	//no inhands
 	color = "#3d3d3d"
-	price = 3
+	price = PRICE_HIGH * 0.75

 /obj/item/clothing/suit/fluffyhalfcrop
 	name = "fluffy half-crop jacket"
@@ -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 = 2
+	price = PRICE_LOW * 1.25	//What's so expensive about a rope?

 /mob/living/proc/rope_add(source) //Check to see if the rope is on, and then add effects
 	var/mob/living/carbon/M = source
@@ -6,7 +6,7 @@
 	icon_state 			= "sounding_wrapped"
 	var/unwrapped			= 0
 	w_class = WEIGHT_CLASS_TINY
-	price = 1
+	price = PRICE_LOW

 /obj/item/sounding/attack_self(mob/user)
 	if(!istype(user))
@@ -13,7 +13,7 @@
 	var/style = "long"
 	var/inside = FALSE
 	var/last = 0
-	price = 3
+	price = PRICE_LOW * 1.2

 /obj/item/electropack/vibrator/Initialize() //give the device its own code
 	. = ..()