Removes Barber because its a poorly designed role (ParadiseSS13#23053)

* solong

* test

* update

* fixififixx

* ok back to barbers

* spring cleaning

* i hate you safety scissors, genuinely

* space fix

* reviews

* Update sechud.dmi

* Update card.dmi

_maps/map_files/Delta/delta.dmm

@@ -93907,7 +93907,6 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/obj/effect/landmark/start/barber,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},

_maps/map_files/MetaStation/MetaStation.dmm

@@ -60370,7 +60370,6 @@
 	name = "west bump";
 	pixel_x = -24
 	},
-/obj/effect/landmark/start/barber,
 /obj/machinery/power/apc{
 	name = "south bump";
 	pixel_y = -24

_maps/map_files/cerestation/cerestation.dmm

@@ -93911,7 +93911,6 @@
 /turf/simulated/floor/carpet/cyan,
 /area/station/public/fitness)
 "xhr" = (
-/obj/effect/landmark/start/barber,
 /obj/structure/cable/orange{
 	d1 = 1;
 	d2 = 2;

_maps/map_files/cyberiad/cyberiad.dmm

@@ -66142,7 +66142,6 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
 "juM" = (
-/obj/effect/landmark/start/barber,
 /obj/machinery/hologram/holopad,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10

code/__DEFINES/job_defines.dm

@@ -55,4 +55,3 @@
 #define JOB_MIME				(1<<12)
 #define JOB_ASSISTANT			(1<<13)
 #define JOB_EXPLORER			(1<<14)
-#define JOB_BARBER				(1<<15)

code/datums/datacore.dm

@@ -388,9 +388,6 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
 		if("Librarian")
 			clothes_s = new /icon('icons/mob/clothing/under/civilian.dmi', "red_suit_s")
 			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
-		if("Barber")
-			clothes_s = new /icon('icons/mob/clothing/under/civilian.dmi', "barber_s")
-			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
 		if("Clown")
 			clothes_s = new /icon('icons/mob/clothing/under/civilian.dmi', "clown_s")
 			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "clown"), ICON_UNDERLAY)

code/datums/uplink_items/uplink_traitor.dm

@@ -194,18 +194,7 @@
 	cost = 10
 	job = list("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."
-	reference = "CTS"
-	item = /obj/item/scissors/safety
-	cost = 15
-	job = list("Barber")
-
 //Botanist
-
 /datum/uplink_item/jobspecific/bee_briefcase
 	name = "Briefcase Full of Bees"
 	desc = "A seemingly innocent briefcase full of not-so-innocent Syndicate-bred bees. Inject the case with blood to train the bees to ignore the donor(s), WARNING: exotic blood types such as slime jelly do not work. It also wirelessly taps into station intercomms to broadcast a message of TERROR."

code/game/jobs/departments.dm

@@ -127,7 +127,6 @@
 		"Chaplain",
 		"Clown",
 		"Mime",
-		"Barber",
 		"Magistrate",
 		"Nanotrasen Representative",
 		"Blueshield",

code/game/jobs/job/support.dm

@@ -467,34 +467,6 @@
 			continue
 		H.add_language(la)
 
-/datum/job/barber
-	title = "Barber"
-	flag = JOB_BARBER
-	department_flag = JOBCAT_SUPPORT
-	total_positions = 1
-	spawn_positions = 1
-	job_department_flags = DEP_FLAG_SERVICE
-	supervisors = "the head of personnel"
-	department_head = list("Head of Personnel")
-	selection_color = "#dddddd"
-	alt_titles = list("Hair Stylist","Beautician")
-	access = list(ACCESS_MAINT_TUNNELS)
-	minimal_access = list(ACCESS_MAINT_TUNNELS)
-	outfit = /datum/outfit/job/barber
-
-/datum/outfit/job/barber
-	name = "Barber"
-	jobtype = /datum/job/barber
-
-	uniform = /obj/item/clothing/under/rank/civilian/barber
-	shoes = /obj/item/clothing/shoes/black
-	l_ear = /obj/item/radio/headset/headset_service
-	id = /obj/item/card/id/barber
-	backpack_contents = list(
-		/obj/item/storage/box/lip_stick = 1,
-		/obj/item/storage/box/barber = 1
-	)
-
 /datum/job/explorer
 	title = "Explorer"
 	flag = JOB_EXPLORER

code/game/jobs/job_globals.dm

@@ -67,7 +67,6 @@ GLOBAL_LIST_INIT(support_positions, list(
 	"Chaplain",
 	"Clown",
 	"Mime",
-	"Barber",
 	"Explorer"
 ))
 

code/game/machinery/computer/arcade_games/recruiter.dm

@@ -39,7 +39,7 @@
 	var/list/incorrect_planets = list("Eath", "Marks", "Lunao", "Jabon 4", "Old Canaan", "Mauna-P",
 									"Daohmai", "Gomhes", "Zrerrballak", "Xarqis", "Soorlm", "Urum", "Baron 1", "Kelunte", "Daltedt")
 
-	var/list/jobs = list("Assistant", "Clown", "Chef", "Janitor", "Bartender", "Barber", "Botanist", "Explorer", "Quartermaster",
+	var/list/jobs = list("Assistant", "Clown", "Chef", "Janitor", "Bartender", "Botanist", "Explorer", "Quartermaster",
 						"Station Engineer", "Atmospheric Technician", "Medical Doctor", "Coroner", "Geneticist", "Chaplain", "Librarian",
 						"Security Officer", "Detective", "Scientist", "Roboticist", "Shaft Miner", "Cargo Technician", "Internal Affairs Agent")
 	/// Jobs that NT stations dont offer/mispelled

code/game/machinery/tcomms/nttc.dm

@@ -112,7 +112,6 @@
 		"Shaft Miner" = "supradio",
 		"Spelunker" = "supradio",
 		// Service
-		"Barber" = "srvradio",
 		"Bartender" = "srvradio",
 		"Beautician" = "srvradio",
 		"Botanical Researcher" = "srvradio",

code/game/objects/effects/landmarks.dm

@@ -107,7 +107,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
 /obj/effect/landmark/spawner/rev
 	name = "revenantspawn"
 	icon_state = "Rev"
-	
+
 /obj/effect/landmark/spawner/bubblegum_arena
 	name = "bubblegum_arena_human"
 	icon_state = "Explorer"
@@ -279,10 +279,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
 	name = "Blueshield"
 	icon_state = "BS"
 
-/obj/effect/landmark/start/barber
-	name = "Barber"
-	icon_state = "Barber"
-
 /obj/effect/landmark/start/bartender
 	name = "Bartender"
 	icon_state = "Bartender"

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

@@ -446,7 +446,6 @@
 							"assistant",
 							"clown",
 							"mime",
-							"barber",
 							"botanist",
 							"librarian",
 							"chaplain",
@@ -938,12 +937,6 @@
 	desc = "..."
 	access = list(ACCESS_MIME, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS)
 
-/obj/item/card/id/barber
-	name = "Barber ID"
-	registered_name = "Barber"
-	icon_state = "barber"
-	access = list(ACCESS_MAINT_TUNNELS)
-
 /obj/item/card/id/botanist
 	name = "Botanist ID"
 	registered_name = "Botanist"
@@ -1109,7 +1102,7 @@
 	override_name = 1
 
 /proc/get_station_card_skins()
-	return list("data","id","gold","silver","security","detective","warden","internalaffairsagent","medical","coroner","chemist","virologist","paramedic","psychiatrist","geneticist","research","roboticist","quartermaster","cargo","shaftminer","engineering","atmostech","captain","HoP","HoS","CMO","RD","CE","assistant","clown","mime","barber","botanist","librarian","chaplain","bartender","chef","janitor","rainbow","prisoner","explorer")
+	return list("data","id","gold","silver","security","detective","warden","internalaffairsagent","medical","coroner","chemist","virologist","paramedic","psychiatrist","geneticist","research","roboticist","quartermaster","cargo","shaftminer","engineering","atmostech","captain","HoP","HoS","CMO","RD","CE","assistant","clown","mime","botanist","librarian","chaplain","bartender","chef","janitor","rainbow","prisoner","explorer")
 
 /proc/get_centcom_card_skins()
 	return list("centcom","blueshield","magistrate","ntrep","ERT_leader","ERT_empty","ERT_security","ERT_engineering","ERT_medical","ERT_janitorial","ERT_paranormal","deathsquad","commander","syndie","TDred","TDgreen")

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

@@ -12,7 +12,7 @@
 
 /obj/item/scissors/barber
 	name = "Barber's Scissors"
-	desc = "A pair of scissors used by the barber."
+	desc = "A pair of scissors used by a barber."
 	icon_state = "bscissor"
 	item_state = "scissor"
 	attack_verb = list("beautifully sliced", "artistically cut", "smoothly stabbed", "quickly jabbed")
@@ -49,38 +49,3 @@
 		H.update_hair()
 		H.update_fhair()
 		user.visible_message("<span class='notice'>[user] finishes cutting [M]'s hair!</span>")
-
-/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
-	var/is_cutting = 0 //to prevent spam clicking this for huge accumulation of losebreath.
-
-/obj/item/scissors/safety/attack(mob/living/carbon/M as mob, mob/user as mob)
-	if(user.a_intent != INTENT_HELP)
-		..()
-		return
-	if(!(M in view(1)))
-		..()
-		return
-	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
-
-		if(!is_cutting)
-			is_cutting = 1
-			user.visible_message("<span class='notice'>[user] starts cutting [M]'s hair!</span>", "<span class='notice'>You start cutting [M]'s hair!</span>")
-			playsound(loc, 'sound/goonstation/misc/scissor.ogg', 100, 1)
-			if(do_after(user, 50 * toolspeed, target = H))
-				playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
-				user.visible_message("<span class='danger'>[user] abruptly stops cutting [M]'s hair and slices [M.p_their()] throat!</span>", "<span class='danger'>You stop cutting [M]'s hair and slice [M.p_their()] throat!</span>") //Just a little off the top.
-				H.AdjustLoseBreath(20 SECONDS) //30 Oxy damage over time
-				H.apply_damage(18, BRUTE, "head", sharp =1, used_weapon = "scissors")
-				var/turf/location = get_turf(src)
-				H.add_splatter_floor(location)
-				H.bloody_hands(H)
-				H.bloody_body(H)
-				var/mob/living/carbon/human/U = user
-				U.bloody_hands(H)
-				U.bloody_body(H)
-				is_cutting = 0
-				return
-			is_cutting = 0

code/game/objects/mail.dm

@@ -155,7 +155,7 @@
 							/obj/item/toy/figure/crew/janitor,
 							/obj/item/toy/figure/crew/librarian,
 							/obj/item/storage/box/scratch_cards)
-	job_list = list("Bartender", "Chef", "Botanist", "Janitor", "Barber", "Librarian", "Barber")
+	job_list = list("Bartender", "Chef", "Botanist", "Janitor", "Librarian")
 
 /obj/item/envelope/circuses
 	icon_state = "mail_serv"