Yea, here's the situations where you can't discard:Jonan wrote:If you are chaplain, and using your skill, you can't discard.
(self.engineer & IS_BUILDING // building
|| self.is_detpacking //setting detpacks
|| self.is_feigning // ie spy
|| self.tfstate & TFSTATE_DEXTERED // passed out
|| (self.job & JOB_CHAPLAN && self.job & JOB_ACTIVE) //chaplaning
|| self.tfstate & TFSTATE_VOMITING))
It's supposed to be consistent with the Chaplain being 100% possessed by the Holy Spirit, and thus not able to focus on any other task. I just added a message in there so players get some response/info to their discard attempt, so thanks for the heads up.
Hmm.. I had a look at the 'discard' code. It discards any ammo for a weapon you don't have. This function is legacy CustomTF code, ie pre-AGR. I haven't looked at it, or thought about the logic before... and no-one has said anything, so hasn't been an issue.Jonan wrote:If you have been disarmed, and that was the only weapon with that ammo type you have, you will discard all its' ammo when discarding.
I suppose players should get their ammo back.. when they get the weapon back.. I'll fix it (if I have time) tomorrow.
Btw I did fix a bug w the 'disarm situation' (it wasn't always restoring weapons) so at least it wont be as brutal as it has been the last few weeks.