Merge pull request yogstation13#462 from Ikarrus/fuckingwork

[MAP] Medals Part II

code/modules/clothing/under/ties.dm

@@ -96,7 +96,7 @@
 					user.visible_message("<span class='notice'>[user] pins \the [src] on [M]'s chest.</span>", \
 										 "<span class='notice'>You pin \the [src] on [M]'s chest.</span>")
 
-			else user << "<span class='warning'>[M] is already wearing an accessory.</span>"
+			else user << "<span class='warning'>\The [U] already has an accessory.</span>"
 
 		else user << "<span class='warning'>Medals can only be pinned on jumpsuits.</span>"
 	else ..()

html/changelog.html

@@ -49,18 +49,21 @@
 
 <!-- You can simply add changelogs using AddToChangelog.exe -->
 
-<!-- DO NOT REMOVE OR MOVE THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# --><div class='commit sansserif'>
+<!-- DO NOT REMOVE OR MOVE THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->
+
+
+<div class='commit sansserif'>
 	<h2 class='date'>26 April 2013</h2>
 	<h3 class='author'>Aranclanos updated:</h3>
 	<ul class='changes bgimages16'>
-		<li class='tweak'>Exosuit fabritcators will now need to be manually updated</li>
+		<li class='tweak'>Exosuit fabricators will now need to be manually updated</li>
 	</ul>
 	<h3 class='author'>Ikarrus updated:</h3>
 	<ul class='changes bgimages16'>
-		<li class='tweak'>Centcom intelligence suggests that the Syndicate no longer seeks to capture Nanotrasen officer jumpsuits. They may be targetting an item of more worth, particularly the Medal of Captaincy issued to Nanotrasen commanders.</li>
+	<li class='rscadd'>Commanding Officers of Nanotrasen Stations have been issued a box of medals to be awarded to crew members who display exemplary conduct.</li>
 	</ul>
 </div>
-
+
 
 <div class='commit sansserif'>
 	<h2 class='date'>23 April 2013</h2>
@@ -69,7 +72,7 @@ <h3 class='author'>Malkevin updated:</h3>
 		<li class='imageadd'>Replaced the captain's run of the mill armored vest with his very own unique vest. Offers slightly better bullet protection.</li>
 	</ul>
 </div>
-
+
 
 <div class='commit sansserif'>
 	<h2 class='date'>22 April 2013</h2>
@@ -83,7 +86,7 @@ <h3 class='author'>Malkevin updated:</h3>
 		<li class='tweak'>Bomb suits function as ghetto riot gear</li>
 	</ul>
 </div>
-
+
 <div class='commit sansserif'>
 	<h2 class='date'>22 April 2013</h2>
 	<h3 class='author'>Cheridan updated:</h3>
@@ -93,7 +96,7 @@ <h3 class='author'>Cheridan updated:</h3>
 		<li class='rscadd'>Stun batons/prods now work off power cells, which can be removed and replaced! Use a screwdriver to remove the battery.</li>
 	</ul>
 </div>
-
+
 
 <div class='commit sansserif'>
 	<h2 class='date'>17 April 2013</h2>
@@ -102,7 +105,7 @@ <h3 class='author'>Giacom updated:</h3>
 		<li class='rscadd'>If the configuration option is enabled, AIs and or Cyborgs will not be able to communicate vocally. This means they cannot talk normally and need to use alternative methods to do so</li>
 	</ul>
 </div>
-
+
 
 <div class='commit sansserif'>
 	<h2 class='date'>10 April 2013</h2>
@@ -115,7 +118,7 @@ <h3 class='author'>Cheridan updated:</h3>
 		<li class='tweak'>NT bluespace engineers have ironed-out that little issue with the teleporter occasionally malfunctioning and dropping users into deep space. Please note, however, that bluespace teleporters are still sensitive experimental technology, and should be Test Fired before use to ensure proper function.</li>
 	</ul>
 </div>
-
+
 
 <div class="commit sansserif">
 	<h2 class="date">9 April 2013</h2>
@@ -2685,4 +2688,4 @@ <h3 class="author">Erro updated:</h3>
 <p class="lic">Some icons by <a href="http://p.yusukekamiyamane.com/">Yusuke Kamiyamane</a>. All rights reserved. Licensed under a <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 License</a>.</p>
 </td></tr></table>
 </body>
-</html>
+</html>

maps/tgstation.2.1.2.dmm

@@ -2594,7 +2594,7 @@
 "aXT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/stool/bed/chair,/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "aXU" = (/turf/simulated/floor/carpet,/area/crew_quarters/captain)
 "aXV" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/carpet,/area/crew_quarters/captain)
-"aXW" = (/obj/structure/table/woodentable,/obj/machinery/recharger{pixel_y = 4},/obj/machinery/camera{c_tag = "Captain's Office"; dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/captain)
+"aXW" = (/obj/structure/table/woodentable,/obj/machinery/camera{c_tag = "Captain's Office"; dir = 8},/obj/item/weapon/storage/lockbox/medal{pixel_y = 0},/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "aXX" = (/obj/structure/disposalpipe/segment,/obj/machinery/light{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/central)
 "aXY" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=Stbd"; location = "HOP"},/turf/simulated/floor,/area/hallway/primary/central)
 "aXZ" = (/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -30},/turf/simulated/floor,/area/hallway/primary/starboard)
@@ -2731,7 +2731,7 @@
 "baA" = (/obj/machinery/requests_console{announcementConsole = 1; department = "Captain's Desk"; departmentType = 5; name = "Captain RC"; pixel_x = -30; pixel_y = 0},/obj/structure/filingcabinet,/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "baB" = (/obj/structure/stool/bed/chair/comfy/brown{dir = 4},/obj/effect/landmark/start{name = "Captain"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "baC" = (/obj/machinery/computer/communications,/turf/simulated/floor/wood,/area/crew_quarters/captain)
-"baD" = (/obj/structure/table/woodentable,/obj/item/weapon/melee/chainofcommand,/obj/item/weapon/coin/silver,/turf/simulated/floor/wood,/area/crew_quarters/captain)
+"baD" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/security_space_law,/obj/item/weapon/coin/silver,/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "baE" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/hologram/holopad,/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "baF" = (/obj/structure/table/woodentable,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/item/device/camera,/obj/item/weapon/storage/photo_album{pixel_y = -10},/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "baG" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor,/area/hallway/primary/central)
@@ -2799,7 +2799,7 @@
 "bbQ" = (/obj/structure/rack,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/armor/captain,/obj/item/clothing/head/helmet/space/capspace,/obj/item/device/radio/intercom{dir = 8; freerange = 1; name = "Station Intercom (Captain)"; pixel_x = -28},/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "bbR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "bbS" = (/obj/machinery/computer/card,/obj/item/weapon/card/id/captains_spare,/turf/simulated/floor/wood,/area/crew_quarters/captain)
-"bbT" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor/wood,/area/crew_quarters/captain)
+"bbT" = (/obj/structure/table/woodentable,/obj/machinery/recharger,/obj/item/weapon/melee/chainofcommand,/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "bbU" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "bbV" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/central)
 "bbW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/hallway/primary/central)