Merge pull request #83 from evilew/tweaks

small tweaks

GainStation13/code/clothing/fat_mask.dm

@@ -2,8 +2,11 @@
 	name = "drone mask"
 	desc = "A mask that can be connected to an air supply. When seen from certain angles, an orange light is reflected by it."
 	icon = 'GainStation13/icons/obj/clothing/fat_mask.dmi'
+	mob_overlay_icon =  'GainStation13/icons/mob/mask.dmi'
+	anthro_mob_worn_overlay = 'GainStation13/icons/mob/mask.dmi'
 	icon_state = "fat_mask"
 	item_state = "fat_mask"
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
 	var/mob/living/carbon/C
 
 /obj/item/clothing/mask/gas/fattening/equipped(mob/M, slot)

GainStation13/code/game/donator.dm

@@ -3,16 +3,16 @@
 //item presets for donator items and other gunk
 //
 /obj/item/clothing/glasses/eyepatch/white
+	icon ='GainStation13/icons/obj/clothing/glasses.dmi'
+	mob_overlay_icon = 'GainStation13/icons/mob/eyes.dmi'
 	name = "White eyepatch"
 	desc = "Smells faintly of medicine and headaches."
 	icon_state = "eyepatch_white"
 	item_state = "eyepatch_white"
 
-/obj/item/clothing/glasses/eyepatch/cabal
+/obj/item/clothing/glasses/eyepatch/white/cabal
 	name = "Cabal's Eyepatch"
 	desc = "Vulpine sluts only."
-	icon_state = "eyepatch_white"
-	item_state = "eyepatch_white"
 
 /obj/item/toy/sword/chloesabre/halsey
 	name = "Halsey's Sabre"
@@ -50,3 +50,4 @@
 /obj/item/crowbar/bronze/glaug
 	name = "Milwaukee Pocket Crowbar"
 	desc = "Much more expensive. Still serves the same function."
+

GainStation13/code/game/lore_papers.dm

@@ -611,4 +611,4 @@
 
 /obj/item/paper/fluff/ruins/gateway_fats/facility_report8
 	name = "Report #192 A38 - Lipoifium"
-	info = "Subject 2 - Male, Anthropomorphic Fox, blue fur. Name: Sam S. At the beginning of the testing, subject was recorded to have weight of 160lbs. After a day minutes of exposure, their weight went into quadruple digits. Testing had to be concluded due to insufficient build of the test chamber. More detailed report found in the system."
+	info = "Subject 2 - Male, Anthropomorphic Fox, blue fur. Name: Sam S. At the beginning of the testing, subject was recorded to have weight of 160lbs. After a day of exposure, their weight went into quadruple digits. Testing had to be concluded due to insufficient build of the test chamber. More detailed report found in the system."

GainStation13/code/game/plushes.dm

@@ -81,3 +81,8 @@
 	desc = "A plush of a silly-eyed xeno seccie."
 	icon_state = "crowbars"
 	attack_verb = list("squished", "crowbared", "beno'd")
+
+/obj/item/toy/plush/gs13/sharky
+	desc = "A plush of a toothy, sharky creature."
+	icon_state = "sharky"
+	attack_verb = list("squished", "bit", "sharkied")

GainStation13/code/mechanics/fatness.dm

@@ -1,4 +1,4 @@
-GLOBAL_LIST_INIT(uncapped_resize_areas, list(/area/command/bridge, /area/maintenance, /area/security/prison, /area/holodeck, /area/commons/vacant_room/office, /area/space, /area/ruin, /area/lavaland, /area/awaymission, /area/centcom, /area/fatlab))
+GLOBAL_LIST_INIT(uncapped_resize_areas, list(/area/command/bridge, /area/maintenance, /area/security/prison, /area/holodeck, /area/commons/vacant_room/office, /area/space, /area/ruin, /area/lavaland, /area/awaymission, /area/centcom, /area/fatlab, /area/xenoarch))
 
 /mob/living
 	var/burpslurring = 0 //GS13 - necessary due to "say" being defined by mob/living

GainStation13/code/mobs/chocoslime.dm

@@ -112,6 +112,9 @@
 	see_in_dark = 10
 	maxHealth = 20
 	health = 20
+	obj_damage = 0
+	melee_damage_lower = 0.001
+	melee_damage_upper = 0.001
 	blood_volume = 0 //don't want it to bleed
 	del_on_death = TRUE //it's an apparition, shouldn't have a body
 	movement_type = FLYING