From 8e3f48a76146bbe5c6e453b572ff7d28538777d1 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Sun, 19 Apr 2020 17:13:19 -0400 Subject: [PATCH 1/2] Reduces (or gives) weight classes to several items. --- code/modules/recycling/conveyor2.dm | 2 +- modular_citadel/code/modules/arousal/organs/breasts.dm | 1 + modular_citadel/code/modules/arousal/organs/penis.dm | 1 + modular_citadel/code/modules/arousal/organs/testicles.dm | 1 + modular_citadel/code/modules/arousal/organs/vagina.dm | 1 + modular_citadel/code/modules/arousal/organs/womb.dm | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 425c94cd65..600ee4ad14 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -330,7 +330,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) desc = "A conveyor control switch assembly." icon = 'icons/obj/recycling.dmi' icon_state = "switch-off" - w_class = WEIGHT_CLASS_BULKY + w_class = WEIGHT_CLASS_NORMAL var/id = "" //inherited by the switch /obj/item/conveyor_switch_construct/Initialize() diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index c936eb9dc4..82c4f616bb 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -6,6 +6,7 @@ desc = "Female milk producing organs." icon_state = "breasts" icon = 'modular_citadel/icons/obj/genitals/breasts.dmi' + w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_BREASTS size = BREASTS_SIZE_DEF // "c". Refer to the breast_values static list below for the cups associated number values diff --git a/modular_citadel/code/modules/arousal/organs/penis.dm b/modular_citadel/code/modules/arousal/organs/penis.dm index c05549aaa0..387e687389 100644 --- a/modular_citadel/code/modules/arousal/organs/penis.dm +++ b/modular_citadel/code/modules/arousal/organs/penis.dm @@ -3,6 +3,7 @@ desc = "A male reproductive organ." icon_state = "penis" icon = 'modular_citadel/icons/obj/genitals/penis.dmi' + w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_PENIS masturbation_verb = "stroke" diff --git a/modular_citadel/code/modules/arousal/organs/testicles.dm b/modular_citadel/code/modules/arousal/organs/testicles.dm index a8946294b1..bcc5def02a 100644 --- a/modular_citadel/code/modules/arousal/organs/testicles.dm +++ b/modular_citadel/code/modules/arousal/organs/testicles.dm @@ -3,6 +3,7 @@ desc = "A male reproductive organ." icon_state = "testicles" icon = 'modular_citadel/icons/obj/genitals/testicles.dmi' + w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_TESTICLES size = BALLS_SIZE_MIN diff --git a/modular_citadel/code/modules/arousal/organs/vagina.dm b/modular_citadel/code/modules/arousal/organs/vagina.dm index cdc7dc4927..bc89418ece 100644 --- a/modular_citadel/code/modules/arousal/organs/vagina.dm +++ b/modular_citadel/code/modules/arousal/organs/vagina.dm @@ -3,6 +3,7 @@ desc = "A female reproductive organ." icon = 'modular_citadel/icons/obj/genitals/vagina.dmi' icon_state = ORGAN_SLOT_VAGINA + w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_PRECISE_GROIN slot = "vagina" size = 1 //There is only 1 size right now diff --git a/modular_citadel/code/modules/arousal/organs/womb.dm b/modular_citadel/code/modules/arousal/organs/womb.dm index 7f91310e3e..8bd3dddd7e 100644 --- a/modular_citadel/code/modules/arousal/organs/womb.dm +++ b/modular_citadel/code/modules/arousal/organs/womb.dm @@ -3,6 +3,7 @@ desc = "A female reproductive organ." icon = 'modular_citadel/icons/obj/genitals/vagina.dmi' icon_state = "womb" + w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_WOMB genital_flags = GENITAL_INTERNAL|GENITAL_FUID_PRODUCTION From b8ff1b16bd9648a7b83e31fd49b5d93f76fa1b7b Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Sun, 19 Apr 2020 17:28:07 -0400 Subject: [PATCH 2/2] Better. --- modular_citadel/code/modules/arousal/genitals.dm | 2 +- modular_citadel/code/modules/arousal/organs/breasts.dm | 1 - modular_citadel/code/modules/arousal/organs/penis.dm | 1 - modular_citadel/code/modules/arousal/organs/testicles.dm | 1 - modular_citadel/code/modules/arousal/organs/vagina.dm | 1 - modular_citadel/code/modules/arousal/organs/womb.dm | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/modular_citadel/code/modules/arousal/genitals.dm b/modular_citadel/code/modules/arousal/genitals.dm index 68e9259183..e0e1b37a3d 100644 --- a/modular_citadel/code/modules/arousal/genitals.dm +++ b/modular_citadel/code/modules/arousal/genitals.dm @@ -1,6 +1,6 @@ /obj/item/organ/genital color = "#fcccb3" - w_class = WEIGHT_CLASS_NORMAL + w_class = WEIGHT_CLASS_SMALL var/shape var/sensitivity = 1 // wow if this were ever used that'd be cool but it's not but i'm keeping it for my unshit code var/genital_flags //see citadel_defines.dm diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index 82c4f616bb..c936eb9dc4 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -6,7 +6,6 @@ desc = "Female milk producing organs." icon_state = "breasts" icon = 'modular_citadel/icons/obj/genitals/breasts.dmi' - w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_BREASTS size = BREASTS_SIZE_DEF // "c". Refer to the breast_values static list below for the cups associated number values diff --git a/modular_citadel/code/modules/arousal/organs/penis.dm b/modular_citadel/code/modules/arousal/organs/penis.dm index 387e687389..c05549aaa0 100644 --- a/modular_citadel/code/modules/arousal/organs/penis.dm +++ b/modular_citadel/code/modules/arousal/organs/penis.dm @@ -3,7 +3,6 @@ desc = "A male reproductive organ." icon_state = "penis" icon = 'modular_citadel/icons/obj/genitals/penis.dmi' - w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_PENIS masturbation_verb = "stroke" diff --git a/modular_citadel/code/modules/arousal/organs/testicles.dm b/modular_citadel/code/modules/arousal/organs/testicles.dm index bcc5def02a..a8946294b1 100644 --- a/modular_citadel/code/modules/arousal/organs/testicles.dm +++ b/modular_citadel/code/modules/arousal/organs/testicles.dm @@ -3,7 +3,6 @@ desc = "A male reproductive organ." icon_state = "testicles" icon = 'modular_citadel/icons/obj/genitals/testicles.dmi' - w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_TESTICLES size = BALLS_SIZE_MIN diff --git a/modular_citadel/code/modules/arousal/organs/vagina.dm b/modular_citadel/code/modules/arousal/organs/vagina.dm index bc89418ece..cdc7dc4927 100644 --- a/modular_citadel/code/modules/arousal/organs/vagina.dm +++ b/modular_citadel/code/modules/arousal/organs/vagina.dm @@ -3,7 +3,6 @@ desc = "A female reproductive organ." icon = 'modular_citadel/icons/obj/genitals/vagina.dmi' icon_state = ORGAN_SLOT_VAGINA - w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_PRECISE_GROIN slot = "vagina" size = 1 //There is only 1 size right now diff --git a/modular_citadel/code/modules/arousal/organs/womb.dm b/modular_citadel/code/modules/arousal/organs/womb.dm index 8bd3dddd7e..7f91310e3e 100644 --- a/modular_citadel/code/modules/arousal/organs/womb.dm +++ b/modular_citadel/code/modules/arousal/organs/womb.dm @@ -3,7 +3,6 @@ desc = "A female reproductive organ." icon = 'modular_citadel/icons/obj/genitals/vagina.dmi' icon_state = "womb" - w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_WOMB genital_flags = GENITAL_INTERNAL|GENITAL_FUID_PRODUCTION