Merge pull request #953 from Erthilo/master

Changelog changes, cyborg state laws and crew manifest buttons, new atm sprites, new botanist satchel, record date fix, custom items

code/defines/mob/living/silicon/robot.dm

@@ -56,4 +56,7 @@
 	var/speed = 0 //Cause sec borgs gotta go fast //No they dont!
 	var/scrambledcodes = 0 // Used to determine if a borg shows up on the robotics console.  Setting to one hides them.
 	var/channels = list()
-	var/modlock = 0
+	var/modlock = 0
+
+	var/lawcheck[1] //For stating laws!
+	var/ioncheck[1]

code/defines/obj/storage.dm

@@ -657,3 +657,8 @@
 	name = "security satchel"
 	desc = "A robust satchel for security related needs."
 	icon_state = "satchel-sec"
+
+/obj/item/weapon/storage/backpack/satchel_hyd
+	name = "hydroponics satchel"
+	desc = "A green satchel for plant related work."
+	icon_state = "satchel_hyd"

code/game/jobs/job/civilian.dm

@@ -71,6 +71,9 @@
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
+		if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_hyd(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/hydroponics(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/clothing/gloves/botanic_leather(H), H.slot_gloves)

code/game/machinery/computer/medical.dm

@@ -481,7 +481,7 @@
 				var/counter = 1
 				while(src.active2.fields[text("com_[]", counter)])
 					counter++
-				src.active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [], 2053<BR>[]", src.authenticated, src.rank, time2text(world.realtime, "DDD MMM DD hh:mm:ss"), t1)
+				src.active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [], 2556<BR>[]", src.authenticated, src.rank, time2text(world.realtime, "DDD MMM DD hh:mm:ss"), t1)
 
 			if (href_list["del_c"])
 				if ((istype(src.active2, /datum/data/record) && src.active2.fields[text("com_[]", href_list["del_c"])]))

code/game/machinery/computer/security.dm

@@ -328,7 +328,7 @@ What a mess.*/
 				var/counter = 1
 				while(active2.fields[text("com_[]", counter)])
 					counter++
-				active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [], 2053<BR>[]", authenticated, rank, time2text(world.realtime, "DDD MMM DD hh:mm:ss"), t1)
+				active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [], 2556<BR>[]", authenticated, rank, time2text(world.realtime, "DDD MMM DD hh:mm:ss"), t1)
 
 			if ("Delete Record (ALL)")
 				if (active1)

code/modules/customitems/item_defines.dm

@@ -67,6 +67,14 @@
 	item_state = "jumpsuitdown"
 	color = "jumpsuitdown"
 
+/obj/item/clothing/under/fluff/olddressuniform
+	name = "retired dress uniform"
+	desc = "A retired Station Head of Staff uniform, phased out twenty years ago for the newer jumpsuit design, but still acceptable dress. Lovingly maintained."
+	icon = 'custom_items.dmi'
+	icon_state = "olddressuniform"
+	item_state = "olddressuniform"
+	color = "olddressuniform"
+
 //////////// Useable Items
 
 /obj/item/weapon/pen/fluff/multi
@@ -101,6 +109,13 @@
 	icon = 'custom_items.dmi'
 	icon_state = "maye_daye_1"
 
+/obj/item/weapon/reagent_containers/food/drinks/flask/fluff/johann_erzatz_1
+	name = "vintage thermos"
+	desc = "An older thermos with a faint shine."
+	icon = 'custom_items.dmi'
+	icon_state = "johann_erzatz_1"
+	volume = 50
+
 //////////// Misc Items
 
 /obj/item/fluff/wes_solari_1

code/modules/mob/living/silicon/robot/laws.dm

@@ -93,4 +93,97 @@
 
 /mob/living/silicon/robot/proc/clear_ion_laws()
 	laws_sanity_check()
-	laws.clear_ion_laws()
+	laws.clear_ion_laws()
+
+/mob/living/silicon/robot/proc/statelaws() // -- TLE
+//	set category = "AI Commands"
+//	set name = "State Laws"
+	src.say("Current Active Laws:")
+	//src.laws_sanity_check()
+	//src.laws.show_laws(world)
+	var/number = 1
+	sleep(10)
+
+
+
+	if (src.laws.zeroth)
+		if (src.lawcheck[1] == "Yes") //This line and the similar lines below make sure you don't state a law unless you want to. --NeoFite
+			src.say("0. [src.laws.zeroth]")
+			sleep(10)
+
+	for (var/index = 1, index <= src.laws.ion.len, index++)
+		var/law = src.laws.ion[index]
+		var/num = ionnum()
+		if (length(law) > 0)
+			if (src.ioncheck[index] == "Yes")
+				src.say("[num]. [law]")
+				sleep(10)
+
+	for (var/index = 1, index <= src.laws.inherent.len, index++)
+		var/law = src.laws.inherent[index]
+
+		if (length(law) > 0)
+			if (src.lawcheck[index+1] == "Yes")
+				src.say("[number]. [law]")
+				sleep(10)
+			number++
+
+
+	for (var/index = 1, index <= src.laws.supplied.len, index++)
+		var/law = src.laws.supplied[index]
+
+		if (length(law) > 0)
+			if(src.lawcheck.len >= number+1)
+				if (src.lawcheck[number+1] == "Yes")
+					src.say("[number]. [law]")
+					sleep(10)
+				number++
+
+
+/mob/living/silicon/robot/verb/checklaws() //Gives you a link-driven interface for deciding what laws the statelaws() proc will share with the crew. --NeoFite
+	set category = "Robot Commands"
+	set name = "State Laws"
+
+	var/list = "<b>Which laws do you want to include when stating them for the crew?</b><br><br>"
+
+
+
+	if (src.laws.zeroth)
+		if (!src.lawcheck[1])
+			src.lawcheck[1] = "No" //Given Law 0's usual nature, it defaults to NOT getting reported. --NeoFite
+		list += {"<A href='byond://?src=\ref[src];lawc=0'>[src.lawcheck[1]] 0:</A> [src.laws.zeroth]<BR>"}
+
+	for (var/index = 1, index <= src.laws.ion.len, index++)
+		var/law = src.laws.ion[index]
+
+		if (length(law) > 0)
+
+
+			if (!src.ioncheck[index])
+				src.ioncheck[index] = "Yes"
+			list += {"<A href='byond://?src=\ref[src];lawi=[index]'>[src.ioncheck[index]] [ionnum()]:</A> [law]<BR>"}
+			src.ioncheck.len += 1
+
+	var/number = 1
+	for (var/index = 1, index <= src.laws.inherent.len, index++)
+		var/law = src.laws.inherent[index]
+
+		if (length(law) > 0)
+			src.lawcheck.len += 1
+
+			if (!src.lawcheck[number+1])
+				src.lawcheck[number+1] = "Yes"
+			list += {"<A href='byond://?src=\ref[src];lawc=[number]'>[src.lawcheck[number+1]] [number]:</A> [law]<BR>"}
+			number++
+
+	for (var/index = 1, index <= src.laws.supplied.len, index++)
+		var/law = src.laws.supplied[index]
+		if (length(law) > 0)
+			src.lawcheck.len += 1
+			if (!src.lawcheck[number+1])
+				src.lawcheck[number+1] = "Yes"
+			list += {"<A href='byond://?src=\ref[src];lawc=[number]'>[src.lawcheck[number+1]] [number]:</A> [law]<BR>"}
+			number++
+	list += {"<br><br><A href='byond://?src=\ref[src];laws=1'>State Laws</A>"}
+
+	usr << browse(list, "window=laws")

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

@@ -207,6 +207,20 @@
 	viewalerts = 1
 	src << browse(dat, "window=robotalerts&can_close=0")
 
+/mob/living/silicon/robot/proc/ai_roster()
+	set category = "Robot Commands"
+	set name = "Show Crew Manifest"
+
+	var/dat = "<html><head><title>Crew Roster</title></head><body><b>Crew Roster:</b><br><br>"
+
+	for (var/datum/data/record/t in data_core.general)
+		dat += "[t.fields["name"]] - [t.fields["rank"]]<br>"
+
+	dat += "</body></html>"
+
+	src << browse(dat, "window=airoster")
+	onclose(src, "airoster")
+
 /mob/living/silicon/robot/blob_act()
 	if (stat != 2)
 		adjustBruteLoss(60)
@@ -937,6 +951,26 @@
 		else
 			src << "Module isn't activated"
 		installed_modules()
+
+	if (href_list["lawc"]) // Toggling whether or not a law gets stated by the State Laws verb --NeoFite
+		var/L = text2num(href_list["lawc"])
+		switch(lawcheck[L+1])
+			if ("Yes") lawcheck[L+1] = "No"
+			if ("No") lawcheck[L+1] = "Yes"
+//		src << text ("Switching Law [L]'s report status to []", lawcheck[L+1])
+		checklaws()
+
+	if (href_list["lawi"]) // Toggling whether or not a law gets stated by the State Laws verb --NeoFite
+		var/L = text2num(href_list["lawi"])
+		switch(ioncheck[L])
+			if ("Yes") ioncheck[L] = "No"
+			if ("No") ioncheck[L] = "Yes"
+//		src << text ("Switching Law [L]'s report status to []", lawcheck[L+1])
+		checklaws()
+
+	if (href_list["laws"]) // With how my law selection code works, I changed statelaws from a verb to a proc, and call it through my law selection panel. --NeoFite
+		statelaws()
+
 	return
 
 /mob/living/silicon/robot/proc/uneq_active()

code/modules/mob/transform_procs.dm

@@ -212,6 +212,8 @@
 	O << "To use something, simply click or double-click it."
 	O << {"Use say ":s to speak to fellow cyborgs and the AI through binary."}
 
+	O.verbs += /mob/living/silicon/robot/proc/ai_roster
+
 	O.job = "Cyborg"
 
 	O.mmi = new /obj/item/device/mmi(O)
@@ -412,4 +414,4 @@
 
 		del(src)
 
-	return O
+	return O

code/unused/computer2/med_rec.dm

@@ -409,7 +409,7 @@
 			var/counter = 1
 			while(src.active2.fields[text("com_[]", counter)])
 				counter++
-			src.active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [], 2053<BR>[]", src.authenticated, src.rank, time2text(world.realtime, "DDD MMM DD hh:mm:ss"), t1)
+			src.active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [], 2556<BR>[]", src.authenticated, src.rank, time2text(world.realtime, "DDD MMM DD hh:mm:ss"), t1)
 
 		if (href_list["del_c"])
 			if ((istype(src.active2, /datum/data/record) && src.active2.fields[text("com_[]", href_list["del_c"])]))