Merge pull request #70 from evilew/tweaking

mage hand, map tweaks, fatty loot

GainStation13/code/mobs/chocoslime.dm

@@ -90,3 +90,43 @@
 				if(HAS_TRAIT(L, TRAIT_VORACIOUS))
 					fullness_add = fullness_add * 0.67
 				L.fullness += (fullness_add)
+
+
+
+//should probably put this in elsewhere or whatever, but for now it'll do
+
+/mob/living/simple_animal/hostile/fatten/magehand
+	name = "Magehand"
+	desc = "It's a floating mage hand of strange, crackling orange energy..."
+	icon = 'GainStation13/icons/mob/fathand.dmi'
+	icon_state = "fathand"
+	icon_living = "fathand"
+	icon_dead = "fathand_dead"
+	speak_emote = list("crackles")
+	emote_hear = list("crackles")
+	speak_chance = 5
+	turns_per_move = 5
+	aggro_vision_range = 10
+	see_in_dark = 10
+	maxHealth = 20
+	health = 20
+	del_on_death = TRUE
+	movement_type = FLYING
+	attack_verb_continuous = "pokes"
+	attack_verb_simple = "pokes"
+	a_intent = INTENT_HARM
+	pass_flags = PASSTABLE
+	move_to_delay = 2
+	attack_sound = 'sound/weapons/pulse.ogg'
+	unique_name = 1
+	faction = list(ROLE_WIZARD)
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
+
+/mob/living/simple_animal/hostile/fatten
+	var/fat_per_hit = 30
+
+/mob/living/simple_animal/hostile/fatten/AttackingTarget()
+	. = ..()
+	var/mob/living/carbon/L = target
+	if(L.client?.prefs?.weight_gain_magic)
+		L.adjust_fatness(fat_per_hit)

GainStation13/code/obj/items/minor_items.dm

@@ -38,6 +38,21 @@
 /obj/item/reagent_containers/glass/beaker/flatulose
 	list_reagents = list(/datum/reagent/consumable/flatulose = 50)
 
+/obj/item/reagent_containers/glass/beaker/galbanic
+	list_reagents = list(/datum/reagent/fermi_fat = 50)
+
+/obj/item/reagent_containers/glass/beaker/macarenic
+	list_reagents = list(/datum/reagent/fermi_slim = 50)
+
+//evil fucking donut
+
+/obj/item/reagent_containers/food/snacks/donut/evil_superfat
+	name = "Evil Fuckin' Donut"
+	desc = "Merely looking at this thing makes you feel like you're getting fat..."
+	bitesize = 100 // Always eat it in one bite
+	list_reagents = list(/datum/reagent/fermi_fat = 120, /datum/reagent/consumable/lipoifier = 70, /datum/reagent/consumable/cornoil = 70)
+	tastes = list("imminent immobility" = 10)
+
 //blueberry gum snack
 
 /obj/item/reagent_containers/food/snacks/blueberry_gum
@@ -223,3 +238,40 @@
 	volume = 250
 	custom_materials = list(/datum/material/plastic=1000)
 	w_class = WEIGHT_CLASS_HUGE
+
+
+//weapon prefabs
+
+/obj/item/melee/curator_whip/fattening
+	name = "calorite-lined whip"
+	desc = "The whip seems to glisten with an orange gleam inbetween its threads."
+	damtype = "fat"
+	attack_verb = list("fattened")
+	force = 40
+
+/obj/item/melee/curator_whip/permafattening
+	name = "galbanic whip"
+	desc = "How can a whip even be infused galbanic? No one knows."
+	damtype = "perma_fat"
+	attack_verb = list("fattened")
+	force = 20
+
+/obj/item/gavelhammer/fattening
+	desc = "Some madman managed to create a weapon out of calorite... Luckily, it has a rubber handle for you to wield."
+	name = "Calorite Hammer"
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "toyhammer"
+	damtype = "fat"
+	throwforce = 40
+	force = 60
+	attack_verb = list("fattened")
+
+/obj/item/gavelhammer/permafattening
+	desc = "You may ask yourself - how did someone make a hammer out of a chemical? The answer is clear: no one knows."
+	name = "Permafat Hammer"
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "toyhammer"
+	damtype = "perma_fat"
+	throwforce = 10
+	force = 20
+	attack_verb = list("fattened")