From b828a4d185465cbba11b59694c8952bea440ea98 Mon Sep 17 00:00:00 2001 From: jbox1 <40789662+jbox144@users.noreply.github.com> Date: Sun, 19 Jan 2020 17:15:40 +1100 Subject: [PATCH 1/3] Breast size preferences increased from E cups to H cups Changed the GLOB.breast_size_list to includes "f", "g" and "h", allowing users to set their breast size preferences up to H, the maximum size before wardrobe malfunctions. --- code/__HELPERS/global_lists.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index d7d486c6..a6e8096c 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -52,7 +52,7 @@ init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list) - GLOB.breasts_size_list = list ("a", "b", "c", "d", "e") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing. + GLOB.breasts_size_list = list ("a", "b", "c", "d", "e", "f", "g", "h") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing. GLOB.gentlemans_organ_names = list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger") for(var/K in GLOB.breasts_shapes_list) var/datum/sprite_accessory/breasts/value = GLOB.breasts_shapes_list[K] From 3d60d0659970dbd2022dd2b99219d589cd8d869c Mon Sep 17 00:00:00 2001 From: jbox1 <40789662+jbox144@users.noreply.github.com> Date: Sun, 19 Jan 2020 19:03:21 +1100 Subject: [PATCH 2/3] Adds milk cleanable Adds a milk cleanable decal which occurs whenever milk is spilled or breasts are used for masturbation or climaxing --- .../modules/reagents/reagents/cit_reagents.dm | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm index 0e823a65..38751db9 100644 --- a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm +++ b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm @@ -85,6 +85,36 @@ S = new(T) if(data["blood_DNA"]) S.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"])) + +/datum/reagent/consumable/milk/reaction_turf(turf/T, reac_volume) + if(!istype(T)) + return + if(reac_volume < 3) + return + + var/obj/effect/decal/cleanable/milk/S = locate() in T + if(!S) + S = new(T) + if(data["blood_DNA"]) + S.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"])) + +/obj/effect/decal/cleanable/milk + name = "milk" + desc = null + gender = PLURAL + density = 0 + layer = ABOVE_NORMAL_TURF_LAYER + icon = 'modular_citadel/icons/obj/genitals/effects.dmi' + icon_state = "milk1" + random_icon_states = list("milk1", "milk2", "milk3", "milk4") + +/obj/effect/decal/cleanable/milk/New() + ..() + dir = pick(1,2,4,8) + add_blood_DNA(list("Non-human DNA" = "A+")) + +/obj/effect/decal/cleanable/milk/replace_decal(obj/effect/decal/cleanable/milk/S) + S.add_blood_DNA(return_blood_DNA()) //aphrodisiac & anaphrodisiac From 8d44840f333f6d534c566d2cea1ae0acdfc980d6 Mon Sep 17 00:00:00 2001 From: jbox1 <40789662+jbox144@users.noreply.github.com> Date: Sun, 19 Jan 2020 19:23:23 +1100 Subject: [PATCH 3/3] Reverted changes fuck --- .../modules/reagents/reagents/cit_reagents.dm | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm index 38751db9..0e823a65 100644 --- a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm +++ b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm @@ -85,36 +85,6 @@ S = new(T) if(data["blood_DNA"]) S.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"])) - -/datum/reagent/consumable/milk/reaction_turf(turf/T, reac_volume) - if(!istype(T)) - return - if(reac_volume < 3) - return - - var/obj/effect/decal/cleanable/milk/S = locate() in T - if(!S) - S = new(T) - if(data["blood_DNA"]) - S.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"])) - -/obj/effect/decal/cleanable/milk - name = "milk" - desc = null - gender = PLURAL - density = 0 - layer = ABOVE_NORMAL_TURF_LAYER - icon = 'modular_citadel/icons/obj/genitals/effects.dmi' - icon_state = "milk1" - random_icon_states = list("milk1", "milk2", "milk3", "milk4") - -/obj/effect/decal/cleanable/milk/New() - ..() - dir = pick(1,2,4,8) - add_blood_DNA(list("Non-human DNA" = "A+")) - -/obj/effect/decal/cleanable/milk/replace_decal(obj/effect/decal/cleanable/milk/S) - S.add_blood_DNA(return_blood_DNA()) //aphrodisiac & anaphrodisiac