Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates

# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi
This commit is contained in:
Markolie
2017-02-06 20:37:03 +01:00
59 changed files with 728 additions and 375 deletions
+1
View File
@@ -25,6 +25,7 @@
#define PLANT_TOXIN_HUD "20"// Toxin level
#define PLANT_PEST_HUD "21"// Pest level
#define PLANT_WEED_HUD "22"// Weed level
#define DIAG_TRACK_HUD "23"// Mech tracking beacon
//data HUD (medhud, sechud) defines
//Don't forget to update human/New() if you change these!