New barber shop. Can now shave corgis.

code/WorkInProgress/Cael_Aislinn/Economy/Job_Departments.dm

@@ -1,4 +1,4 @@
-var/list/station_departments = list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Civilian")
+var/list/station_departments = list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Civilian", "Trade")
 
 // The department the job belongs to.
 /datum/job/var/department = null
@@ -67,4 +67,7 @@ var/list/station_departments = list("Command", "Medical", "Engineering", "Scienc
 
 /datum/job/detective/department = "Security"
 
-/datum/job/officer/department = "Security"
+/datum/job/officer/department = "Security"
+
+/datum/job/trader/department = "Trade"
+/datum/job/trader/head_position = 1

code/game/area/Space Station 13 areas.dm

@@ -689,17 +689,23 @@ proc/process_ghost_teleport_locs()
 	name = "\improper Starboard Primary Hallway"
 	icon_state = "hallS"
 
+/area/hallway/primary/starboard/west
+/area/hallway/primary/starboard/east
+
 /area/hallway/primary/aft
 	name = "\improper Aft Primary Hallway"
 	icon_state = "hallA"
 
+
 /area/hallway/primary/port
 	name = "\improper Port Primary Hallway"
 	icon_state = "hallP"
 
 /area/hallway/primary/port/west
+	name = "\improper Port West Hallway"
 
 /area/hallway/primary/port/east
+	name = "\improper Port East Hallway"
 
 /area/hallway/primary/central
 	name = "\improper Central Primary Hallway"
@@ -872,7 +878,13 @@ proc/process_ghost_teleport_locs()
 	name = "\improper Law Office"
 	icon_state = "law"
 
+/area/civilian/barber
+	name = "\improper Barber Shop"
+	icon_state = "barber"
 
+/area/civilian/clothing
+	name = "\improper Clothing Shop"
+	icon_state = "Theatre"
 
 
 

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -124,4 +124,7 @@
 	icon_state = "officechair_white"
 
 /obj/structure/stool/bed/chair/office/dark
-	icon_state = "officechair_dark"
+	icon_state = "officechair_dark"
+
+/obj/structure/stool/bed/chair/barber
+	icon_state = "barber_chair"

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

@@ -479,4 +479,23 @@
 	desc = "It's a borgi."
 	icon_state = "borgi"
 	icon_living = "borgi"
-	icon_dead = "borgi_dead"
+
+
+/mob/living/simple_animal/corgi/Ian/borgi/Life()
+	..()
+
+	//spark for no reason
+	if(prob(5))
+		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+		s.set_up(3, 1, src)
+		s.start()
+
+/mob/living/simple_animal/corgi/Ian/borgi/Die()
+	..()
+	visible_message("<b>[src]</b> blows apart!")
+	new /obj/effect/decal/cleanable/robot_debris(src.loc)
+	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+	s.set_up(3, 1, src)
+	s.start()
+	del src
+	return