-Adjusted balaclavas and added luchador masks. They replace the boxing gloves in the fitness room.

-Tweaked fake moustache. It shouldn't work as internals, but it disguises your identity.
-Fixed a couple flags for the sake of logic.
-Updated changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3691 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/obj/clothing/costume.dm

@@ -70,7 +70,7 @@
 	new /obj/item/clothing/shoes/black(src.loc)
 	new /obj/item/weapon/cane(src.loc)
 	new /obj/item/clothing/under/sl_suit(src.loc)
-	new /obj/item/clothing/mask/gas/fakemoustache(src.loc)
+	new /obj/item/clothing/mask/fakemoustache(src.loc)
 	del(src)
 
 /obj/effect/landmark/costume/plaguedoctor/New()

code/defines/obj/clothing/mask.dm

@@ -44,9 +44,31 @@
 	desc = "LOADSAMONEY"
 	icon_state = "balaclava"
 	item_state = "balaclava"
-	flags = FPRINT|TABLEPASS|SUITSPACE|HEADSPACE|MASKCOVERSMOUTH|BLOCKHAIR
+	see_face = 0.0
+	flags = FPRINT|TABLEPASS|HEADSPACE|BLOCKHAIR
 	w_class = 2
 
+/obj/item/clothing/mask/luchador
+	name = "Luchador Mask"
+	desc = "Worn by robust fighters, flying high to defeat their foes!"
+	icon_state = "luchag"
+	item_state = "luchag"
+	flags = FPRINT|TABLEPASS|HEADSPACE|BLOCKHAIR
+	see_face = 0.0
+	w_class = 2
+
+/obj/item/clothing/mask/luchador/tecnicos
+	name = "Tecnicos Mask"
+	desc = "Worn by robust fighters who uphold justice and fight honorably."
+	icon_state = "luchador"
+	item_state = "luchador"
+
+/obj/item/clothing/mask/luchador/rudos
+	name = "Rudos Mask"
+	desc = "Worn by robust fighters who are willing to do anything to win."
+	icon_state = "luchar"
+	item_state = "luchar"
+
 /obj/item/clothing/mask/muzzle
 	name = "muzzle"
 	desc = "To stop that awful noise."
@@ -67,6 +89,13 @@
 	permeability_coefficient = 0.05
 	armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 75, rad = 0)
 
+/obj/item/clothing/mask/fakemoustache
+	name = "fake moustache"
+	desc = "Warning: moustache is fake."
+	icon_state = "fake-moustache"
+	flags = FPRINT|TABLEPASS
+	see_face = 0.0 //Well, it's a disguise, of course.
+
 //This now uses the alt sprites, like the emergency gasmask.	-Pete
 /obj/item/clothing/mask/gas
 	name = "gas mask"
@@ -148,10 +177,4 @@
 	name = "sexy mime mask"
 	desc = "A traditional female mime's mask."
 	icon_state = "sexymime"
-	item_state = "sexymime"
-
-//WHY IS THIS A GASMASK
-/obj/item/clothing/mask/gas/fakemoustache
-	name = "fake moustache"
-	desc = "Warning: moustache is fake."
-	icon_state = "fake-moustache"
+	item_state = "sexymime"

code/defines/obj/weapon.dm

@@ -56,7 +56,7 @@
 	desc = "What are you standing around staring at this for? Get to killing!"
 	icon_state = "claymore"
 	item_state = "claymore"
-	flags = FPRINT | TABLEPASS
+	flags = FPRINT | TABLEPASS | CONDUCT
 	slot_flags = SLOT_BELT
 	force = 40
 	throwforce = 10
@@ -70,7 +70,6 @@
 	desc = "Bag mixed with a bit of body."
 	icon = 'closet.dmi'
 	icon_state = "bodybag"
-	flags = FPRINT | TABLEPASS| CONDUCT
 	force = 5.0
 	throwforce = 5.0
 	throw_speed = 1
@@ -208,7 +207,7 @@
 	desc = "The Captain is first and all other heads are last."
 	icon_state = "chainofcommand"
 	item_state = "chainofcommand"
-	flags = FPRINT | TABLEPASS
+	flags = FPRINT | TABLEPASS | CONDUCT
 	slot_flags = SLOT_BELT
 	force = 10
 	throwforce = 7

code/game/objects/storage/belt.dm

@@ -134,4 +134,15 @@
 	new /obj/item/device/soulstone(src)
 	new /obj/item/device/soulstone(src)
 	new /obj/item/device/soulstone(src)
-	new /obj/item/device/soulstone(src)
+	new /obj/item/device/soulstone(src)
+
+
+/obj/item/weapon/storage/belt/champion
+	name = "championship belt"
+	desc = "Proves to the world that you are the strongest!"
+	icon_state = "championbelt"
+	item_state = "champion"
+	storage_slots = 1
+	can_hold = list(
+		"/obj/item/clothing/mask/luchador"
+		)

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

@@ -26,6 +26,28 @@
 				pick_list -= H
 			message = dd_list2text(temp_message, " ")
 
+	if(istype(src.wear_mask, /obj/item/clothing/mask/luchador))
+		if(copytext(message, 1, 2) != "*")
+			message = dd_replacetext(message, "captain", "CAPIT<49>N")
+			message = dd_replacetext(message, "station", "ESTACI<43>N")
+			message = dd_replacetext(message, "sir", "SE<53>OR")
+			message = dd_replacetext(message, "the ", "el ")
+			message = dd_replacetext(message, "my ", "mi ")
+			message = dd_replacetext(message, "is ", "es ")
+			message = dd_replacetext(message, "it's", "es")
+			message = dd_replacetext(message, "friend", "amigo")
+			message = dd_replacetext(message, "buddy", "amigo")
+			message = dd_replacetext(message, "hello", "hola")
+			message = dd_replacetext(message, " hot", " caliente")
+			message = dd_replacetext(message, " very ", " muy ")
+			message = dd_replacetext(message, "sword", "espada")
+			message = dd_replacetext(message, "library", "biblioteca")
+			message = dd_replacetext(message, "traitor", "traidor")
+			message = dd_replacetext(message, "wizard", "mago")
+			message = uppertext(message) //Things end up looking better this way (no mixed cases), and it fits the macho wrestler image.
+			if(prob(25))
+				message += " OLE!"
+
 	//Ninja mask obscures text and voice if set to do so.
 	//Would make it more global but it's sort of ninja specific.
 	if(istype(src.wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja)&&src.wear_mask:voice=="Unknown")

html/changelog.html

@@ -46,6 +46,14 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
+<div class="commit sansserif">
+	<h2 class="date">This 28th day of May, in the year of our Lord, Two Thousand Twelve</h2>
+	<h3 class="author">Cheridan updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="rscadd">-Adjusted balaclavas and added luchador masks. Wearing luchador masks give you latin charisma. They replace the boxing gloves in the fitness room. Boxing gloves are still available in the holodeck. -Fake moustache tweaked and given new sprites.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">Monday, May 28th</h2>
 	<h3 class="author">Donkie updated:</h3>

maps/tgstation.2.0.9.dmm

@@ -812,10 +812,10 @@
 "apF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/wall,/area/crew_quarters/fitness)
 "apG" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/structure/disposalpipe/junction{tag = "icon-pipe-j2"; icon_state = "pipe-j2"; dir = 2},/turf/simulated/floor,/area/crew_quarters/fitness)
 "apH" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/disposal,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/crew_quarters/fitness)
-"apI" = (/obj/item/clothing/under/shorts/black,/obj/item/clothing/gloves/boxing,/obj/structure/table,/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor,/area/crew_quarters/fitness)
-"apJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/clothing/under/shorts/blue,/obj/item/clothing/gloves/boxing/yellow,/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/fitness)
-"apK" = (/obj/machinery/camera{c_tag = "Fitness Room"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/item/clothing/under/shorts/grey,/obj/item/clothing/gloves/boxing/blue,/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/fitness)
-"apL" = (/obj/item/clothing/under/shorts/red,/obj/item/clothing/gloves/boxing/green,/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/fitness)
+"apI" = (/obj/item/clothing/under/shorts/black,/obj/structure/table,/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 20},/obj/item/clothing/mask/luchador/tecnicos,/turf/simulated/floor,/area/crew_quarters/fitness)
+"apJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/clothing/under/shorts/blue,/obj/structure/table,/obj/item/clothing/mask/luchador/rudos,/turf/simulated/floor,/area/crew_quarters/fitness)
+"apK" = (/obj/machinery/camera{c_tag = "Fitness Room"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/item/clothing/under/shorts/grey,/obj/structure/table,/obj/item/clothing/mask/balaclava,/turf/simulated/floor,/area/crew_quarters/fitness)
+"apL" = (/obj/item/clothing/under/shorts/red,/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/fitness)
 "apM" = (/obj/structure/reagent_dispensers/water_cooler,/turf/simulated/floor,/area/crew_quarters/fitness)
 "apN" = (/turf/simulated/wall/r_wall,/area/hallway/secondary/entry)
 "apO" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod1/station)
@@ -1067,7 +1067,7 @@
 "auA" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/crew_quarters/fitness)
 "auB" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/crew_quarters/fitness)
 "auC" = (/obj/structure/table,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack{pixel_x = 10; pixel_y = 2},/obj/item/stack/medical/ointment{pixel_y = 4},/turf/simulated/floor,/area/crew_quarters/fitness)
-"auD" = (/obj/structure/table,/obj/item/clothing/under/shorts/green,/turf/simulated/floor,/area/crew_quarters/fitness)
+"auD" = (/obj/structure/table,/obj/item/clothing/under/shorts/green,/obj/item/clothing/mask/luchador,/turf/simulated/floor,/area/crew_quarters/fitness)
 "auE" = (/obj/structure/stool{pixel_y = 8},/turf/simulated/floor,/area/crew_quarters/fitness)
 "auF" = (/obj/machinery/camera{c_tag = "Fitness Room South"; dir = 1},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/machinery/light,/turf/simulated/floor,/area/crew_quarters/fitness)
 "auG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard)
@@ -4137,7 +4137,7 @@
 "bBC" = (/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 8; icon_state = "brown"},/area/quartermaster/miningdock)
 "bBD" = (/obj/machinery/door/firedoor/border_only{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/quartermaster/miningdock)
 "bBE" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable,/turf/simulated/floor/plating,/area/quartermaster/miningdock)
-"bBF" = (/obj/machinery/camera{c_tag = "Vault"; dir = 4; network = "SS13"},/obj/structure/closet/crate,/obj/item/stack/sheet/gold{pixel_x = -1; pixel_y = 5},/obj/item/stack/sheet/gold{pixel_y = 2},/obj/item/stack/sheet/gold{pixel_x = 1; pixel_y = -2},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/security/nuke_storage)
+"bBF" = (/obj/machinery/camera{c_tag = "Vault"; dir = 4; network = "SS13"},/obj/structure/closet/crate,/obj/item/stack/sheet/gold{pixel_x = -1; pixel_y = 5},/obj/item/stack/sheet/gold{pixel_y = 2},/obj/item/stack/sheet/gold{pixel_x = 1; pixel_y = -2},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/weapon/storage/belt/champion,/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/security/nuke_storage)
 "bBG" = (/obj/machinery/nuclearbomb{r_code = "LOLNO"},/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/nuke_storage)
 "bBH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/weapon/coin/silver{pixel_x = 7; pixel_y = 12},/obj/item/weapon/coin/silver{pixel_x = 12; pixel_y = 7},/obj/item/weapon/coin/silver{pixel_x = 4; pixel_y = 8},/obj/item/weapon/coin/silver{pixel_x = -6; pixel_y = 5},/obj/item/weapon/coin/silver{pixel_x = 5; pixel_y = -8},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/security/nuke_storage)
 "bBI" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/hallway/primary/aft)