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

code/modules/admin/admin_verbs.dm

@@ -220,6 +220,7 @@
 			verbs += /client/proc/jumptokey
 			verbs += /client/proc/jumptomob
 			verbs += /client/proc/jumptoturf
+			verbs += /client/proc/Open_Minimap
 			verbs += /client/proc/cmd_admin_delete
 			verbs += /client/proc/cmd_admin_add_freeform_ai_law
 			verbs += /client/proc/cmd_admin_add_random_ai_law

code/modules/chemical/Chemistry-Reagents.dm

@@ -3279,6 +3279,12 @@ datum
 				reagent_state = LIQUID
 				color = "#2E6671" // rgb: 46, 102, 113
 
+			driestmartini
+				name = "Driest Martini"
+				id = "driestmartini"
+				description = "Only for the experienced. You think you see sand floating in the glass."
+				nutriment_factor = 1 * REAGENTS_METABOLISM
+				color = "#2E6671" // rgb: 46, 102, 113
 
 //ALCHOHOL end
 

code/modules/chemical/Chemistry-Recipes.dm

@@ -1012,7 +1012,6 @@ datum
 			required_reagents = list("gin" = 2, "tonic" = 1)
 			result_amount = 3
 
-
 		cuba_libre
 			name = "Cuba Libre"
 			id = "cubalibre"
@@ -1034,12 +1033,11 @@ datum
 			required_reagents = list("vodka" = 2, "vermouth" = 1)
 			result_amount = 3
 
-
 		white_russian
 			name = "White Russian"
 			id = "whiterussian"
 			result = "whiterussian"
-			required_reagents = list("vodka" = 3, "cream" = 1, "kahlua" = 1)
+			required_reagents = list("blackrussian" = 3, "cream" = 2)
 			result_amount = 5
 
 		whiskey_cola
@@ -1221,15 +1219,15 @@ datum
 			name = "Singulo"
 			id = "singulo"
 			result = "singulo"
-			required_reagents = list("vodka" = 5, "radium" = 1, "acid" = 1, "wine" = 5)
+			required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5)
 			result_amount = 10
 
-/*		alliescocktail
+		alliescocktail
 			name = "Allies Cocktail"
 			id = "alliescocktail"
 			result = "alliescocktail"
-			required_reagents = list("gin" = 1, "vermouth" = 1)
-			result_amount = 2*/
+			required_reagents = list("martini" = 1, "vodka" = 1)
+			result_amount = 2
 
 		demonsblood
 			name = "Demons Blood"
@@ -1256,11 +1254,11 @@ datum
 			name = "Barefoot"
 			id = "barefoot"
 			result = "barefoot"
-			required_reagents = list("vodka" = 1, "cream" = 1, "vermouth" = 1, "whiskey" = 1)
-			result_amount = 4
+			required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1)
+			result_amount = 3
 
 
-////DRINKS THAT REQUIRE IMPROVED SPRITES BELOW:: -Agouri/////
+////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri/////
 
 		sbiten
 			name = "Sbiten"
@@ -1344,7 +1342,7 @@ datum
 			name = "Aloe"
 			id = "aloe"
 			result = "aloe"
-			required_reagents = list("cream" = 1, "whiskey" = 1)
+			required_reagents = list("cream" = 1, "whiskey" = 1, "watermelonjuice" = 1)
 			result_amount = 2
 
 		andalusia
@@ -1372,15 +1370,15 @@ datum
 			name = "Irish Car Bomb"
 			id = "irishcarbomb"
 			result = "irishcarbomb"
-			required_reagents = list("ale" = 1, "cream" = 1, "whiskey" = 1)
-			result_amount = 3
+			required_reagents = list("ale" = 1, "irishcream" = 1)
+			result_amount = 2
 
 		syndicatebomb
 			name = "Syndicate Bomb"
 			id = "syndicatebomb"
 			result = "syndicatebomb"
-			required_reagents = list("beer" = 1, "cola" = 1, "whiskey" = 1)
-			result_amount = 3
+			required_reagents = list("beer" = 1, "whiskeycola" = 1)
+			result_amount = 2
 
 		erikasurprise
 			name = "Erika Surprise"
@@ -1389,7 +1387,6 @@ datum
 			required_reagents = list("ale" = 1, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1)
 			result_amount = 5
 
-
 		devilskiss
 			name = "Devils Kiss"
 			id = "devilskiss"
@@ -1418,6 +1415,10 @@ datum
 			required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1)
 			result_amount = 3
 
-
-
+		driestmartini
+			name = "Driest Martini"
+			id = "driestmartini"
+			result = "driestmartini"
+			required_reagents = list("nothing" = 1, "gin" = 1)
+			result_amount = 2
 

code/modules/chemical/Chemistry-Tools.dm

@@ -2310,7 +2310,7 @@
 
 /obj/item/weapon/reagent_containers/glass/bottle/pacid
 	name = "Polytrinic Acid Bottle"
-	desc = "A small bottle. Contains a small amount of Polytronic Acid"
+	desc = "A small bottle. Contains a small amount of Polytrinic Acid"
 	icon = 'chemical.dmi'
 	icon_state = "bottle17"
 	New()
@@ -3592,7 +3592,7 @@
 					desc = "Creepy time!"
 				if("changelingsting")
 					icon_state = "changelingsting"
-					name = "Changeling sting"
+					name = "Changeling Sting"
 					desc = "A stingy drink."
 				if("irishcarbomb")
 					icon_state = "irishcarbomb"
@@ -3606,6 +3606,10 @@
 					icon_state = "erikasurprise"
 					name = "Erika Surprise"
 					desc = "The surprise is, it's green!"
+				if("driestmartini")
+					icon_state = "driestmartini"
+					name = "Driest Martini"
+					desc = "Only for the experienced. You think you see sand floating in the glass."
 				else
 					icon_state ="glass_brown"
 					name = "Glass of ..what?"

code/modules/mob/living/carbon/human/hud.dm

@@ -206,14 +206,6 @@
 	using.layer = 19
 	src.other += using
 
-	using = new src.h_type( src )
-	using.name = "hat storage"
-	using.icon = ui_style
-	using.icon_state = "hair"
-	using.screen_loc = ui_hstore1
-	using.layer = 19
-	src.other += using
-
 	using = new src.h_type( src )
 	using.name = "resist"
 	using.icon = ui_style

code/modules/mob/living/carbon/human/human.dm

@@ -39,7 +39,6 @@
 	var/obj/item/weapon/r_store = null
 	var/obj/item/weapon/l_store = null
 	var/obj/item/weapon/s_store = null
-	var/obj/item/weapon/h_store = null
 
 	var/icon/stand_icon = null
 	var/icon/lying_icon = null
@@ -479,15 +478,6 @@
 		glasses = null
 	else if (W == head)
 		var/obj/item/prev_head = W
-		W = h_store
-		if (W)
-			u_equip(W)
-			if (client)
-				client.screen -= W
-			if (W)
-				W.loc = loc
-				W.dropped(src)
-				W.layer = initial(W.layer)
 		head = null
 		if(prev_head && (prev_head.flags & BLOCKHAIR))
 			// rebuild face
@@ -522,8 +512,6 @@
 		l_store = null
 	else if (W == s_store)
 		s_store = null
-	else if (W == h_store)
-		h_store = null
 	else if (W == back)
 		back = null
 	else if (W == handcuffed)
@@ -754,22 +742,6 @@
 				u_equip(W)
 				s_store = W
 
-		if("hat storage")
-			if (h_store)
-				if (emptyHand)
-					h_store.DblClick()
-				return
-			var/confirm
-			if (head)
-				if (istype(W, /obj/item/weapon/pen))
-					confirm = 1
-				if (istype(head) && is_type_in_list(W, head.allowed)) // NOTE: head is /obj/item/clothing/head/ and parer hat is not /obj/item/clothing/ and does not have "allowed" --rastaf0
-					confirm = 1
-			if (!confirm) return
-			else
-				u_equip(W)
-				h_store = W
-
 	update_clothing()
 
 	return
@@ -1085,9 +1057,6 @@
 			overlays += image("icon" = 'belt_mirror.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
 		s_store.screen_loc = ui_sstore1
 
-	if (h_store)
-		h_store.screen_loc = ui_hstore1
-
 	if(client) hud_used.other_update() //Update the screenloc of the items on the 'other' inventory bar
 											   //to hide / show them.
 	if (client)
@@ -1703,8 +1672,6 @@
 					message = text("\red <B>[] is trying to take off \a [] from []'s body!</B>", source, target.w_uniform, target)
 			if("s_store")
 				message = text("\red <B>[] is trying to take off \a [] from []'s suit!</B>", source, target.s_store, target)
-			if("h_store")
-				message = text("\red <B>[] is trying to empty []'s hat!</B>", source, target)
 			if("pockets")
 				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their pockets emptied by [source.name] ([source.ckey])</font>")
 				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to empty [target.name]'s ([target.ckey]) pockets</font>")
@@ -1728,7 +1695,7 @@
 					//SN src = null
 					del(src)
 					return
-				message = text("\red <B>[] is trying perform CPR on []!</B>", source, target)
+				message = text("\red <B>[] is trying to perform CPR on []!</B>", source, target)
 			if("id")
 				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their ID removed by [source.name] ([source.ckey])</font>")
 				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) ID</font>")
@@ -2158,17 +2125,6 @@ It can still be worn/put on as normal.
 					item.layer = 20
 					target.back = item
 					item.loc = target
-		if("h_store")
-			if (target.h_store)
-				var/obj/item/W = target.h_store
-				target.u_equip(W)
-				if (target.client)
-					target.client.screen -= W
-				if (W)
-					W.loc = target.loc
-					W.dropped(target)
-					W.layer = initial(W.layer)
-				W.add_fingerprint(source)
 		if("handcuff")
 			if (target.handcuffed)
 				var/obj/item/W = target.handcuffed
@@ -2319,7 +2275,6 @@ It can still be worn/put on as normal.
 	<BR>[(handcuffed ? text("<A href='?src=\ref[src];item=handcuff'>Handcuffed</A>") : text("<A href='?src=\ref[src];item=handcuff'>Not Handcuffed</A>"))]
 	<BR>[(internal ? text("<A href='?src=\ref[src];item=internal'>Remove Internal</A>") : "")]
 	<BR><A href='?src=\ref[src];item=pockets'>Empty Pockets</A>
-	<BR><A href='?src=\ref[src];item=h_store'>Empty Hat</A>
 	<BR><A href='?src=\ref[user];refresh=1'>Refresh</A>
 	<BR><A href='?src=\ref[user];mach_close=mob[name]'>Close</A>
 	<BR>"}

code/modules/mob/living/silicon/ai/ai.dm

@@ -441,6 +441,7 @@
 
 	if(client.eye == eyeobj)
 		eyeobj.loc = C.loc
+		cameranet.visibility(eyeobj)
 	else
 		machine = src
 		src:current = C
@@ -578,7 +579,9 @@
 		if(C.network == newnet)
 			cameralist.Add(C)
 
-	switchCamera( pick(cameralist) )
+	if(length(cameralist))
+		switchCamera( pick(cameralist) )
+
 	src << "\blue Jumped to [newnet] camera network."
 //End of code by Mord_Sith
 //cael - with the multiple onstation networks all linked together, changing networks is legacy functionality

code/modules/mob/simple_animal/corgi.dm

@@ -171,7 +171,8 @@
 						/obj/item/clothing/head/helmet/hardhat/white,
 						/obj/item/weapon/bedsheet,
 						/obj/item/clothing/head/helmet/space/santahat,
-						/obj/item/clothing/head/collectable/paper
+						/obj/item/clothing/head/collectable/paper,
+						/obj/item/clothing/head/cargosoft
 					)
 
 					if( ! ( item_to_add.type in allowed_types ) )
@@ -183,7 +184,7 @@
 					src.inventory_head = item_to_add
 					update_clothing()
 
-					//Various hats and items (worn on his head) change Ian's behaviour. His attributesare reset when a HAT is removed.
+					//Various hats and items (worn on his head) change Ian's behaviour. His attributes are reset when a HAT is removed.
 
 
 					switch(inventory_head && inventory_head.type)
@@ -240,6 +241,10 @@
 							emote_hear = list("barks christmas songs", "yaps")
 							desc = "He has a very shiny nose."
 							src.sd_SetLuminosity(6)
+						if(/obj/item/clothing/head/cargosoft)
+							name = "Corgi Tech [real_name]"
+							speak = list("Needs a stamp!", "Request DENIED!", "Fill these out in triplicate!")
+							desc = "The reason your yellow gloves have chew-marks."
 
 			if("back")
 				if(inventory_back)