barber deletion

_maps/map_files/Delta/delta.dmm

@@ -105656,7 +105656,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/effect/landmark/start/barber,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},

_maps/map_files/celestation/celestation.dmm

@@ -182,7 +182,6 @@
 /obj/structure/chair/barber{
 	dir = 8
 	},
-/obj/effect/landmark/start/barber,
 /obj/structure/cable/orange{
 	icon_state = "1-4"
 	},

_maps/map_files/cerestation/cerestation.dmm

@@ -8275,7 +8275,6 @@
 	},
 /area/quartermaster/storage)
 "bkY" = (
-/obj/effect/landmark/start/barber,
 /obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
@@ -88251,7 +88250,6 @@
 /obj/structure/chair/barber{
 	dir = 8
 	},
-/obj/effect/landmark/start/barber,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},

_maps/map_files/cyberiad/cyberiad.dmm

@@ -10566,7 +10566,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/effect/landmark/start/barber,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},

_maps/map_files/event/Station/delta_old.dmm

@@ -16339,7 +16339,6 @@
 	scrub_N2O = 1;
 	scrub_Toxins = 1
 	},
-/obj/effect/landmark/start/barber,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},

_maps/map_files/event/Station/towerstation.dmm

@@ -18395,7 +18395,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
-/obj/effect/landmark/start/barber,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
@@ -31694,7 +31693,6 @@
 	},
 /area/atmos)
 "uvM" = (
-/obj/effect/landmark/start/barber,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},

_maps/map_files/nova/nova.dmm

@@ -97079,7 +97079,6 @@
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint3)
 "oqt" = (
-/obj/effect/landmark/start/barber,
 /turf/simulated/floor/wood/oak,
 /area/civilian/barber)
 "oqu" = (
@@ -131759,7 +131758,6 @@
 /obj/structure/chair/comfy/black{
 	dir = 4
 	},
-/obj/effect/landmark/start/barber,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "dark"

code/__DEFINES/job.dm

@@ -60,7 +60,6 @@
 
 #define JOB_FLAG_REPRESENTATIVE				(1<<0)
 #define JOB_FLAG_BLUESHIELD		(1<<1)
-#define JOB_FLAG_BARBER			(1<<3)
 #define JOB_FLAG_MECHANIC			(1<<4)
 #define JOB_FLAG_BRIGDOC			(1<<5)
 #define JOB_FLAG_JUDGE				(1<<6)
@@ -120,7 +119,6 @@
 #define JOB_TITLE_MIME "Mime"
 #define JOB_TITLE_JANITOR "Janitor"
 #define JOB_TITLE_LIBRARIAN "Librarian"
-#define JOB_TITLE_BARBER "Barber"
 #define JOB_TITLE_EXPLORER "Explorer"
 
 #define JOB_TITLE_SYNDICATE "Syndicate Officer"

code/datums/datacore.dm

@@ -396,9 +396,6 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
 		if(JOB_TITLE_LIBRARIAN)
 			clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "red_suit_s")
 			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
-		if(JOB_TITLE_BARBER)
-			clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "barber_s")
-			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
 		if(JOB_TITLE_CLOWN)
 			clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "clown_s")
 			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "clown"), ICON_UNDERLAY)

code/datums/uplink_item.dm

@@ -469,14 +469,6 @@
 	cost = 15
 	job = list(JOB_TITLE_BARTENDER)
 
-//Barber
-/datum/uplink_item/jobspecific/safety_scissors //Hue
-	name = "Safety Scissors"
-	desc = "A pair of scissors that are anything but what their name implies; can easily cut right into someone's throat."
-	item = /obj/item/scissors/safety
-	cost = 6
-	job = list(JOB_TITLE_BARBER)
-
 //Botanist
 /datum/uplink_item/jobspecific/bee_briefcase
 	name = "Briefcase Full of Bees"

code/game/gamemodes/antag_paradise/antag_paradise.dm

@@ -12,7 +12,7 @@
 	required_players = 10
 	required_enemies = 1
 	forbidden_antag_jobs = list(ROLE_VAMPIRE = list(JOB_TITLE_CHAPLAIN))
-	var/list/protected_jobs_AI = list(JOB_TITLE_CIVILIAN, JOB_TITLE_CHIEF, JOB_TITLE_ENGINEER, JOB_TITLE_ENGINEER_TRAINEE, JOB_TITLE_ATMOSTECH, JOB_TITLE_MECHANIC, JOB_TITLE_CMO, JOB_TITLE_DOCTOR, JOB_TITLE_INTERN, JOB_TITLE_CORONER, JOB_TITLE_CHEMIST, JOB_TITLE_GENETICIST, JOB_TITLE_VIROLOGIST, JOB_TITLE_PSYCHIATRIST, JOB_TITLE_PARAMEDIC, JOB_TITLE_RD, JOB_TITLE_SCIENTIST, JOB_TITLE_SCIENTIST_STUDENT, JOB_TITLE_ROBOTICIST, JOB_TITLE_HOP, JOB_TITLE_CHAPLAIN, JOB_TITLE_BARTENDER, JOB_TITLE_CHEF, JOB_TITLE_BOTANIST, JOB_TITLE_QUARTERMASTER, JOB_TITLE_CARGOTECH, JOB_TITLE_MINER, JOB_TITLE_CLOWN, JOB_TITLE_MIME, JOB_TITLE_JANITOR, JOB_TITLE_LIBRARIAN, JOB_TITLE_BARBER, JOB_TITLE_EXPLORER)	// Basically all jobs, except AI.
+	var/list/protected_jobs_AI = list(JOB_TITLE_CIVILIAN, JOB_TITLE_CHIEF, JOB_TITLE_ENGINEER, JOB_TITLE_ENGINEER_TRAINEE, JOB_TITLE_ATMOSTECH, JOB_TITLE_MECHANIC, JOB_TITLE_CMO, JOB_TITLE_DOCTOR, JOB_TITLE_INTERN, JOB_TITLE_CORONER, JOB_TITLE_CHEMIST, JOB_TITLE_GENETICIST, JOB_TITLE_VIROLOGIST, JOB_TITLE_PSYCHIATRIST, JOB_TITLE_PARAMEDIC, JOB_TITLE_RD, JOB_TITLE_SCIENTIST, JOB_TITLE_SCIENTIST_STUDENT, JOB_TITLE_ROBOTICIST, JOB_TITLE_HOP, JOB_TITLE_CHAPLAIN, JOB_TITLE_BARTENDER, JOB_TITLE_CHEF, JOB_TITLE_BOTANIST, JOB_TITLE_QUARTERMASTER, JOB_TITLE_CARGOTECH, JOB_TITLE_MINER, JOB_TITLE_CLOWN, JOB_TITLE_MIME, JOB_TITLE_JANITOR, JOB_TITLE_LIBRARIAN, JOB_TITLE_EXPLORER)	// Basically all jobs, except AI.
 	var/secondary_protected_species = list(SPECIES_MACNINEPERSON)
 	var/vampire_restricted_jobs = list(JOB_TITLE_CHAPLAIN)
 	/// Chosen antags if any. Key - mind, value - antag type

code/game/gamemodes/traitor/traitor.dm

@@ -18,7 +18,7 @@
 	restricted_jobs = list(JOB_TITLE_CYBORG, JOB_TITLE_AI)
 	protected_jobs = list(JOB_TITLE_OFFICER, JOB_TITLE_WARDEN, JOB_TITLE_DETECTIVE, JOB_TITLE_HOS, JOB_TITLE_CAPTAIN, JOB_TITLE_BLUESHIELD, JOB_TITLE_REPRESENTATIVE, JOB_TITLE_PILOT, JOB_TITLE_JUDGE, JOB_TITLE_LAWYER, JOB_TITLE_BRIGDOC, JOB_TITLE_CCOFFICER, JOB_TITLE_CCFIELD, JOB_TITLE_CCSPECOPS, JOB_TITLE_CCSUPREME, JOB_TITLE_SYNDICATE)
 	/// Basically all jobs, except AI.
-	var/list/protected_jobs_AI = list(JOB_TITLE_CIVILIAN, JOB_TITLE_CHIEF, JOB_TITLE_ENGINEER, JOB_TITLE_ENGINEER_TRAINEE, JOB_TITLE_ATMOSTECH, JOB_TITLE_MECHANIC, JOB_TITLE_CMO, JOB_TITLE_DOCTOR, JOB_TITLE_INTERN, JOB_TITLE_CORONER, JOB_TITLE_CHEMIST, JOB_TITLE_GENETICIST, JOB_TITLE_VIROLOGIST, JOB_TITLE_PSYCHIATRIST, JOB_TITLE_PARAMEDIC, JOB_TITLE_RD, JOB_TITLE_SCIENTIST, JOB_TITLE_SCIENTIST_STUDENT, JOB_TITLE_ROBOTICIST, JOB_TITLE_HOP, JOB_TITLE_CHAPLAIN, JOB_TITLE_BARTENDER, JOB_TITLE_CHEF, JOB_TITLE_BOTANIST, JOB_TITLE_QUARTERMASTER, JOB_TITLE_CARGOTECH, JOB_TITLE_MINER, JOB_TITLE_CLOWN, JOB_TITLE_MIME, JOB_TITLE_JANITOR, JOB_TITLE_LIBRARIAN, JOB_TITLE_BARBER, JOB_TITLE_EXPLORER)
+	var/list/protected_jobs_AI = list(JOB_TITLE_CIVILIAN, JOB_TITLE_CHIEF, JOB_TITLE_ENGINEER, JOB_TITLE_ENGINEER_TRAINEE, JOB_TITLE_ATMOSTECH, JOB_TITLE_MECHANIC, JOB_TITLE_CMO, JOB_TITLE_DOCTOR, JOB_TITLE_INTERN, JOB_TITLE_CORONER, JOB_TITLE_CHEMIST, JOB_TITLE_GENETICIST, JOB_TITLE_VIROLOGIST, JOB_TITLE_PSYCHIATRIST, JOB_TITLE_PARAMEDIC, JOB_TITLE_RD, JOB_TITLE_SCIENTIST, JOB_TITLE_SCIENTIST_STUDENT, JOB_TITLE_ROBOTICIST, JOB_TITLE_HOP, JOB_TITLE_CHAPLAIN, JOB_TITLE_BARTENDER, JOB_TITLE_CHEF, JOB_TITLE_BOTANIST, JOB_TITLE_QUARTERMASTER, JOB_TITLE_CARGOTECH, JOB_TITLE_MINER, JOB_TITLE_CLOWN, JOB_TITLE_MIME, JOB_TITLE_JANITOR, JOB_TITLE_LIBRARIAN, JOB_TITLE_EXPLORER)
 	required_players = 0
 	required_enemies = 1
 	recommended_enemies = 4

code/game/jobs/job/support.dm

@@ -613,37 +613,6 @@
 	backpack_contents = list(
 		/obj/item/videocam = 1)
 
-/datum/job/barber
-	title = JOB_TITLE_BARBER
-	flag = JOB_FLAG_BARBER
-	department_flag = JOBCAT_KARMA
-	total_positions = 1
-	spawn_positions = 1
-	is_service = 1
-	supervisors = "the head of personnel"
-	department_head = list(JOB_TITLE_HOP)
-	selection_color = "#d1e8d3"
-	alt_titles = list("Hair Stylist","Beautician")
-	access = list(ACCESS_MAINT_TUNNELS)
-	minimal_access = list(ACCESS_MAINT_TUNNELS)
-	outfit = /datum/outfit/job/barber
-
-	salary = 100
-	min_start_money = 100
-	max_start_money = 300
-
-/datum/outfit/job/barber
-	name = "Barber"
-	jobtype = /datum/job/barber
-
-	uniform = /obj/item/clothing/under/barber
-	shoes = /obj/item/clothing/shoes/black
-	l_ear = /obj/item/radio/headset/headset_service
-	backpack_contents = list(
-		/obj/item/storage/box/lip_stick = 1,
-		/obj/item/storage/box/barber = 1
-	)
-
 /datum/job/explorer
 	title = JOB_TITLE_EXPLORER
 	flag = JOB_FLAG_EXPLORER

code/game/jobs/jobs.dm

@@ -76,7 +76,6 @@ GLOBAL_LIST_INIT(support_positions, list(
 	JOB_TITLE_CHAPLAIN,
 	JOB_TITLE_CLOWN,
 	JOB_TITLE_MIME,
-	JOB_TITLE_BARBER,
 	JOB_TITLE_JUDGE,
 	JOB_TITLE_REPRESENTATIVE,
 	JOB_TITLE_BLUESHIELD,
@@ -105,7 +104,6 @@ GLOBAL_LIST_INIT(nonhuman_positions, list(
 GLOBAL_LIST_INIT(whitelisted_positions, list(
 	JOB_TITLE_BLUESHIELD,
 	JOB_TITLE_REPRESENTATIVE,
-	JOB_TITLE_BARBER,
 	JOB_TITLE_MECHANIC,
 	JOB_TITLE_BRIGDOC,
 	JOB_TITLE_JUDGE,

code/game/machinery/computer/card.dm

@@ -56,7 +56,6 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 		/datum/job/mechanic,
 		/datum/job/chaplain,
 		/datum/job/officer,
-		/datum/job/barber
 	)
 	//The scaling factor of max total positions in relation to the total amount of people on board the station in %
 	var/max_relative_positions = 30 //30%: Seems reasonable, limit of 6 @ 20 players

code/game/machinery/tcomms/nttc.dm

@@ -76,7 +76,6 @@
 		JOB_TITLE_CARGOTECH = "supradio",
 		JOB_TITLE_MINER = "supradio",
 		// Service
-		JOB_TITLE_BARBER = "srvradio",
 		JOB_TITLE_BARTENDER = "srvradio",
 		JOB_TITLE_BOTANIST = "srvradio",
 		JOB_TITLE_CHAPLAIN = "srvradio",

code/game/objects/effects/landmarks.dm

@@ -471,10 +471,6 @@
 	name = JOB_TITLE_LIBRARIAN
 	icon_state = "Librarian"
 
-/obj/effect/landmark/start/barber
-	name = JOB_TITLE_BARBER
-	icon_state = "Barber"
-
 /obj/effect/landmark/start/chaplain
 	name = JOB_TITLE_CHAPLAIN
 	icon_state = "Chap"

code/game/objects/items/weapons/scissors.dm

@@ -68,48 +68,3 @@
 		span_notice("[user] finishes cutting [target]'s hair!"),
 		span_notice("You have finished cutting [target]'s hair!"),
 	)
-
-
-/obj/item/scissors/safety //Totally safe, I assure you.
-	desc = "The blades of the scissors appear to be made of some sort of ultra-strong metal alloy."
-	force = 18 //same as e-daggers
-	/// To prevent spam clicking this for huge accumulation of losebreath.
-	var/is_cutting = FALSE
-
-
-/obj/item/scissors/safety/attack(mob/living/carbon/human/target, mob/living/carbon/human/user, params, def_zone, skip_attack_anim = FALSE)
-	if(!ishuman(target) || !ishuman(user) || user.a_intent != INTENT_HELP)
-		return ..()
-
-	. = ATTACK_CHAIN_PROCEED
-
-	if(is_cutting || user == target)
-		return .
-
-	is_cutting = TRUE
-	user.visible_message(
-		span_notice("[user] starts cutting [target]'s hair!"),
-		span_notice("You start cutting [target]'s hair!"),
-	)
-	playsound(loc, 'sound/goonstation/misc/scissor.ogg', 100, TRUE)
-	if(!do_after(user, 5 SECONDS * toolspeed, target, category = DA_CAT_TOOL))
-		is_cutting = FALSE
-		return .
-
-	. |= ATTACK_CHAIN_SUCCESS
-	is_cutting = FALSE
-	playsound(loc, 'sound/weapons/bladeslice.ogg', 50, TRUE, -1)
-	user.visible_message(
-		span_danger("[user] abruptly stops cutting [target]'s hair and slices [target.p_their()] throat!"),
-		span_danger("You stop cutting [target]'s hair and slice [target.p_their()] throat!"),
-	)
-	target.AdjustLoseBreath(20 SECONDS) //30 Oxy damage over time
-	var/success = target.apply_damage(18, BRUTE, BODY_ZONE_HEAD, sharp = TRUE, used_weapon = src)
-	if(!success)
-		return .
-	target.add_splatter_floor()
-	target.bloody_hands(target)
-	target.bloody_body(target)
-	user.bloody_hands(target)
-	user.bloody_body(target)
-

code/modules/client/preference/loadout/loadout_uniform.dm

@@ -230,11 +230,6 @@
 	path = /obj/item/clothing/under/rank/chaplain/skirt
 	allowed_roles = list(JOB_TITLE_CHAPLAIN)
 
-/datum/gear/uniform/skirt/job/barber
-	display_name = "skirt, barber"
-	path = /obj/item/clothing/under/barber/skirt
-	allowed_roles = list(JOB_TITLE_BARBER)
-
 /datum/gear/uniform/skirt/job/nanotrasenofficer
 	display_name = "skirt, NNO"
 	path = /obj/item/clothing/under/rank/centcom/officer/skirt

code/modules/newscaster/obj/newscaster.dm

@@ -76,7 +76,6 @@
 			/datum/job/pilot,
 			/datum/job/brigdoc,
 			/datum/job/mechanic,
-			/datum/job/barber,
 			/datum/job/chaplain,
 			/datum/job/ntnavyofficer,
 			/datum/job/ntnavyofficer/field,