Merge pull request #256 from sheepishgoat/feeders-den-tweaks

Feeders den tweaks

GainStation13/code/mechanics/den abductors/console.dm

@@ -155,13 +155,13 @@
 	/// How much credits do we currently have?
 	var/credits = 0
 	/// How many credits are we going to reward per pound gained?
-	var/credits_per_fatness = 1 
+	var/credits_per_fatness = 0.25 
 	/// A list containing all of the people we've scanned and their maximum weight.
 	var/list/scanned_people = list()
 	/// What is the current team number?
 	var/team_number = 27
 	/// What is the maximum ammount of credits that can be gained per person?
-	var/maximum_credits = 900 // A little bit over the fattness for blob.
+	var/maximum_credits = 1000 // A little bit over the fattness for blob.
 
 /obj/structure/scale/credits/Initialize(mapload)
 	..()
@@ -191,14 +191,20 @@
 	var/credits_to_add = min((fatty.fatness * credits_per_fatness), maximum_credits)
 	var/credits_to_remove = 0
 	if(scanned_people[fatty])
+		if(scanned_people[fatty] >= maximum_credits)
+			return TRUE
+
 		credits_to_remove = scanned_people[fatty]
+	else
+		scanned_people[fatty] = 0
 
 	var/credit_total = max((credits_to_add - credits_to_remove), 0)
 	if(credit_total > 0)
 		say("[credit_total] credits have been deposited into the console.")
 	
 	credits += credit_total
-	scanned_people[fatty] = max(credit_total, credits_to_remove)
+	scanned_people[fatty] += credit_total
+
 	return TRUE
 
 /obj/machinery/abductor/pad/feeder

GainStation13/code/obj/weapons/feeder_ebow.dm

@@ -0,0 +1,25 @@
+/obj/item/gun/energy/kinetic_accelerator/crossbow/feeder
+	name = "feeder's mini energy crossbow"
+	desc = "a modified version of the standard mini energy crossbow, designed to fatten up a target while incapacitating them."
+	icon_state = "crossbow_halloween"
+	item_state = "crossbow"
+	ammo_type = list(/obj/item/ammo_casing/energy/bolt/fattening)
+
+/obj/item/ammo_casing/energy/bolt/fattening
+	projectile_type = /obj/item/projectile/energy/bolt/fattening
+
+/obj/item/projectile/energy/bolt/fattening
+	damage = 0
+
+/obj/item/projectile/energy/bolt/fattening/Initialize()
+	. = ..()
+
+/obj/item/projectile/energy/bolt/fattening/on_hit(atom/target, blocked)
+	. = ..()
+	var/mob/living/carbon/target_mob = target
+	if(!istype(target_mob) || (blocked == 100))
+		return
+
+	target_mob.reagents.add_reagent(/datum/reagent/consumable/lipoifier, 2)
+
+	

code/modules/awaymissions/corpse.dm

@@ -744,8 +744,7 @@
 	gloves = /obj/item/clothing/gloves/combat
 	ears = /obj/item/radio/headset/syndicate/alt
 	back = /obj/item/storage/backpack
-	r_hand = /obj/item/storage/box/syndie_kit/soporific_bundle
-	l_hand = /obj/item/gun/ballistic/automatic/pistol
+	l_hand = /obj/item/gun/energy/kinetic_accelerator/crossbow/feeder
 	l_pocket = /obj/item/crowbar
 	r_pocket = /obj/item/gun/energy/fatoray
 	id = /obj/item/card/id/syndicate/anyone

tgstation.dme

@@ -3160,6 +3160,7 @@
 #include "GainStation13\code\obj\weapons\alter_rays.dm"
 #include "GainStation13\code\obj\weapons\fatbeam.dm"
 #include "GainStation13\code\obj\weapons\fatoray.dm"
+#include "GainStation13\code\obj\weapons\feeder_ebow.dm"
 #include "GainStation13\code\structures\trapped_items.dm"
 #include "GainStation13\icons\obj\vairous_weapons.dm"
 #include "hyperstation\code\__DEFINES\economy.dm"