MultiZ Layenia Base

hyperstation/code/obj/Kitchen compliances/reagentblender.dm

@@ -0,0 +1,11 @@
+/obj/machinery/reagentgrinder/reagentblender
+	name = "Stand mixer"
+	desc = "a stationary electric mixer for heavy-duty mixing various foods and other reagents."
+	icon = 'hyperstation/icons/obj/machinery/reagentblender.dmi'
+	icon_state = "mixer1"
+
+/obj/machinery/reagentgrinder/reagentblender/update_icon()
+	if(beaker)
+		icon_state = "mixer1"
+	else
+		icon_state = "mixer0"

hyperstation/code/obj/Lambent/gloves.dm

@@ -0,0 +1,16 @@
+/obj/item/clothing/gloves/lambent
+	name = "Lambent's sleeves"
+	desc = "An elegant sleeve worn from the shoulder down. Despite missing anything on the palm and fingers, it seems to cast small hardlight protections over the hands, like a glove."
+	icon_state = "lambent"
+	item_state = "lambent"
+	icon = 'hyperstation/icons/obj/clothing/gloves.dmi'
+	alternate_worn_icon = 'hyperstation/icons/mobs/gloves.dmi'
+	armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 30, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 20, "acid" = 60)
+	resistance_flags = LAVA_PROOF|FIRE_PROOF|UNACIDABLE
+	transfer_prints = FALSE
+	strip_delay = 40
+	body_parts_covered = ARMS|HANDS
+	cold_protection = ARMS|HANDS
+	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+	siemens_coefficient = 0
+	permeability_coefficient = 0.05

hyperstation/code/obj/Lambent/shoes.dm

@@ -0,0 +1,14 @@
+/obj/item/clothing/shoes/lambent
+	name = "Lambent's heels"
+	desc = "A sleek pair of leggings with high heels, gilded in golden strips. It seems to have an autobalancing matrix installed."
+	icon_state = "lambent"
+	item_state = "lambent"
+	icon = 'hyperstation/icons/obj/clothing/shoes.dmi'
+	alternate_worn_icon = 'hyperstation/icons/mobs/feet.dmi'
+	body_parts_covered = LEGS|FEET
+	cold_protection = LEGS|FEET
+	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+	strip_delay = 70
+	resistance_flags = LAVA_PROOF|FIRE_PROOF|UNACIDABLE
+	armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 30, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 20, "acid" = 60)
+	clothing_flags = NOSLIP

hyperstation/code/obj/Lambent/suit.dm

@@ -0,0 +1,13 @@
+/obj/item/clothing/suit/lambent
+	name = "Lambent's coat"
+	desc = "A regal-esque coat outfitted with inert nanites, waiting to be activated at a moment's notice."
+	icon = 'hyperstation/icons/obj/clothing/suits.dmi'
+	//alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
+	icon_state = "lambent"
+	item_state = "lambent"
+	body_parts_covered = CHEST|LEGS
+	cold_protection = CHEST|GROIN|LEGS|ARMS
+	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+	strip_delay = 70
+	resistance_flags = LAVA_PROOF|FIRE_PROOF|UNACIDABLE
+	armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 30, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 20, "acid" = 60)

hyperstation/code/obj/Lambent/uniform.dm

@@ -0,0 +1,14 @@
+/obj/item/clothing/under/rank/lambent
+	name = "Lambent's outfitting"
+	desc = "A Hyperwoven outfitting meant for a Kinaris Lambent. It's gilded colors and ultratech weaving speak highly about status."
+	icon = 'hyperstation/icons/obj/clothing/uniforms.dmi'
+	//alternate_worn_icon = 'hyperstation/icons/mobs/uniforms.dmi'
+	icon_state = "lambent"
+	item_state = "lambent"
+	armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 30, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 20, "acid" = 60)
+	resistance_flags = LAVA_PROOF|FIRE_PROOF|UNACIDABLE
+	strip_delay = 50
+	sensor_mode = SENSOR_COORDS
+	random_sensor = FALSE
+
+//We'll add more alternative outfits here later. For now this'll be how it is!

hyperstation/code/obj/clothes.dm

@@ -0,0 +1,7 @@
+/obj/item/clothing/under/barber
+	name = "barber's uniform"
+	desc = "A fancy pink shirt paired with light-catching white pants. Yet to be blood- and puke-stained."
+	icon = 'hyperstation/icons/obj/clothing/uniforms.dmi'
+	//alternate_worn_icon = 'hyperstation/icons/mobs/uniforms.dmi'
+	icon_state = "barber"
+	item_state = "barber"

hyperstation/code/obj/kinkyclothes.dm

@@ -160,6 +160,9 @@ obj/item/clothing/neck/stole/black
 	var/firstpickup = TRUE
 	var/pickupsound = TRUE
 
+/obj/item/clothing/under/vaultsuit/no_sound
+	pickupsound = FALSE
+
 /obj/item/clothing/under/vaultsuit/equipped(mob/user, slot)
 	. = ..()
 	if(!pickupsound)

hyperstation/code/obj/plushes.dm

@@ -74,4 +74,11 @@
 	item_state = "enzor"
 	attack_verb = list("tail bapped", "whomped", "squeaked")
 	squeak_override = list('sound/effects/mousesqueek.ogg'= 1)
-//End
+
+//Arc is amazing and has helped Hyper in terms of spriting a ton. They deserve this
+/obj/item/toy/plush/lizardplushie/arctaisia
+	name = "fat lizard plushie"
+	desc = "This lizard is a heckin' chonker!"
+	icon = 'hyperstation/icons/obj/plushes.dmi'
+	icon_state = "arc"
+	squeak_override = list('modular_citadel/sound/voice/weh.ogg' = 1)

hyperstation/code/obj/structures/beacons.dm

@@ -0,0 +1,7 @@
+/obj/structure/beacon
+	name = "beacon"
+	desc = "A small marker beacon"
+	anchored = TRUE
+	density = FALSE
+	icon = 'hyperstation/icons/obj/structures/beacons.dmi'
+	icon_state = "beacon"

hyperstation/code/obj/vibrator.dm

@@ -132,13 +132,14 @@ Code:
 				if(2) //med, can make you cum
 					to_chat(U, "<span class='love'>You feel intense pleasure surge through your [G.name]</span>")
 					U.do_jitter_animation()
-					U.mob_climax_instant()
+					if (U.getArousalLoss() >= 100 && ishuman(U) && U.has_dna())
+						U.mob_climax(forced_climax=TRUE)
 				if(3) //high, makes you stun
 					to_chat(U, "<span class='userdanger'>You feel overpowering pleasure surge through your [G.name]</span>")
 					U.Jitter(3)
 					U.Stun(30)
-					if (U.can_orgasm())
-						U.mob_climax_instant()
+					if (U.getArousalLoss() >= 100 && ishuman(U) && U.has_dna())
+						U.mob_climax(forced_climax=TRUE)
 					if(prob(50))
 						U.emote("moan")