From 645dfca14a5245b194338664da06e41602ce51ef Mon Sep 17 00:00:00 2001 From: Fermi Date: Thu, 23 May 2019 23:17:17 +0100 Subject: [PATCH] Compile ready. --- modular_citadel/code/modules/arousal/organs/genitals.dm | 3 ++- .../modules/reagents/chemistry/reagents/fermi_reagents.dm | 2 +- .../code/modules/reagents/chemistry/recipes/fermi.dm | 2 ++ modular_citadel/code/modules/reagents/objects/items.dm | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modular_citadel/code/modules/arousal/organs/genitals.dm b/modular_citadel/code/modules/arousal/organs/genitals.dm index e0b56e3f8d..d49447dd8e 100644 --- a/modular_citadel/code/modules/arousal/organs/genitals.dm +++ b/modular_citadel/code/modules/arousal/organs/genitals.dm @@ -316,7 +316,8 @@ if(/obj/item/organ/genital/breasts) S = GLOB.breasts_shapes_list[G.shape] aroused_state = 0//Breasts don't have aroused_states, there's literally no difference in the spite. - if(size == "huge") + //if(size == "huge") + diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm index b8b5be48f5..f9abd06ab9 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -636,7 +636,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING var/sizeConv = list("a" = 1, "b" = 2, "c" = 3, "d" = 4, "e" = 5) B.prev_size = B.size B.cached_size = sizeConv[B.size] - message_admins("init B size: [B.size], prev: [B.prev_size], cache = [B.cached_size], raw: [sizeConv[B.size]]") + message_admins("init B size: [B.size], prev: [B.prev_size], cache = [B.cached_size], raw: [sizeConv[B.size]]") //if this runtimes it's cause someone's breasts are too big! /datum/reagent/fermi/BElarger/on_mob_life(mob/living/carbon/M) //Increases breast size var/mob/living/carbon/human/H = M diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index 4f5c986707..a88c615e11 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -103,6 +103,7 @@ results = list("SDGF" = 0.3) //required_reagents = list("plasma" = 1, "stable_plasma" = 1, "sugar" = 1) required_reagents = list("stable_plasma" = 0.5, "slimejelly" = 0.5, "synthflesh" = 1, "blood" = 1) + mix_message = "the reaction gives off a blorble!" //FermiChem vars: OptimalTempMin = 350 // Lower area of bell curve for determining heat based rate reactions OptimalTempMax = 500 // Upper end for above @@ -136,6 +137,7 @@ id = "BElarger" results = list("BElarger" = 6) required_reagents = list("salglu_solution" = 0.1, "milk" = 0.5, "synthflesh" = 0.2, "silicon" = 0.2, "aphro" = 0.2) + mix_message = "the reaction gives off a sent of milkshakes!" //FermiChem vars: OptimalTempMin = 200 OptimalTempMax = 800 diff --git a/modular_citadel/code/modules/reagents/objects/items.dm b/modular_citadel/code/modules/reagents/objects/items.dm index d07edaa9e1..b9adf8f7c3 100644 --- a/modular_citadel/code/modules/reagents/objects/items.dm +++ b/modular_citadel/code/modules/reagents/objects/items.dm @@ -20,8 +20,8 @@ numberOfPages-- playsound(user.loc, 'sound/items/poster_ripped.ogg', 50, 1) add_fingerprint(user) - if(numberOfPages == 0) - icon_state = "pHbookletEmpty" + if(numberOfPages == 0) + icon_state = "pHbookletEmpty" return else to_chat(user, "[src] is empty!")