Merge remote-tracking branch 'upstream/master' into cig-tweaks

code/game/objects/items/flag.dm

@@ -197,7 +197,7 @@
 	name = "Chameleon flag"
 	desc = "A poor recreation of the official NT flag. It seems to shimmer a little."
 	icon_state = "ntflag"
-	origin_tech = "syndicate=4;magnets=4"
+	origin_tech = "syndicate=1;magnets=4"
 	var/updated_icon_state = null
 	var/used = FALSE
 	var/obj/item/grenade/boobytrap = null

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

@@ -227,7 +227,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 	list_reagents = list("nicotine" = 40, "omnizine" = 20)
 
 /obj/item/clothing/mask/cigarette/medical_marijuana
-	list_reagents = list("thc" = 40)
+	list_reagents = list("thc" = 40, "cbd" = 20)
 
 /obj/item/clothing/mask/cigarette/robustgold
 	list_reagents = list("nicotine" = 40, "gold" = 1)

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

@@ -27,57 +27,11 @@
 		return
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
-		//see code/modules/mob/new_player/preferences.dm at approx line 545 for comments!
-		//this is largely copypasted from there.
-		//handle facial hair (if necessary)
-		var/list/species_facial_hair = list()
 		var/obj/item/organ/external/head/C = H.get_organ("head")
-		var/datum/robolimb/robohead = all_robolimbs[C.model]
-		if(H.gender == MALE || isvulpkanin(H))
-			if(C.dna.species)
-				for(var/i in GLOB.facial_hair_styles_list)
-					var/datum/sprite_accessory/facial_hair/tmp_facial = GLOB.facial_hair_styles_list[i]
-					if(C.dna.species.name in tmp_facial.species_allowed)  //If the species is allowed to have the style, add the style to the list. Or, if the character has a prosthetic head, give them the human hair styles.
-						if(C.dna.species.bodyflags & ALL_RPARTS) //If the character is of a species that can have full body prosthetics and their head doesn't suport human hair 'wigs', don't add the style to the list.
-							if(robohead.is_monitor)
-								to_chat(user, "<span class='warning'>You are unable to find anything on [H]'s face worth cutting. How disappointing.</span>")
-								return
-							continue //If the head DOES support human hair wigs, make sure they don't get monitor-oriented styles.
-						species_facial_hair += i
-					else
-						if(C.dna.species.bodyflags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, and the head supports human hair 'wigs' AND the hair-style is human-suitable, add it to the list.
-							if(!robohead.is_monitor)
-								if("Human" in tmp_facial.species_allowed)
-									species_facial_hair += i
-							else //Otherwise, they won't be getting any hairstyles.
-								to_chat(user, "<span class='warning'>You are unable to find anything on [H]'s face worth cutting. How disappointing.</span>")
-								return
-			else
-				species_facial_hair = GLOB.facial_hair_styles_list
-		var/f_new_style = input(user, "Select a facial hair style", "Grooming")  as null|anything in species_facial_hair
+		//facial hair
+		var/f_new_style = input(user, "Select a facial hair style", "Grooming")  as null|anything in H.generate_valid_facial_hairstyles()
 		//handle normal hair
-		var/list/species_hair = list()
-		if(C.dna.species)
-			for(var/i in GLOB.hair_styles_public_list)
-				var/datum/sprite_accessory/hair/tmp_hair = GLOB.hair_styles_public_list[i]
-				if(C.dna.species.name in tmp_hair.species_allowed) //If the species is allowed to have the style, add the style to the list. Or, if the character has a prosthetic head, give them the human facial hair styles.
-					if(C.dna.species.bodyflags & ALL_RPARTS) //If the character is of a species that can have full body prosthetics and their head doesn't suport human hair 'wigs', don't add the style to the list.
-						if(robohead.is_monitor)
-							to_chat(user, "<span class='warning'>You are unable to find anything on [H]'s head worth cutting. How disappointing.</span>")
-							return
-						continue //If the head DOES support human hair wigs, make sure they don't get monitor-oriented styles.
-					species_hair += i
-				else
-					if(C.dna.species.bodyflags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, and the head supports human hair 'wigs' AND the hair-style is human-suitable, add it to the list.
-						if(!robohead.is_monitor)
-							if("Human" in tmp_hair.species_allowed)
-								species_hair += i
-						else //Otherwise, they won't be getting any hairstyles.
-							to_chat(user, "<span class='warning'>You are unable to find anything on [H]'s head worth cutting. How disappointing.</span>")
-							return
-		else
-			species_hair = GLOB.hair_styles_public_list
-		var/h_new_style = input(user, "Select a hair style", "Grooming")  as null|anything in species_hair
+		var/h_new_style = input(user, "Select a hair style", "Grooming")  as null|anything in H.generate_valid_hairstyles()
 		user.visible_message("<span class='notice'>[user] starts cutting [M]'s hair!</span>", "<span class='notice'>You start cutting [M]'s hair!</span>") //arguments for this are: 1. what others see 2. what the user sees. --Fixed grammar, (TGameCo)
 		playsound(loc, 'sound/goonstation/misc/scissor.ogg', 100, 1)
 		if(do_after(user, 50 * toolspeed, target = H)) //this is the part that adds a delay. delay is in deciseconds. --Made it 5 seconds, because hair isn't cut in one second in real life, and I want at least a little bit longer time, (TGameCo)

code/game/objects/items/weapons/storage/backpack.dm

@@ -193,6 +193,12 @@
 	icon_state = "viropack"
 	item_state = "viropack"
 
+/obj/item/storage/backpack/blueshield
+	name = "blueshield backpack"
+	desc = "A robust backpack issued to Nanotrasen's finest."
+	icon_state = "blueshieldpack"
+	item_state = "blueshieldpack"
+
 /*
  * Satchel Types
  */
@@ -287,6 +293,11 @@
 	icon_state = "satchel-cap"
 	resistance_flags = FIRE_PROOF
 
+/obj/item/storage/backpack/satchel_blueshield
+	name = "blueshield satchel"
+	desc = "A robust satchel issued to Nanotrasen's finest."
+	icon_state = "satchel-blueshield"
+
 /obj/item/storage/backpack/satchel_flat
 	name = "smuggler's satchel"
 	desc = "A very slim satchel that can easily fit into tight spaces."
@@ -531,12 +542,19 @@
 	icon_state = "duffel-clown"
 	item_state = "duffel-clown"
 
+obj/item/storage/backpack/duffel/blueshield
+	name = "blueshield duffelbag"
+	desc = "A robust duffelbag issued to Nanotrasen's finest."
+	icon_state = "duffel-blueshield"
+	item_state = "duffel-blueshield"
+
 //ERT backpacks.
 /obj/item/storage/backpack/ert
 	name = "emergency response team backpack"
 	desc = "A spacious backpack with lots of pockets, used by members of the Nanotrasen Emergency Response Team."
 	icon_state = "ert_commander"
 	item_state = "backpack"
+	max_combined_w_class = 30
 	resistance_flags = FIRE_PROOF
 
 //Commander

code/game/objects/items/weapons/storage/fancy.dm

@@ -247,6 +247,7 @@
 	item_state = "cigpacket"
 	cigarette_type = /obj/item/clothing/mask/cigarette/medical_marijuana
 
+
 /obj/item/storage/fancy/cigarettes/cigpack_uplift
 	name = "\improper Uplift Smooth packet"
 	desc = "Your favorite brand, now menthol flavored."

code/game/objects/structures/noticeboard.dm

@@ -78,10 +78,5 @@
 	if(href_list["read"])
 		var/obj/item/paper/P = locate(href_list["read"])
 		if((P && P.loc == src))
-			if(!( istype(usr, /mob/living/carbon/human) ))
-				usr << browse("<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY><TT>[stars(P.info)]</TT></BODY></HTML>", "window=[P.name]")
-				onclose(usr, "[P.name]")
-			else
-				usr << browse("<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY><TT>[P.info]</TT></BODY></HTML>", "window=[P.name]")
-				onclose(usr, "[P.name]")
+			P.show_content(usr)
 	return