Merge pull request #423 from caelaislinn/master

added a couple of new clothing items, updated some sprites

baystation12.dme

@@ -143,7 +143,10 @@
 #define FILE_DIR "code/unused/spacecraft"
 #define FILE_DIR "code/WorkInProgress"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jumper"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/tajara_sprites"
 #define FILE_DIR "code/WorkInProgress/mapload"
 #define FILE_DIR "code/WorkInProgress/Mini"
 #define FILE_DIR "code/WorkInProgress/Mloc"
@@ -818,7 +821,7 @@
 #include "code\modules\mining\mint.dm"
 #include "code\modules\mining\money_bag.dm"
 #include "code\modules\mining\ores_materials_coins.dm"
-#include "code\modules\mining\satchel_ore_boxdm.dm"
+#include "code\modules\mining\satchel_ore_box.dm"
 #include "code\modules\mob\login.dm"
 #include "code\modules\mob\logout.dm"
 #include "code\modules\mob\mob.dm"
@@ -1025,9 +1028,7 @@
 #include "code\WorkInProgress\detective_work.dm"
 #include "code\WorkInProgress\explosion_particles.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Tajara\examine.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Tajara\say.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Tajara\tajaran.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Tajara\whisper.dm"
 #include "code\WorkInProgress\mapload\dmm_suite.dm"
 #include "code\WorkInProgress\mapload\reader.dm"
 #include "code\WorkInProgress\Mini\atmos_control.dm"

code/WorkInProgress/Cael_Aislinn/Tajara/examine.dm

@@ -73,8 +73,8 @@
 			usr << "\red [src.name] has bloody \icon[src.gloves] [src.gloves.name] on [t_his] hands!"
 		else
 			usr << "\blue [src.name] has \icon[src.gloves] [src.gloves.name] on [t_his] hands."
-	else if (src.blood_DNA)
-		usr << "\red [src.name] has[src.blood_DNA ? " bloody " : " "] hands!"
+	else if (src.blood_DNA.len)
+		usr << "\red [src.name] has bloody hands!"
 
 	if (src.back)
 		usr << "\blue [src.name] has a \icon[src.back] [src.back.name] on [t_his] back."

code/defines/obj/clothing/costume.dm

@@ -60,7 +60,7 @@
 /obj/effect/landmark/costume/prig/New()
 	new /obj/item/clothing/suit/storage/wcoat(src.loc)
 	new /obj/item/clothing/glasses/monocle(src.loc)
-	var/CHOICE= pick( /obj/item/clothing/head/bowler, /obj/item/clothing/head/that)
+	var/CHOICE= pick( /obj/item/clothing/head/bowlerhat, /obj/item/clothing/head/that)
 	new CHOICE(src.loc)
 	new /obj/item/clothing/shoes/black(src.loc)
 	new /obj/item/weapon/cane(src.loc)

code/defines/obj/clothing/gimmick.dm

@@ -511,9 +511,132 @@
 	color = "sexymime"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
-/obj/item/clothing/head/bowler
-	name = "bowler-hat"
-	desc = "Gentleman, elite aboard!"
-	icon_state = "bowler"
-	item_state = "bowler"
+//stylish new hats
+
+/obj/item/clothing/head/bowlerhat
+	name = "Bowler hat"
+	icon_state = "bowler_hat"
+	item_state = "bowler_hat"
+	desc = "For the gentleman of distinction."
+	flags = FPRINT|TABLEPASS
+
+/obj/item/clothing/head/beaverhat
+	name = "Beaver hat"
+	icon_state = "beaver_hat"
+	item_state = "beaver_hat"
+	desc = "Solf felt make this hat both comfortable and elegant."
+	flags = FPRINT|TABLEPASS
+
+/obj/item/clothing/head/boaterhat
+	name = "Boater hat"
+	icon_state = "boater_hat"
+	item_state = "boater_hat"
+	desc = "The ultimate in summer fashion."
+	flags = FPRINT|TABLEPASS
+
+/obj/item/clothing/head/fedora
+	name = "Fedora"
+	icon_state = "fedora"
+	item_state = "fedora"
+	desc = "A sharp, stylish hat."
+	flags = FPRINT|TABLEPASS
+
+/obj/item/clothing/head/feathertrilby
+	name = "Feather trilby"
+	icon_state = "feather_trilby"
+	item_state = "feather_trilby"
+	desc = "A sharp, stylish hat with a feather."
+	flags = FPRINT|TABLEPASS
+
+//pyjamas
+
+/obj/item/clothing/under/bluepyjamas
+	name = "Blue pyjamas"
+	desc = "Slightly old-fashioned sleepwear."
+	icon_state = "blue_pyjamas"
+	item_state = "blue_pyjamas"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+
+/obj/item/clothing/under/redpyjamas
+	name = "Red pyjamas"
+	desc = "Slightly old-fashioned sleepwear."
+	icon_state = "red_pyjamas"
+	item_state = "red_pyjamas"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+
+//scarves (fit in in mask slot)
+
+/obj/item/clothing/mask/bluescarf
+	name = "Blue neck scarf"
+	desc = "A blue neck scarf."
+	icon_state = "blueneckscarf"
+	item_state = "blueneckscarf"
+	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
+	w_class = 2
+	gas_transfer_coefficient = 0.90
+
+/obj/item/clothing/mask/redscarf
+	name = "Red scarf"
+	desc = "A red and white checkered neck scarf."
+	icon_state = "redwhite_scarf"
+	item_state = "redwhite_scarf"
+	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
+	w_class = 2
+	gas_transfer_coefficient = 0.90
+
+/obj/item/clothing/mask/greenscarf
+	name = "Green scarf"
+	desc = "A green neck scarf."
+	icon_state = "green_scarf"
+	item_state = "green_scarf"
+	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
+	w_class = 2
+	gas_transfer_coefficient = 0.90
+
+/obj/item/clothing/mask/ninjascarf
+	name = "Ninja scarf"
+	desc = "A stealthy, dark scarf."
+	icon_state = "ninja_scarf"
+	item_state = "ninja_scarf"
+	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
+	w_class = 2
+	gas_transfer_coefficient = 0.90
+
+//shoes
+
+/obj/item/clothing/shoes/laceups
+	name = "Laceup shoes"
+	desc = "Stylish black leather."
+	icon_state = "laceups"
+	item_state = "laceups"
+	color = "black"
+
+//suits
+
+/obj/item/clothing/suit/leathercoat
+	name = "Leather Coat"
+	desc = "A long, thick black leather coat."
+	icon_state = "leathercoat"
+	item_state = "leathercoat"
+	flags = FPRINT | TABLEPASS
+
+/obj/item/clothing/suit/browncoat
+	name = "Brown Leather Coat"
+	desc = "A long, brown leather coat."
+	icon_state = "browncoat"
+	item_state = "browncoat"
+	flags = FPRINT | TABLEPASS
+
+/obj/item/clothing/suit/neocoat
+	name = "Black coat"
+	desc = "A flowing, black coat."
+	icon_state = "neocoat"
+	item_state = "neocoat"
+	flags = FPRINT | TABLEPASS
+
+/obj/item/clothing/suit/creamsuit
+	name = "Cream suit"
+	desc = "A cream coloured, genteel suit."
+	icon_state = "creamsuit"
+	item_state = "creamsuit"
 	flags = FPRINT | TABLEPASS

code/game/objects/items/clothing.dm

@@ -291,7 +291,7 @@ THERMAL GLASSES
 		state = "enabled"
 	usr << "Its mag-pulse traction system appears to be [state]."
 
-/obj/item/clothing/suit/suit/verb/toggle()
+/obj/item/clothing/suit/lawyer/verb/toggle()
 	set name = "Toggle Jacket Buttons"
 	set category = "Object"
 	if(src.icon_state == "suitjacket_blue_open")

code/modules/clothing/glasses/glasses.dm

@@ -56,6 +56,22 @@
 	protective_temperature = 1300
 	darkness_view = -1
 
+/obj/item/clothing/glasses/sunglasses/big
+	desc = "Strangely ancient technology used to help provide rudimentary eye cover. Larger than average enhanced shielding blocks many flashes."
+	icon_state = "bigsunglasses"
+	item_state = "bigsunglasses"
+	protective_temperature = 1400
+
+//ultimate glasses
+/obj/item/clothing/glasses/hud/security/jensenshades
+	name = "Augmented shades"
+	desc = "Polarized bioneural eyewear, designed to augment your vision."
+	icon_state = "jensenshades"
+	item_state = "jensenshades"
+	protective_temperature = 1500
+	vision_flags = SEE_MOBS
+	invisa_view = 2
+
 /obj/item/clothing/glasses/sunglasses/sechud
 	name = "HUDSunglasses"
 	desc = "Sunglasses with a HUD."

code/modules/mining/satchel_ore_box.dm

@@ -39,11 +39,15 @@
 
 /obj/structure/ore_box
 	icon = 'mining.dmi'
-	icon_state = "orebox"
+	icon_state = "orebox0"
 	name = "Ore Box"
 	desc = "It's heavy"
 	density = 1
 
+	New()
+		if(prob(50))
+			icon_state = "orebox1"
+
 /obj/structure/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/ore))
 		src.contents += W;

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

@@ -74,7 +74,7 @@
 		else
 			usr << "\blue [src.name] has \icon[src.gloves] [src.gloves.name] on [t_his] hands."
 	else if (src.blood_DNA.len)
-		usr << "\red [src.name] has[src.blood_DNA.len ? " bloody " : " "] hands!"
+		usr << "\red [src.name] has bloody hands!"
 
 	if (src.back)
 		usr << "\blue [src.name] has a \icon[src.back] [src.back.name] on [t_his] back."

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

@@ -111,6 +111,8 @@
 		src << "\blue Your icons have been generated!"
 
 	..()
+	known_languages = new/list()
+	known_languages.Add("english")
 
 //	organStructure = new /obj/effect/organstructure/human(src)
 

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

@@ -85,4 +85,6 @@
 		return 1
 	if (istype(other, /mob/living/carbon/metroid))
 		return 1
+	if (istype(other, /mob/living/carbon/human/tajaran))
+		return 1
 	return ..()