Various upstream related fixes

code/game/objects/items/cosmetics.dm

@@ -185,7 +185,6 @@
 		span_notice("You wipe off [target]'s lipstick."))
 	target.update_lips(null)
 
-/* SKYRAT EDIT REMOVAL
 /obj/item/razor
 	name = "electric razor"
 	desc = "The latest and greatest power razor born from the science of shaving."
@@ -199,6 +198,7 @@
 	drop_sound = SFX_GENERIC_DEVICE_DROP
 	custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.7)
 
+/* SKYRAT EDIT REMOVAL
 /obj/item/razor/suicide_act(mob/living/user)
 	user.visible_message(span_suicide("[user] begins shaving [user.p_them()]self without the razor guard! It looks like [user.p_theyre()] trying to commit suicide!"))
 	if (ishuman(user))

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -295,7 +295,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
 	else
 		new/obj/structure/girder/displaced(build_on)
 		user.balloon_alert(user, "girder created")
-	user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT: Construction Skill
+	user.mind?.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT: Construction Skill
 	return ITEM_INTERACT_SUCCESS
 
 /*

code/game/objects/items/stacks/stack.dm

@@ -464,7 +464,7 @@
 		created.setDir(builder.dir)
 	created.on_craft_completion(list(used_stack), null, builder)
 
-	builder.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT: Construction Skill
+	builder.mind?.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT: Construction Skill
 
 	builder.investigate_log("crafted [recipe.title]", INVESTIGATE_CRAFTING)