Removes some non-modularity from THAT code (#15085)

* Removes some non-modularity from THAT code * oop
2026-07-20 20:45:28 +01:00 · 2022-07-21 02:21:14 +01:00
parent 4816e7a20a
commit d9ee488675
10 changed files with 9 additions and 17 deletions
@@ -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 <b>bolts</b>.")
-	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)
@@ -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)
@@ -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
@@ -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()
@@ -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()
@@ -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
@@ -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)
@@ -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 <b>screwdriver</b>.")
 	if(!has_buckled_mobs() && can_buckle)
-		. += span_notice("While standing on [src], drag and drop character <b>with shibari full-body bondage</b> onto [src] to tie a person to it, <b>while holding ropes in your hands</b>.")
+		. += span_notice("They need to be wearing <b>full-body shibari</b>, and you need to be <b>holding ropes</b>!")

 /obj/structure/chair/shibari_stand/user_unbuckle_mob(mob/living/buckled_mob, mob/living/user)
 	var/mob/living/buckled = buckled_mob
@@ -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()
@@ -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