Merge branch 'master' of https://github.com/Baystation12/Baystation12

Conflicts:
	baystation12.dme
	maps/tgstation.2.1.0.0.1.dmm

code/game/communications.dm

@@ -105,12 +105,11 @@ var/list/radiochannels = list(
 	"Engineering" = 1357,
 	"Security" = 1359,
 	"Deathsquad" = 1441,
-	"Response Team" = 1439,
 	"Syndicate" = 1213,
 	"Supply" = 1347,
 )
 //depenging helpers
-var/list/DEPT_FREQS = list(1351,1355,1357,1359,1213,1439,1441,1347)
+var/list/DEPT_FREQS = list(1351,1355,1357,1359,1213,1441,1347)
 var/const/COMM_FREQ = 1353 //command, colored gold in chat window
 var/const/SYND_FREQ = 1213
 

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

@@ -130,7 +130,7 @@
 			if(user.mind.special_role)
 				usr << "\blue The card's microscanners activate as you pass it over the ID, copying its access."
 
-/obj/item/weapon/card/id/syndicate/var/mob/registered_user = null
+
 /obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob)
 	if(!src.registered_name)
 		//Stop giving the players unsanitized unputs! You are giving ways for players to intentionally crash clients! -Nodrak
@@ -148,27 +148,6 @@
 		src.assignment = u
 		src.name = "[src.registered_name]'s ID Card ([src.assignment])"
 		user << "\blue You successfully forge the ID card."
-		registered_user = user
-	else if(registered_user == user)
-		switch(alert("Would you like to display the ID, or retitle it?","Choose.","Rename","Show"))
-			if("Rename")
-				var t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name)),1,26)
-				if(!t || t == "Unknown" || t == "floor" || t == "wall" || t == "r-wall") //Same as mob/new_player/prefrences.dm
-					alert("Invalid name.")
-					return
-				src.registered_name = t
-
-				var u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")),1,MAX_MESSAGE_LEN)
-				if(!u)
-					alert("Invalid assignment.")
-					src.registered_name = ""
-					return
-				src.assignment = u
-				src.name = "[src.registered_name]'s ID Card ([src.assignment])"
-				user << "\blue You successfully forge the ID card."
-				return
-			if("Show")
-				..()
 	else
 		..()
 

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -16,7 +16,7 @@
 		else
 			new /obj/item/weapon/storage/backpack/satchel_cap(src)
 		new /obj/item/clothing/suit/captunic(src)
-		new /obj/item/clothing/suit/capjacket(src)
+		new /obj/item/clothing/suit/captunic/capjacket(src)
 		new /obj/item/clothing/head/helmet/cap(src)
 		new /obj/item/clothing/under/rank/captain(src)
 		new /obj/item/clothing/suit/armor/vest(src)

code/modules/clothing/suits/jobs.dm

@@ -21,11 +21,11 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	flags_inv = HIDEJUMPSUIT
 
-/obj/item/clothing/suit/capjacket
+/obj/item/clothing/suit/captunic/capjacket
 	name = "captain's uniform jacket"
 	desc = "A less formal jacket for everyday captain use."
 	icon_state = "capjacket"
-	item_state = "capjacket"
+	item_state = "bio_suit"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	flags_inv = HIDEJUMPSUIT
 

code/modules/clothing/under/miscellaneous.dm

@@ -350,7 +350,7 @@
 	flags_inv = HIDESHOES
 
 /obj/item/clothing/under/wedding/bride_white
-	name = "silk wedding dress"
+	name = "orange wedding dress"
 	desc = "A white wedding gown made from the finest silk."
 	icon_state = "bride_white"
 	color = "bride_white"

code/modules/customitems/item_defines.dm

@@ -200,6 +200,8 @@ hi
 	icon = 'custom_items.dmi'
 	desc = "A modified detective's camera, painted in bright orange. On the back you see \"Have fun\" written in small accurate letters with something black."
 	icon_state = "orangecamera"
+	icon_on = "orangecamera"
+	icon_off = "camera_off"
 	pictures_left = 30
 
 /obj/item/device/camera/fluff/oldcamera //magmaram: Maria Crash
@@ -207,6 +209,8 @@ hi
 	icon = 'custom_items.dmi'
 	desc = "An old, slightly beat-up digital camera, with a cheap photo printer taped on. It's a nice shade of blue."
 	icon_state = "oldcamera"
+	icon_on = "oldcamera"
+	icon_off = "oldcamera_off"
 	pictures_left = 30
 
 /obj/item/weapon/card/id/fluff/lifetime	//fastler: Fastler Greay; it seemed like something multiple people would have

code/modules/paperwork/photography.dm

@@ -122,6 +122,8 @@
 	var/pictures_max = 10
 	var/pictures_left = 10
 	var/on = 1
+	var/icon_on = "camera"
+	var/icon_off = "camera_off"
 
 
 /obj/item/device/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob)
@@ -130,9 +132,9 @@
 /obj/item/device/camera/attack_self(mob/user as mob)
 	on = !on
 	if(on)
-		src.icon_state = "camera"
+		src.icon_state = icon_on
 	else
-		src.icon_state = "camera_off"
+		src.icon_state = icon_off
 	user << "You switch the camera [on ? "on" : "off"]."
 	return
 
@@ -253,8 +255,8 @@
 	pictures_left--
 	desc = "A polaroid camera. It has [pictures_left] photos left."
 	user << "<span class='notice'>[pictures_left] photos left.</span>"
-	icon_state = "camera_off"
+	icon_state = icon_off
 	on = 0
 	spawn(64)
-		icon_state = "camera"
+		icon_state = icon_on
 		on = 1