MultiZ Layenia Base

code/modules/mob/living/carbon/human/human.dm

@@ -5,24 +5,30 @@
 	icon_state = "caucasian_m"
 	appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE
 
-
 /mob/living/carbon/human/Initialize()
 	add_verb(src, /mob/living/proc/mob_sleep)
 	add_verb(src, /mob/living/proc/lay_down)
 	time_initialized = world.time
+
 	//initialize limbs first
 	create_bodyparts()
+
 	//initialize dna. for spawned humans; overwritten by other code
 	create_dna(src)
 	randomize_human(src)
 	dna.initialize_dna()
+
 	if(dna.species)
 		set_species(dna.species.type)
+
 	//initialise organs
 	create_internal_organs() //most of it is done in set_species now, this is only for parent call
 	physiology = new()
+
 	AddComponent(/datum/component/personal_crafting)
+
 	. = ..()
+
 	RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, /mob/living/carbon/human/clean_blood)
 
 

code/modules/mob/living/carbon/life.dm

@@ -77,7 +77,8 @@
 			var/mob/living/carbon/human/B = src
 			if(HAS_TRAIT(B, TRAIT_CHOKE_SLUT))
 				B.adjustArousalLoss(7)
-				B.mob_climax_instant()
+				if (B.getArousalLoss() >= 100 && ishuman(B) && B.has_dna())
+					B.mob_climax(forced_climax=TRUE)
 			else
 				SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "suffocation", /datum/mood_event/suffocation)
 		else

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -463,7 +463,7 @@
 		/obj/item/paint/anycolor,
 		/obj/item/cookiesynth,
 		/obj/item/pneumatic_cannon/pie/selfcharge/cyborg,
-		/obj/item/razor,					//killbait material
+		///obj/item/razor,					//killbait material
 		/obj/item/lipstick/purple,
 		/obj/item/soap/nanotrasen,
 		/obj/item/reagent_containers/spray/waterflower/cyborg,
@@ -497,7 +497,7 @@
 		/obj/item/toy/crayon/spraycan/borg,
 		/obj/item/extinguisher/mini,
 		/obj/item/hand_labeler/borg,
-		/obj/item/razor,
+		///obj/item/razor,
 		/obj/item/crowbar/cyborg,
 		/obj/item/instrument/violin,
 		/obj/item/soap/nanotrasen,

code/modules/mob/living/simple_animal/friendly/dog.dm

@@ -132,7 +132,7 @@
 		if(inventory_back)
 			armorval += inventory_back.armor.getRating(type)
 	return armorval*0.5
-
+/*
 /mob/living/simple_animal/pet/dog/corgi/attackby(obj/item/O, mob/user, params)
 	if (istype(O, /obj/item/razor))
 		if (shaved)
@@ -155,7 +155,7 @@
 		return
 	..()
 	update_corgi_fluff()
-
+*/
 /mob/living/simple_animal/pet/dog/corgi/Topic(href, href_list)
 	if(!(iscarbon(usr) || iscyborg(usr)) || !usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
 		usr << browse(null, "window=mob[REF(src)]")