diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index e83efb8a5868..072dc7626caa 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -27200,7 +27200,7 @@ }, /area/centcom/holding) "pdY" = ( -/obj/structure/chair/bed/dildo_machine, +/obj/structure/bed/dildo_machine, /turf/open/floor/mineral/abductor, /area/centcom/holding) "pft" = ( diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 2b1f87949214..b1d070d43692 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -464,18 +464,22 @@ /obj/item/clothing/head/pharaoh = 2, /obj/item/clothing/neck/tie/cross = 7, /obj/item/storage/fancy/candle_box = 3, - /obj/item/clothing/head/clownmitre = 3, //BlueMoon changes - /obj/item/clothing/suit/chaplain/clownpriest = 3, //BlueMoon changes - /obj/item/clothing/suit/chaplain/shrinehand = 3, //BlueMoon changes - /obj/item/clothing/suit/hooded/chaplain_hoodie/monk_robe = 2, //BlueMoon changes - /obj/item/clothing/neck/oldcross = 6, //BlueMoon changes - /obj/item/clothing/neck/epitrachelion = 1, //BlueMoon changes - /obj/item/clothing/neck/cloak/bishop = 1, //BlueMoon changes + /obj/item/toy/plush/plushvar = 1, // BLUEMOON ADD - перенесено из категории примиума, + /obj/item/toy/plush/narplush = 1, // BLUEMOON ADD - перенесено из категории примиума, + /obj/item/clothing/head/clownmitre = 3, //BlueMoon changes, + /obj/item/clothing/suit/chaplain/clownpriest = 3, //BlueMoon changes, + /obj/item/clothing/suit/chaplain/shrinehand = 3, //BlueMoon changes, + /obj/item/clothing/suit/hooded/chaplain_hoodie/monk_robe = 2, //BlueMoon changes, + /obj/item/clothing/neck/oldcross = 6, //BlueMoon changes, + /obj/item/clothing/neck/epitrachelion = 1, //BlueMoon changes, + /obj/item/clothing/neck/cloak/bishop = 1, //BlueMoon changes, /obj/item/clothing/neck/cloak/bishopblack= 1) //BlueMoon changes - premium = list(/obj/item/toy/plush/plushvar = 1, - /obj/item/toy/plush/narplush = 1, + premium = list(/obj/item/storage/fancy/ringbox/silver = 4, // BLUEMOON ADD - для проведения свадеб, + /obj/item/storage/fancy/ringbox = 4, // BLUEMOON ADD - для проведения свадеб, + /obj/item/storage/fancy/ringbox/diamond = 4, // BLUEMOON ADD - для проведения свадеб, /obj/item/lighter/black = 1) refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe + extra_price = PRICE_ALMOST_ONE_GRAND * 1.1 payment_department = ACCOUNT_SRV /obj/item/vending_refill/wardrobe/chap_wardrobe machine_name = "DeusVend" diff --git a/modular_bluemoon/Gardelin0/code/obj/lewd_devices/dildo_machine.dm b/modular_bluemoon/Gardelin0/code/obj/lewd_devices/dildo_machine.dm index 4ab43535c268..9292a366cddc 100644 --- a/modular_bluemoon/Gardelin0/code/obj/lewd_devices/dildo_machine.dm +++ b/modular_bluemoon/Gardelin0/code/obj/lewd_devices/dildo_machine.dm @@ -1,4 +1,4 @@ -/obj/structure/chair/bed/dildo_machine +/obj/structure/bed/dildo_machine name = "Dildo machine" desc = "It provides pleasure." icon = 'modular_bluemoon/Gardelin0/icons/obj/lewd_devices.dmi' @@ -11,11 +11,11 @@ var/fuck_hole buckle_lying = TRUE -/obj/structure/chair/bed/dildo_machine/New() +/obj/structure/bed/dildo_machine/New() ..() add_overlay(mutable_appearance('modular_bluemoon/Gardelin0/icons/obj/lewd_devices.dmi', "dilmachine_over", MOB_LAYER + 1)) -/obj/structure/chair/bed/dildo_machine/verb/change_hole() +/obj/structure/bed/dildo_machine/verb/change_hole() set name = "Change hole" set category = "Object" set src in oview(1) @@ -26,7 +26,7 @@ if("anus") hole = CUM_TARGET_ANUS -/obj/structure/chair/bed/dildo_machine/verb/change_mode() +/obj/structure/bed/dildo_machine/verb/change_mode() set name = "Change mode" set category = "Object" set src in oview(1) @@ -41,7 +41,7 @@ if(mode == "high") intencity = 18 -/obj/structure/chair/bed/dildo_machine/verb/toggle() +/obj/structure/bed/dildo_machine/verb/toggle() set name = "Toggle dildo machine" set category = "Object" set src in oview(1) @@ -55,7 +55,7 @@ else to_chat(usr, "[src] выкл.") -/obj/structure/chair/bed/dildo_machine/proc/fuck() +/obj/structure/bed/dildo_machine/proc/fuck() if(!on) return @@ -95,7 +95,7 @@ if(prob(50)) M.emote("moan") -/obj/structure/chair/bed/dildo_machine/attackby(obj/item/used_item, mob/user, params) +/obj/structure/bed/dildo_machine/attackby(obj/item/used_item, mob/user, params) if(istype(used_item, /obj/item/screwdriver)) to_chat(user, span_notice("You unscrew the frame and begin to deconstruct it...")) if(used_item.use_tool(src, user, 8 SECONDS, volume = 50)) @@ -121,7 +121,7 @@ to_chat(user, span_notice("You screw the frame to the floor and begin to construct it...")) if(used_item.use_tool(src, user, 8 SECONDS, volume = 50)) to_chat(user, span_notice("You assemble it.")) - new /obj/structure/chair/bed/dildo_machine (src.loc) + new /obj/structure/bed/dildo_machine (src.loc) qdel(src) return else diff --git a/modular_bluemoon/Gardelin0/code/obj/lewd_devices/sybian.dm b/modular_bluemoon/Gardelin0/code/obj/lewd_devices/sybian.dm index f8600d05a1b9..8ec726564f2e 100644 --- a/modular_bluemoon/Gardelin0/code/obj/lewd_devices/sybian.dm +++ b/modular_bluemoon/Gardelin0/code/obj/lewd_devices/sybian.dm @@ -7,6 +7,7 @@ var/mode = "normal" var/intencity var/on = 0 + item_chair = null // нельзя брать в руки /obj/structure/chair/sybian/New() ..() diff --git a/modular_splurt/code/datums/traits/good.dm b/modular_splurt/code/datums/traits/good.dm index 94076fdf83f7..58065d277323 100644 --- a/modular_splurt/code/datums/traits/good.dm +++ b/modular_splurt/code/datums/traits/good.dm @@ -15,7 +15,7 @@ //Own stuff /datum/quirk/tough name = "Стойкость" - desc = "Ваше аномально крепкое тело может вынести на 25% больше урона." + desc = "Ваше аномально крепкое тело может вынести на 20% больше урона." value = 3 medical_record_text = "Пациент продемонстрировал аномально высокую устойчивость к травмам." gain_text = "Вы чувствуете крепость в мышцах."