Merge branch 'master' of https://github.com/tgstation/-tg-station into SecSprtites2015

Conflicts:
	icons/mob/uniform.dmi

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -8,31 +8,43 @@
 /obj/structure/closet/syndicate/ertCom/New()
 	name = "commanders closet"
 	desc = "Emergency Response Team equipment locker"
-	new /obj/item/weapon/card/id/ertsCommand(src)
-	new /obj/item/weapon/storage/backpack/security(src)
+	icon_state = "capsecureoff"
+	icon_closed = "capsecureoff"
+	icon_opened = "capsecureopen"
+//	new /obj/item/weapon/card/id/ert(src)
+	new /obj/item/weapon/storage/backpack/captain(src)
 	return
 
 /obj/structure/closet/syndicate/ertSec/New()
 	name = "security closet"
 	desc = "Emergency Response Team equipment locker"
-	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
-	new /obj/item/weapon/card/id/ertsSecurity(src)
+	icon_state = "secoff"
+	icon_closed = "secoff"
+	icon_opened = "secopen"
+	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol/loyalpin(src)
+	new /obj/item/weapon/card/id/ert/Security(src)
 	new /obj/item/weapon/storage/backpack/security(src)
 	return
 
 /obj/structure/closet/syndicate/ertMed/New()
 	name = "medical closet"
 	desc = "Emergency Response Team equipment locker"
-	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
-	new /obj/item/weapon/card/id/ertsMedical(src)
+	icon_state = "securemedoff"
+	icon_closed = "securemedoff"
+	icon_opened = "securemedopen"
+	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol/loyalpin(src)
+	new /obj/item/weapon/card/id/ert/Medical(src)
 	new /obj/item/weapon/storage/backpack/medic(src)
 	return
 
 /obj/structure/closet/syndicate/ertEngi/New()
 	name = "engineer closet"
 	desc = "Emergency Response Team equipment locker"
-	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
-	new /obj/item/weapon/card/id/ertsEngineer(src)
+	icon_state = "secureengoff"
+	icon_closed = "secureengoff"
+	icon_opened = "secureengopen"
+	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol/loyalpin(src)
+	new /obj/item/weapon/card/id/ert/Engineer(src)
 	new /obj/item/weapon/storage/backpack/industrial(src)
 	return
 

code/game/objects/structures/flora.dm

@@ -181,7 +181,7 @@
 	icon_state = "ppflowers_1"
 
 /obj/structure/flora/ausbushes/ppflowers/New()
-	icon_state = "ppflowers_[rand(1, 4)]"
+	icon_state = "ppflowers_[rand(1, 3)]"
 	..()
 
 /obj/structure/flora/ausbushes/sparsegrass

code/game/objects/structures/musician.dm

@@ -323,8 +323,14 @@
 	..()
 
 /obj/structure/piano/attack_hand(mob/user as mob)
+	if(!user.IsAdvancedToolUser())
+		user << "<span class='danger'>You don't have the dexterity to do this!</span>"
+		return 1
 	interact(user)
 
+/obj/structure/piano/attack_paw(mob/user as mob)
+	return src.attack_hand(user)
+
 /obj/structure/piano/interact(mob/user as mob)
 	if(!user || !anchored)
 		return

code/game/objects/structures/tank_dispenser.dm

@@ -31,8 +31,13 @@
 		if(1 to 4)	overlays += "plasma-[plasmatanks]"
 		if(5 to INFINITY) overlays += "plasma-5"
 
+/obj/structure/dispenser/attack_paw(mob/user as mob)
+	return src.attack_hand(user)
 
 /obj/structure/dispenser/attack_hand(mob/user as mob)
+	if(!user.IsAdvancedToolUser())
+		user << "<span class='danger'>You don't have the dexterity to do this!</span>"
+		return 1
 	user.set_machine(src)
 	var/dat = "[src]<br><br>"
 	dat += "Oxygen tanks: [oxygentanks] - [oxygentanks ? "<A href='?src=\ref[src];oxygen=1'>Dispense</A>" : "empty"]<br>"