diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index d86297c7118..f3271a989b1 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -14,13 +14,12 @@ var/buildstacktype = /obj/item/stack/sheet/iron var/buildstackamount = 1 var/item_chair = /obj/item/chair // if null it can't be picked up - var/buckle_message = TRUE //SKYRAT EDIT ADDITION -- chair buckle messages /obj/structure/chair/examine(mob/user) . = ..() . += span_notice("It's held together by a couple of bolts.") - if(!has_buckled_mobs() && can_buckle && buckle_message) //SKYRAT EDIT ADDITION -- chair buckle messages + if(!has_buckled_mobs() && can_buckle) . += span_notice("While standing on [src], drag and drop your sprite onto [src] to buckle to it.") /obj/structure/chair/Initialize(mapload) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 69aaa92f44d..69c7a730caa 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -26,8 +26,6 @@ var/clothing_flags = NONE - var/moth_edible = TRUE //Added it because moths were able to eat fucking vibrators. Fucking moths. - var/can_be_bloody = TRUE /// What items can be consumed to repair this clothing (must by an /obj/item/stack) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm index 410cd65d408..cf53cbbe858 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm @@ -11,7 +11,7 @@ lefthand_file = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_inhands/lewd_inhand_left.dmi' righthand_file = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_inhands/lewd_inhand_right.dmi' slot_flags = ITEM_SLOT_PENIS | ITEM_SLOT_VAGINA | ITEM_SLOT_NIPPLES | ITEM_SLOT_ANUS - moth_edible = FALSE + clothing_flags = INEDIBLE_CLOTHING /// Is the toy currently on var/toy_on = FALSE /// The current color of the toy, affects sprite diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm index d0450893969..c044ac0cbd6 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm @@ -28,7 +28,7 @@ var/change_sprite = TRUE w_class = WEIGHT_CLASS_TINY slot_flags = ITEM_SLOT_ANUS|ITEM_SLOT_VAGINA - moth_edible = FALSE + clothing_flags = INEDIBLE_CLOTHING /// Create an assoc list of designs for the radial color/design menu /obj/item/clothing/sextoy/dildo/proc/populate_dildo_designs() @@ -191,7 +191,6 @@ GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors var/static/list/dildo_sizes = list() w_class = WEIGHT_CLASS_TINY slot_flags = ITEM_SLOT_ANUS|ITEM_SLOT_VAGINA - moth_edible = FALSE /obj/item/clothing/sextoy/dildo/custom_dildo/populate_dildo_designs() dildo_sizes = list( @@ -264,7 +263,6 @@ GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors /// Reference to the end of the toy that you can hold when the other end is inserted in you var/obj/item/clothing/sextoy/dildo_side/the_toy change_sprite = FALSE - moth_edible = FALSE /obj/item/clothing/sextoy/dildo/double_dildo/Initialize() . = ..() @@ -402,7 +400,6 @@ GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors icon_state = "dildo_side" inhand_icon_state = "nothing" item_flags = ABSTRACT | HAND_ITEM - moth_edible = FALSE side_double = TRUE /obj/item/clothing/sextoy/dildo_side/dildo/Initialize() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/fleshlight.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/fleshlight.dm index f401a759187..96cfc031ed5 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/fleshlight.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/fleshlight.dm @@ -14,7 +14,7 @@ /// A list of toy designs for use in the radial color choice menu var/static/list/fleshlight_designs slot_flags = NONE - moth_edible = FALSE + clothing_flags = INEDIBLE_CLOTHING /// Generates a list of toy colors (or designs) for use in the radial color choice menu /obj/item/clothing/sextoy/fleshlight/proc/populate_fleshlight_designs() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm index 58b34fdfabb..8462f1fd83d 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm @@ -13,7 +13,7 @@ righthand_file = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_inhands/lewd_inhand_right.dmi' w_class = WEIGHT_CLASS_NORMAL hitsound = 'sound/weapons/whip.ogg' - moth_edible = FALSE + clothing_flags = INEDIBLE_CLOTHING //When taking that thing in mouth modifies_speech = TRUE flags_cover = MASKCOVERSMOUTH diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm index d0bb01a261b..af2b7978c39 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm @@ -24,7 +24,7 @@ var/mutable_appearance/magicwand_overlay w_class = WEIGHT_CLASS_TINY slot_flags = ITEM_SLOT_VAGINA|ITEM_SLOT_PENIS - moth_edible = FALSE + clothing_flags = INEDIBLE_CLOTHING //some stuff for making overlay of this item. Why? Because. /obj/item/clothing/sextoy/magic_wand/worn_overlays(isinhands = FALSE) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/shibari_stand.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/shibari_stand.dm index 682b9bf7a7f..a0d4260357e 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/shibari_stand.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/shibari_stand.dm @@ -7,7 +7,6 @@ layer = 4 item_chair = null buildstacktype = null - buckle_message = FALSE ///Overlays for ropes var/static/mutable_appearance/shibari_rope_overlay var/static/mutable_appearance/shibari_rope_overlay_behind @@ -42,9 +41,8 @@ //Examine changes for this structure /obj/structure/chair/shibari_stand/examine(mob/user) . = ..() - . += span_notice("Looks like it can be customized with a screwdriver.") if(!has_buckled_mobs() && can_buckle) - . += span_notice("While standing on [src], drag and drop character with shibari full-body bondage onto [src] to tie a person to it, while holding ropes in your hands.") + . += span_notice("They need to be wearing full-body shibari, and you need to be holding ropes!") /obj/structure/chair/shibari_stand/user_unbuckle_mob(mob/living/buckled_mob, mob/living/user) var/mob/living/buckled = buckled_mob diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm index c209e6a6255..7c535c2399c 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm @@ -30,7 +30,7 @@ /// Static list of designs of the toy, used for the color selection radial menu var/static/list/vibrator_designs w_class = WEIGHT_CLASS_TINY - moth_edible = FALSE + clothing_flags = INEDIBLE_CLOTHING //create radial menu /obj/item/clothing/sextoy/vibrator/proc/populate_vibrator_designs() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm index 639d4c43189..07cc3ad0c53 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm @@ -15,7 +15,7 @@ var/datum/looping_sound/vibrator/medium/soundloop w_class = WEIGHT_CLASS_TINY slot_flags = ITEM_SLOT_PENIS - moth_edible = FALSE + clothing_flags = INEDIBLE_CLOTHING /obj/item/clothing/sextoy/vibroring/attack_self(mob/user) toy_on = !toy_on