diff --git a/code/modules/arousal/organs/penis.dm b/code/modules/arousal/organs/penis.dm index 06ac7846f927..f966b97fbaa4 100644 --- a/code/modules/arousal/organs/penis.dm +++ b/code/modules/arousal/organs/penis.dm @@ -86,7 +86,7 @@ if(T.taur_mode & S.accepted_taurs) //looks out of place on those. lowershape = "taur, [lowershape]" - desc = "You see [aroused_state ? "an erect" : "a flaccid"] [lowershape] [name]. You estimate it's about [round(length*get_size(owner), 0.25)] inch[round(length*get_size(owner), 0.25) != 1 ? "es" : ""] long and [round(diameter*get_size(owner), 0.25)] inch[round(diameter*get_size(owner), 0.25) != 1 ? "es" : ""] in diameter." + desc = "You see [aroused_state ? "an erect" : "a flaccid"] [lowershape] [name]. You estimate it's about [round(length*get_size(owner), 0.25)] centimeters[round(length*get_size(owner), 0.25) != 1 ? "" : ""] long and [round(diameter*get_size(owner), 0.25)] centimeters[round(diameter*get_size(owner), 0.25) != 1 ? "" : ""] in diameter." /obj/item/organ/genital/penis/get_features(mob/living/carbon/human/H) var/datum/dna/D = H.dna diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 9714cadb3afb..e724d7bf56b8 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2716,7 +2716,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("cock_length") var/min_D = CONFIG_GET(number/penis_min_inches_prefs) var/max_D = CONFIG_GET(number/penis_max_inches_prefs) - var/new_length = input(user, "Penis length in inches:\n([min_D]-[max_D])\nReminder that your sprite size will affect this.", "Character Preference") as num|null + var/new_length = input(user, "Penis length in centimeters:\n([min_D]-[max_D])\nReminder that your sprite size will affect this.", "Character Preference") as num|null if(new_length) features["cock_length"] = clamp(round(new_length), min_D, max_D) diff --git a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm index 1aa5e56451dd..fd66b5f97d5c 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm @@ -117,7 +117,7 @@ if(new_snout) H.dna.features["mam_snouts"] = new_snout H.update_body() - + else if (select_alteration == "Wings") var/new_color = input(owner, "Choose your wing color:", "Race change","#"+H.dna.features["wings_color"]) as color|null if(new_color) @@ -218,7 +218,7 @@ qdel(X) var/min_D = CONFIG_GET(number/penis_min_inches_prefs) var/max_D = CONFIG_GET(number/penis_max_inches_prefs) - var/new_length = input(owner, "Penis length in inches:\n([min_D]-[max_D])", "Genital Alteration") as num|null + var/new_length = input(owner, "Penis length in centimeters:\n([min_D]-[max_D])", "Genital Alteration") as num|null if(new_length) H.dna.features["cock_length"] = clamp(round(new_length), min_D, max_D) H.update_genitals() diff --git a/modular_sand/code/game/machinery/cryptominers.dm b/modular_sand/code/game/machinery/cryptominers.dm index 33f87a8e9fa2..b9ae9c71207c 100644 --- a/modular_sand/code/game/machinery/cryptominers.dm +++ b/modular_sand/code/game/machinery/cryptominers.dm @@ -10,8 +10,8 @@ circuit = /obj/item/circuitboard/machine/cryptominer init_process = FALSE // Don't process upon creation var/mining = FALSE - var/miningtime = 3000 - var/miningpoints = 50 + var/miningtime = 6000 + var/miningpoints = 250 var/mintemp = TCRYO // 225K equals approximately -55F or -48C var/midtemp = T0C // 273K equals 32F or 0C var/maxtemp = 500 // 500K equals approximately 440F or 226C @@ -164,11 +164,11 @@ icon_state = "off_syndie" density = TRUE use_power = IDLE_POWER_USE - idle_power_usage = 10 - active_power_usage = 100 + idle_power_usage = 40 + active_power_usage = 400 circuit = /obj/item/circuitboard/machine/cryptominer/syndie miningtime = 6000 - miningpoints = 100 + miningpoints = 500 /obj/machinery/cryptominer/syndie/update_icon() . = ..() @@ -185,10 +185,10 @@ icon_state = "off_nano" density = TRUE use_power = IDLE_POWER_USE - idle_power_usage = 1 - active_power_usage = 1 - miningtime = 600000 - miningpoints = 1000 + idle_power_usage = 80 + active_power_usage = 800 + miningtime = 60000 + miningpoints = 12500 /obj/machinery/cryptominer/nanotrasen/update_icon() . = ..() diff --git a/modular_splurt/code/modules/cargo/packs/misc.dm b/modular_splurt/code/modules/cargo/packs/misc.dm index 0a9308339e2b..aaa5d82dbe9d 100644 --- a/modular_splurt/code/modules/cargo/packs/misc.dm +++ b/modular_splurt/code/modules/cargo/packs/misc.dm @@ -346,16 +346,19 @@ /obj/item/export/bottle/gin, /obj/item/export/bottle/champagne, /obj/item/circuitboard/machine/cryptominer, - /obj/effect/spawner/lootdrop/maintenance, - /obj/effect/spawner/lootdrop/maintenance, - /obj/effect/spawner/lootdrop/maintenance, - /obj/effect/spawner/lootdrop/maintenance, - /obj/effect/spawner/lootdrop/maintenance, - /obj/effect/spawner/lootdrop/maintenance, - /obj/effect/spawner/lootdrop/maintenance, - /obj/effect/spawner/lootdrop/maintenance, - /obj/effect/spawner/lootdrop/maintenance, - /obj/effect/spawner/lootdrop/maintenance, + /obj/item/circuitboard/machine/cryptominer/syndie, + /obj/item/circuitboard/machine/cryptominer, + /obj/item/circuitboard/machine/cryptominer/syndie, + /obj/item/circuitboard/machine/cryptominer, + /obj/item/circuitboard/machine/cryptominer/syndie, + /obj/effect/spawner/lootdrop/armory_contraband/metastation, + /obj/effect/spawner/lootdrop/mre, + /obj/effect/spawner/lootdrop/prison_loot_toilet, + /obj/effect/spawner/lootdrop/prison_loot_toilet, + /obj/effect/spawner/lootdrop/prison_loot_toilet, + /obj/effect/spawner/lootdrop/prison_loot_toilet, + /obj/effect/spawner/lootdrop/high_loot_toilet, + /obj/effect/spawner/lootdrop/high_loot_toilet, /obj/effect/spawner/lootdrop/high_tools, /obj/effect/spawner/lootdrop/high_tools, /obj/item/gunpart/pistol9frame, @@ -374,7 +377,6 @@ /obj/effect/spawner/lootdrop/healing_kits, /obj/effect/spawner/lootdrop/breathing_tanks, /obj/effect/spawner/lootdrop/breathing_masks, - //BlueMoon removal /obj/item/stack/sheet/bluespace_crystal ) crate_name = "surplus crate"