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

Conflicts:
	code/modules/customitems/item_spawning.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

baystation12.dme

@@ -570,6 +570,7 @@
 #include "code\game\machinery\computer\atmos_alert.dm"
 #include "code\game\machinery\computer\buildandrepair.dm"
 #include "code\game\machinery\computer\camera.dm"
+#include "code\game\machinery\computer\camera_monitor.dm"
 #include "code\game\machinery\computer\card.dm"
 #include "code\game\machinery\computer\cloning.dm"
 #include "code\game\machinery\computer\communications.dm"

code/defines/obj/weapon.dm

@@ -725,6 +725,10 @@
 	var/access = list()
 	var/registered_name = null // The name registered_name on the card
 	slot_flags = SLOT_ID
+	var/obj/item/weapon/credit_card/card
+	var/blood_type = "\[UNSET\]"
+	var/dna_hash = "\[UNSET\]"
+	var/fingerprint_hash = "\[UNSET\]"
 
 	var/assignment = null
 	var/assignment_real_title = null

code/modules/customitems/item_defines.dm

@@ -123,6 +123,14 @@
 	icon_on = "redzippoon"
 	icon_off = "redzippo"
 
+/obj/item/weapon/lighter/zippo/fluff/executivekill_1 //executivekill: Hunter Duke
+	name = "Gonzo Fist zippo"
+	desc = "A Zippo lighter with the iconic Gonzo Fist on a matte black finish."
+	icon = 'custom_items.dmi'
+	icon_state = "gonzozippo"
+	icon_on = "gonzozippoon"
+	icon_off = "gonzozippo"
+
 /obj/item/weapon/fluff/cado_keppel_1 //sparklysheep: Cado Keppel
 	name = "purple comb"
 	desc = "A pristine purple comb made from flexible plastic. It has a small K etched into its side."
@@ -131,6 +139,12 @@
 	icon_state = "purplecomb"
 	item_state = "purplecomb"
 
+/obj/item/weapon/fluff/hugo_cinderbacth_1 //thatoneguy: Hugo Cinderbatch
+	name = "Old Cane"
+	desc = "An old brown cane made from wood. It has a a large, itallicized H on it's handle."
+	icon = 'custom_items.dmi'
+	icon_state = "special_cane"
+
 	attack_self(mob/user)
 		if(user.r_hand == src || user.l_hand == src)
 			for(var/mob/O in viewers(user, null))
@@ -252,6 +266,13 @@
 	icon = 'custom_items.dmi'
 	icon_state = "odysseus_spec_id"
 
+/obj/item/weapon/card/id/fluff/ian_colmid //Roaper: Ian Colm
+	name = "Technician"
+	desc = "An old ID with the words 'Ian Colm's Technician ID' printed on it.."
+	icon = 'custom_items.dmi'
+	icon_state = "technician_id"
+
+
 /obj/item/weapon/clipboard/fluff/mcreary_journal //sirribbot: James McReary
 	name = "McReary's journal"
 	desc = "A journal with a warning sticker on the front cover. The initials \"J.M.\" are written on the back."
@@ -259,6 +280,22 @@
 	icon_state = "mcreary_journal"
 	item_state = "mcreary_journal"
 
+/obj/item/device/flashlight/fluff/thejesster14_1 //thejesster14: Rosa Wolff
+	name = "old red flashlight"
+	desc = "A very old, childlike flashlight."
+	icon = 'custom_items.dmi'
+	icon_state = "wolfflight0"
+	w_class = 2
+	item_state = "wolfflight"
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
+	m_amt = 50
+	g_amt = 20
+	on = 0
+	brightness_on = 4 //luminosity when on
+	icon_on = "wolfflight1"
+	icon_off = "wolfflight0"
+
 //////////////////////////////////
 //////////// Clothing ////////////
 //////////////////////////////////
@@ -498,3 +535,4 @@
 	icon = 'custom_items.dmi'
 	icon_state = "retpoluniform"
 	color = "retpoluniform"
+

code/modules/customitems/item_spawning.dm

@@ -39,22 +39,24 @@
 						I.registered_name = M.real_name
 						I.access = C.access
 						I.assignment = C.assignment
-						//I.over_jumpsuit = C.over_jumpsuit
-						//I.blood_type = C.blood_type
-						//I.dna_hash = C.dna_hash
-						//I.fingerprint_hash = C.fingerprint_hash
-						//I.pin = C.pin
+						I.over_jumpsuit = C.over_jumpsuit
+						I.blood_type = C.blood_type
+						I.dna_hash = C.dna_hash
+						I.fingerprint_hash = C.fingerprint_hash
+						I.pin = C.pin
 
 						//custom stuff
 						if(M.ckey == "fastler" && M.real_name == "Fastler Greay") //This is a Lifetime ID
 							I.name = "[M.real_name]'s Lifetime ID Card ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
 						else if(M.ckey == "nerezza" && M.real_name == "Asher Spock") //This is an Odysseus Specialist ID
 							I.name = "[M.real_name]'s Odysseus Specialist ID Card ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
-							I.access += list(access_robotics) //Station-based mecha pilots need this to access the recharge bay.
+							I.access += list(ACCESS_ROBOTICS) //Station-based mecha pilots need this to access the recharge bay.
+						else if(M.ckey == "roaper" && M.real_name == "Ian Colm") //This is a Technician ID
+						I.name = "[M.real_name]'s Technician ID ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
 
 						//replace old ID
 						del(C)
-						ok = M.equip_to_slot_or_del(I, slot_wear_id)	//if 1, last argument deletes on fail
+						ok = M.equip_if_possible(I, M.slot_wear_id, 0)	//if 1, last argument deletes on fail
 						break
 				else if(istype(M.back,/obj/item/weapon/storage) && M.back:contents.len < M.back:storage_slots) // Try to place it in something on the mob's back
 					Item.loc = M.back

config/alienwhitelist.txt

@@ -5,6 +5,8 @@ bluefishie - Skrell
 cubejackal - Soghun
 danny220 - Skrell
 danny220 - Soghun
+danny220 - Tajaran
+darkwingstalker - Skrell
 deciusreln - Skrell
 densane - Skrell
 dopeghoti - Tajaran
@@ -18,18 +20,27 @@ forsamori - Tajaran
 forsamori - Soghun
 galenus - Soghun
 galenus - Skrell
+galenus - Tajaran
 kersh - Skrell
 jadepython - Skrell
+jadepython - Soghun
+jadepython - Tajaran
 masterofstuff - Skrell
+masterofstuff - Soghun
 mangled - Skrell
 mcgulliver - Skrell
 nerezza - Skrell
+nerezza - Soghun
+nerezza - Tajaran
+nestromo - Soghun
 philphil123 - Soghun
 quilan - Tajaran
 searif - Soghun
 searif - Tajaran
 searif - Skrell
 serithi - Skrell
+serithi - Soghun
+serithi - Tajaran
 sniperyeti - Skrell
 spaceman96 - Tajaran
 spaceman96 - Soghun
@@ -39,4 +50,4 @@ succubusy - Skrell
 teddybehr - Soghun
 whitellama - Skrell
 watermelonstorm - Tajaran
-whitellama - Skrell
+yoshax - Tajaran

config/custom_items.txt

@@ -10,6 +10,7 @@ desiderium: Momiji Inubashiri: /obj/item/clothing/under/fluff/olddressuniform
 desiderium: Rook Maudlin: /obj/item/clothing/suit/storage/det_suit/fluff/retpolcoat, /obj/item/clothing/head/det_hat/fluff/retpolcap, /obj/item/clothing/under/det/fluff/retpoluniform
 deusdactyl: James Girard: /obj/item/clothing/head/secsoft/fluff/swatcap, /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield
 eternal248: Maximilian Haynes: /obj/item/weapon/paper/certificate
+executivekill: Hunter Duke: /obj/item/weapon/lighter/zippo/fluff/executivekill_1
 fastler: Fastler Greay: /obj/item/weapon/card/id/fluff/lifetime
 fniff: Sarah Calvera: /obj/item/fluff/sarah_calvera_1
 fniff: Angleo Wilkerson: /obj/item/fluff/angelo_wilkerson_1
@@ -26,7 +27,7 @@ nerezza: Asher Spock: /obj/item/weapon/reagent_containers/hypospray/fluff/asher_
 nerezza: Asher Spock: /obj/item/weapon/card/id/fluff/asher_spock_2
 orangebottle: Lillian Levett: /obj/item/weapon/pen/fluff/fancypen
 orangebottle: Lilliana Reade: /obj/item/weapon/pen/fluff/fancypen
-phaux: Tian Yinhu: /obj/item/clothing/under/fluff/tian_dress
+phaux: Tian Krieger: /obj/item/clothing/under/fluff/tian_dress
 rawrtaicho: Riley Rohtin: /obj/item/weapon/lighter/zippo/fluff/riley_rohtin_1
 roaper: Enos Adlai: /obj/item/clothing/head/fluff/enos_adlai_1
 searif: Yuki Matsuda: /obj/item/clothing/under/fluff/jumpsuitdown, /obj/item/clothing/head/helmet/welding/fluff/yuki_matsuda_1
@@ -41,9 +42,12 @@ spaceman96: Trenna Seber: /obj/item/weapon/pen/fluff/multi, /obj/item/clothing/s
 sparklysheep: Cado Keppel: /obj/item/weapon/fluff/cado_keppel_1
 staghorn: Mara Kilpatrick: /obj/item/clothing/mask/mara_kilpatrick_1
 tastyfish: Cindy Robertson: /obj/item/weapon/wrapping_paper
+thatoneguy: Hugo Cinderbatch: /obj/item/weapon/fluff/hugo_cinderbacth_1
 thebreadbocks: Steve Johnson: /obj/item/fluff/steve_johnson_1
 themij: Taryn Keppel: /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1
+thejesster14: Rosa Wolff: /obj/item/device/flashlight/fluff/thejesster14_1
 tzefa: Wes Solari: /obj/item/fluff/wes_solari_1
 vinceluk: Seth Sealis: /obj/item/clothing/suit/storage/det_suit/fluff/graycoat
 whitellama: Ethan Way: /obj/item/fluff/ethan_way_1
-whitewolf41: Jeremy Wolf: /obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1
+whitewolf41: Jeremy Wolf: /obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1
+roaper: Ian Colm: /obj/item/weapon/card/id/fluff/ian_colmid